exiftool_vendored 13.31.0 → 13.36.0

data/bin/lib/Image/ExifTool/Olympus.pm

@@ -28,6 +28,7 @@
 #              22) Herbert Kauer private communication
 #              23) Daniel Pollock private communication (PEN-F)
 #              24) Sebastian private communication (E-M1 Mark III)
+#              25) Karsten Gieselmann private communication (OM series)
 #              IB) Iliah Borg private communication (LibRaw)
 #              NJ) Niels Kristian Bech Jensen private communication
 #------------------------------------------------------------------------------
@@ -40,7 +41,7 @@ use Image::ExifTool qw(:DataAccess :Utils);
 use Image::ExifTool::Exif;
 use Image::ExifTool::APP12;
 
-$VERSION = '2.86';
+$VERSION = '2.90';
 
 sub PrintLensInfo($$$);
 
@@ -116,6 +117,7 @@ my %olympusLensTypes = (
     '0 35 10' => 'Olympus M.Zuiko 100-400mm F5.0-6.3', #IB (also OM System M.Zuiko Digital ED 100-400mm F5.0-6.3 IS II", forum2833)
     '0 36 10' => 'Olympus M.Zuiko Digital ED 8-25mm F4 Pro', #IB
     '0 37 10' => 'Olympus M.Zuiko Digital ED 40-150mm F4.0 Pro', #forum3833
+    '0 38 10' => 'Olympus M.Zuiko Digital ED 20mm F1.4 Pro',
     '0 39 10' => 'Olympus M.Zuiko Digital ED 90mm F3.5 Macro IS Pro', #forum3833
     '0 40 10' => 'Olympus M.Zuiko Digital ED 150-600mm F5.0-6.3', #forum15652
     # Sigma lenses
@@ -447,6 +449,7 @@ my %olympusCameraTypes = (
     S0101 => 'OM-5', #IB
     S0121 => 'OM-1MarkII', #forum15652
     S0123 => 'OM-3', #forum17208
+    S0130 => 'OM-5MarkII', #forum17465
     SR45 => 'D220',
     SR55 => 'D320L',
     SR83 => 'D340L',
@@ -1932,20 +1935,39 @@ my %indexInfo = (
     0x309 => { #forum13341
         Name => 'AISubjectTrackingMode',
         Writable => 'int16u',
-        ValueConv => '($val >> 8) . " " . ($val & 0xff)',
-        ValueConvInv => 'my @a = split " ", $val; $val = $a[0]*256 + $a[1]',
-        PrintConv => [{
-            0 => 'Off',
-            1 => 'Motorsports',
-            2 => 'Airplanes',
-            3 => 'Trains',
-            4 => 'Birds',
-            5 => 'Dogs & Cats',
-            6 => 'Human', #forum16072
-        },{
-            0 => 'Object Not Found',
-            1 => 'Object Found',
-        }],
+        PrintConv => {             #25 (OM models)
+                0 => 'Off',
+            0x100 => 'Motorsports; Object Not Found',
+            0x101 => 'Motorsports; Racing Car Found',
+            0x102 => 'Motorsports; Car Found',
+            0x103 => 'Motorsports; Motorcyle Found',
+            0x200 => 'Airplanes; Object Not Found',
+            0x201 => 'Airplanes; Passenger/Transport Plane Found',
+            0x202 => 'Airplanes; Small Plane/Fighter Jet Found',
+            0x203 => 'Airplanes; Helicopter Found',
+            0x300 => 'Trains; Object Not Found',
+            0x301 => 'Trains; Object Found',
+            0x400 => 'Birds; Object Not Found',
+            0x401 => 'Birds; Object Found',
+            0x500 => 'Dogs & Cats; Object Not Found',
+            0x501 => 'Dogs & Cats; Object Found',
+            0x600 => 'Human; Object Not Found',
+            0x601 => 'Human; Object Found',
+        },
+    },
+    0x030a => {
+        Name => 'AFTargetInfo',
+        Format => 'undef',
+        Writable => 'int16u',
+        Count => 10,
+        SubDirectory => { TagTable => 'Image::ExifTool::Olympus::AFTargetInfo' },
+    },
+    0x030b => {
+        Name => 'SubjectDetectInfo',
+        Format => 'undef',
+        Writable => 'int16u',
+        Count => 11,
+        SubDirectory => { TagTable => 'Image::ExifTool::Olympus::SubjectDetectInfo' },
     },
     0x400 => { #6
         Name => 'FlashMode',
@@ -2231,12 +2253,15 @@ my %indexInfo = (
             5 => 'i-Enhance', #11
             6 => 'e-Portrait', #23
             7 => 'Color Creator', #23
+            8 => 'Underwater', #7
             9 => 'Color Profile 1', #23
             10 => 'Color Profile 2', #23
             11 => 'Color Profile 3', #23
             12 => 'Monochrome Profile 1', #23
             13 => 'Monochrome Profile 2', #23
             14 => 'Monochrome Profile 3', #23
+            17 => 'Art Mode', #7
+            18 => 'Monochrome Profile 4', #7
             256 => 'Monotone',
             512 => 'Sepia',
         }],
@@ -2489,15 +2514,22 @@ my %indexInfo = (
         Name => 'DriveMode',
         Writable => 'int16u',
         Count => -1,
-        Notes => '2, 3 or 5 numbers: 1. Mode, 2. Shot number, 3. Mode bits, 5. Shutter mode',
+        Notes => q{
+            2, 3, 5 or  numbers: 1. Mode, 2. Shot number, 3. Mode bits, 5. Shutter mode,
+            6. Shooting mode (E-M1 II and later models)
+        },
         PrintConv => q{
-            my ($a,$b,$c,$d,$e) = split ' ',$val;
-            if ($e) {
-                $e = '; ' . ({ 2 => 'Anti-shock 0', 4 => 'Electronic shutter' }->{$e} || "Unknown ($e)");
+            my ($a,$b,$c,$d,$e,$f) = split ' ',$val;
+            if ($b) {
+                $b = ', Shot ' . $b;
             } else {
+                $b = '';
+            }
+            if (not defined $e or $e == 4) {   #KG: personally, I'd like to skip 'Electronic shutter' since this is the defacto default setting
                 $e = '';
+            } else {
+                $e = '; ' . ({ 0 => 'Mechanical shutter' , 2 => 'Anti-shock' }->{$e} || "Unknown ($e)");
             }
-            return "Single Shot$e" unless $a;
             if ($a == 5 and defined $c) {
                 $a = DecodeBits($c, { #6
                     0 => 'AE',
@@ -2509,16 +2541,51 @@ my %indexInfo = (
                     6 => 'Focus', #PH
                 }) . ' Bracketing';
                 $a =~ s/, /+/g;
+            } elsif ($f) { #25
+                  # for newer models (E-M1 and later) look at byte 6 for other shooting modes
+                  my %f = (
+                      # Mechanical shutter modes
+                      0x01 => 'Single Shot',
+                      0x02 => 'Sequential L',
+                      0x03 => 'Sequential H',
+                      0x07 => 'Sequential',
+                      # Anti-shock modes
+                      0x11 => 'Single Shot',
+                      0x12 => 'Sequential L',
+                      0x13 => 'Sequential H',
+                      0x14 => 'Self-Timer 12 sec',
+                      0x15 => 'Self-Timer 2 sec',
+                      0x16 => 'Custom Self-Timer',
+                      0x17 => 'Sequential',
+                      # Electronical shutter modes
+                      0x21 => 'Single Shot',
+                      0x22 => 'Sequential L',
+                      0x23 => 'Sequential H',
+                      0x24 => 'Self-Timer 2 sec',
+                      0x25 => 'Self-Timer 12 sec',
+                      0x26 => 'Custom Self-Timer',
+                      0x27 => 'Sequential',
+                      0x28 => 'Sequential SH1',
+                      0x29 => 'Sequential SH2',
+                      0x30 => 'HighRes Shot',  # only E-M models
+                      0x41 => 'ProCap H',
+                      0x42 => 'ProCap L',
+                      0x43 => 'ProCap',
+                      0x48 => 'ProCap SH1',
+                      0x49 => 'ProCap SH2',
+                  );
+                  $a = $f{$f} || "Unknown ($f)";
             } else {
-                my %a = (
-                    1 => 'Continuous Shooting',
-                    2 => 'Exposure Bracketing',
-                    3 => 'White Balance Bracketing',
-                    4 => 'Exposure+WB Bracketing', #6
-                );
-                $a = $a{$a} || "Unknown ($a)";
+                  my %a = (
+                      0 => 'Single Shot',
+                      1 => 'Continuous Shooting',
+                      2 => 'Exposure Bracketing',
+                      3 => 'White Balance Bracketing',
+                      4 => 'Exposure+WB Bracketing', #6
+                  );
+                  $a = $a{$a} || "Unknown ($a)";
             }
-            return "$a, Shot $b$e";
+            return "$a$b$e";
         },
     },
     0x601 => { #6
@@ -2555,10 +2622,10 @@ my %indexInfo = (
         RawConv => '$$self{ImageStabilization} = $val',
         PrintConv => {
             0 => 'Off',
-            1 => 'On, Mode 1',
-            2 => 'On, Mode 2',
-            3 => 'On, Mode 3',
-            4 => 'On, Mode 4', # (NC, E-P5)
+            1 => 'On, S-IS1 (All Direction Shake IS)', #25
+            2 => 'On, S-IS2 (Vertical Shake IS)', #25
+            3 => 'On, S-IS3 (Horizontal Shake IS)', #25
+            4 => 'On, S-IS Auto', #25
         },
     },
     0x804 => { #PH (E-M1 with firmware update)
@@ -2581,6 +2648,9 @@ my %indexInfo = (
             '9 *' => 'Focus-stacked (* images)', #IB (* = 2-15)
             '11 12' => 'Hand-held high resolution (11 12)', #forum13341 (OM-1)
             '11 16' => 'Hand-held high resolution (11 16)', #IB (perhaps '11 15' would be possible, ref 24)
+            '13 2' => 'GND2 (1EV)', #25
+            '13 4' => 'GND4 (2EV)', #25
+            '13 8' => 'GND8 (3EV)', #25
             OTHER => sub {
                 my ($val, $inv, $conv) = @_;
                 if ($inv) {
@@ -2601,6 +2671,73 @@ my %indexInfo = (
             },
         },
     },
+    0x0821 => { #25
+        Name => 'ISOAutoSettings',
+        Writable => 'int16u',
+        Count => 2,
+        Notes => '2 numbers: 1. Default sensitivty, 2. Maximum sensitivity',
+        PrintConv => [{
+            0 => 'n/a',
+            0x0600 => '200',
+            0x0655 => '250',
+            0x06aa => '320',
+            0x0700 => '400',
+            0x0755 => '500',
+            0x07aa => '640',
+            0x0800 => '800',
+            0x0855 => '1000',
+            0x08aa => '1250',
+            0x0900 => '1600',
+            0x0955 => '2000',
+            0x09aa => '2500',
+            0x0a00 => '3200',
+            0x0a55 => '4000',
+            0x0aaa => '5000',
+            0x0b00 => '6400',
+            0x0b55 => '8000',
+            0x0baa => '10000',
+            0x0c00 => '12800',
+            0x0c55 => '16000',
+            0x0caa => '20000',
+            0x0d00 => '25600',
+            0x0d55 => '32000',
+            0x0daa => '40000',
+            0x0e00 => '51200',
+            0x0e55 => '64000',
+            0x0eaa => '80000',
+            0x0f00 => '102400',
+        },{
+            0 => 'n/a',
+            0x0600 => '200',
+            0x0655 => '250',
+            0x06aa => '320',
+            0x0700 => '400',
+            0x0755 => '500',
+            0x07aa => '640',
+            0x0800 => '800',
+            0x0855 => '1000',
+            0x08aa => '1250',
+            0x0900 => '1600',
+            0x0955 => '2000',
+            0x09aa => '2500',
+            0x0a00 => '3200',
+            0x0a55 => '4000',
+            0x0aaa => '5000',
+            0x0b00 => '6400',
+            0x0b55 => '8000',
+            0x0baa => '10000',
+            0x0c00 => '12800',
+            0x0c55 => '16000',
+            0x0caa => '20000',
+            0x0d00 => '25600',
+            0x0d55 => '32000',
+            0x0daa => '40000',
+            0x0e00 => '51200',
+            0x0e55 => '64000',
+            0x0eaa => '80000',
+            0x0f00 => '102400',
+        }],
+    },
     0x900 => { #11
         Name => 'ManometerPressure',
         Writable => 'int16u',
@@ -2651,6 +2788,66 @@ my %indexInfo = (
     },
 );
 
+# ref 25
+%Image::ExifTool::Olympus::AFTargetInfo = (
+    PROCESS_PROC => \&Image::ExifTool::ProcessBinaryData,
+    WRITE_PROC => \&Image::ExifTool::WriteBinaryData,
+    CHECK_PROC => \&Image::ExifTool::CheckBinaryData,
+    GROUPS => { 0 => 'MakerNotes', 2 => 'Camera' },
+    FIRST_ENTRY => 0,
+    FORMAT => 'int16u',
+    WRITABLE => 1,
+    NOTES => 'Position and size of selected AF Area and focus areas for OM cameras.',
+    0 => { Name => 'AFFrameSize', Format => 'int16u[2]' , Notes => 'width/height of the focus/select frame' },
+    2 => { Name => 'AFFocusArea', Format => 'int16u[4]' , Notes => 'X Y width height. The center is identical to AFPointSelected' },
+    6 => {
+        Name => 'AFSelectedArea',
+        Format => 'int16u[4]',
+        Notes => q{
+            X Y width height. Subject and Face Detection OFF: User selected AF target
+            area. Subject or Face Detection ON: Area related to detection process.
+        },
+    },
+);
+
+# ref 25
+%Image::ExifTool::Olympus::SubjectDetectInfo = (
+    PROCESS_PROC => \&Image::ExifTool::ProcessBinaryData,
+    WRITE_PROC => \&Image::ExifTool::WriteBinaryData,
+    CHECK_PROC => \&Image::ExifTool::CheckBinaryData,
+    GROUPS => { 0 => 'MakerNotes', 2 => 'Camera' },
+    FIRST_ENTRY => 0,
+    FORMAT => 'int16u',
+    WRITABLE => 1,
+    NOTES => q{
+        Subject Detection data for OM cameras. These tags contain the areas of a
+        subject and its elements detected by Subject Detection, or the main face and
+        eyes detected by Face Detection. These elements can be either L1 details
+        (level 1, such as head, chassis, airplane nose, etc.) or L2 details (level
+        2, such as eye, driver, airplane cockpit, etc.).
+    },
+    0 => { Name => 'SubjectDetectFrameSize', Format => 'int16u[2]', Notes => 'width/height of the subject detect frame' },
+    2 => { Name => 'SubjectDetectArea',      Format => 'int16u[4]', Notes => 'X Y width height' },
+    6 => { Name => 'SubjectDetectDetail',    Format => 'int16u[4]', Notes => 'X Y width height' },
+    10 => {
+        Name => 'SubjectDetectStatus',
+        Notes => q{
+            Indicates the presence of data related to subject and face detection, not
+            necessarily corresponding to the detection result
+        },
+        PrintConv => {
+              0 => 'No Data',
+            257 => 'Subject and L1 Detail Detected', # (head, airplane nose, ...)
+            258 => 'Subject and L2 Detail Detected', # (eye, airplane cockpit, ...)
+            260 => 'Subject Detected, No Details',
+            515 => 'Face and Eye Detected',
+            516 => 'Face Detected',
+            771 => 'Subject Detail or Eye Detected',
+            772 => 'No Subject or Face Detected',
+        },
+    },
+);
+
 # Olympus RAW processing IFD (ref 6)
 %Image::ExifTool::Olympus::RawDevelopment = (
     WRITE_PROC => \&Image::ExifTool::Exif::WriteExif,
@@ -2835,6 +3032,23 @@ my %indexInfo = (
         PrintConvColumns => 2,
         PrintConv => [ \%filters ],
     },
+    0x8000 => {
+        Name => 'RawDevSubIFD',
+        Groups => { 1 => 'MakerNotes' },
+        Flags => 'SubIFD',
+        FixFormat => 'ifd',
+        SubDirectory => {
+            TagTable => 'Image::ExifTool::Olympus::RawDevSubIFD',
+            Start => '$val',
+        },
+    },
+);
+
+%Image::ExifTool::Olympus::RawDevSubIFD = (
+    WRITE_PROC => \&Image::ExifTool::Exif::WriteExif,
+    CHECK_PROC => \&Image::ExifTool::Exif::CheckExif,
+    WRITABLE => 1,
+    GROUPS => { 0 => 'MakerNotes', 2 => 'Camera' },
 );
 
 # Olympus Image processing IFD
@@ -3073,6 +3287,11 @@ my %indexInfo = (
         # (use in conjunction with KeystoneDirection, -ve is Top or Right, +ve is Bottom or Left)
         Notes => '3 numbers: 1. Keystone Value, 2. Min, 3. Max',
     },
+    0x2110 => { #25
+        Name => 'GNDFilterType',
+        Format => 'int8u',
+        PrintConv => { 0 => 'High', 1 => 'Medium', 2 => 'Soft' },
+    },
 );
 
 # Olympus Focus Info IFD
@@ -3238,7 +3457,7 @@ my %indexInfo = (
     ],
     # 0x31a Continuous AF parameters?
     0x31b => [ #herb, based on investigations of abgestumpft: https://exiftool.org/forum/index.php?topic=14527.0
-               # for newer models E-Mxxx and OM-x 
+               # for newer models E-Mxxx and OM-x
         {
             Name => 'AFPointDetails',
             Condition => '$$self{Model} =~ m/^E-M|^OM-/ ',
@@ -3250,7 +3469,7 @@ my %indexInfo = (
                           (($val >> 8) & 0x3) . " " . (($val >> 7) & 0x1) . " " . (($val >> 5) & 0x1) . " " .
             #               eye AF                      face detect                 x-AF with MF
                           (($val >> 4) & 0x1) . " " . (($val >> 3) & 0x1) . " " . ($val & 0x7)',
-            #               release                     object found               MF...  
+            #               release                     object found               MF...
             PrintConvColumns => 4,
             PrintConv => [
                 {
@@ -3405,6 +3624,7 @@ my %indexInfo = (
         },
     },
     # 0x102a same as Subdir4-0x300
+    0x2100 => 'AntiShockWaitingTime', #25
 );
 
 # AF information (ref PH)
@@ -3419,6 +3639,10 @@ my %indexInfo = (
     # 0x36 - int16u: AFAreaHeight? (50)
     #  (AF area positions above give the top-left coordinates of the AF area in the
     #   AF frame. Increasing Y is downwards, and the AF frame size is about 1280x256)
+    0x062c => { #25
+        Name => 'CAFSensitivity',
+        Format => 'int8s',
+    },
 );
 
 # Olympus raw information tags (ref 6)

data/bin/lib/Image/ExifTool/Panasonic.pm

@@ -37,7 +37,7 @@ use vars qw($VERSION %leicaLensTypes);
 use Image::ExifTool qw(:DataAccess :Utils);
 use Image::ExifTool::Exif;
 
-$VERSION = '2.25';
+$VERSION = '2.26';
 
 sub ProcessLeicaLEIC($$$);
 sub WhiteBalanceConv($;$$);
@@ -1374,10 +1374,10 @@ my %shootingMode = (
         Writable => 'int16u',
         Format => 'int16s',
     },
-    0xbe => { #forum11194
+    0xbe => { #forum11194/17508
         Name => 'LongExposureNRUsed',
         Writable => 'int16u',
-        PrintConv => { 0 => 'No', 1 => 'Yes' },
+        PrintConv => { 1 => 'No', 2 => 'Yes' },
     },
     0xbf => { #forum11194
         Name => 'PostFocusMerging',