exiftool_vendored 13.33.0 → 13.36.0

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

@@ -31,7 +31,7 @@ use vars qw($VERSION);
 use Image::ExifTool qw(:DataAccess :Utils);
 use Image::ExifTool::Exif;
 
-$VERSION = '1.98';
+$VERSION = '1.99';
 
 sub ProcessFujiDir($$$);
 sub ProcessFaceRec($$$);
@@ -426,6 +426,16 @@ my %faceCategories = (
             0x300 => 'DR (Dynamic Range priority)',
         },
     },
+    0x1037 => { #forum17591
+        Name => 'MultipleExposure',
+        Writable => 'int16u', # (NC)
+        PrintConv => {
+            1 => 'Additive',
+            2 => 'Average',
+            3 => 'Light',
+            4 => 'Dark',
+        },
+    },
     0x1040 => { #8
         Name => 'ShadowTone',
         Writable => 'int32s',
@@ -586,16 +596,44 @@ my %faceCategories = (
         Name => 'SequenceNumber',
         Writable => 'int16u',
     },
+    0x1102 => { #forum17602
+        Name => 'WhiteBalanceBracketing',
+        Writable => 'int16u', # (NC)
+        PrintHex => 1,
+        PrintConv => {
+            0x01ff => '+/- 1',
+            0x02ff => '+/- 2',
+            0x03ff => '+/- 3',
+        },
+    },
     0x1103 => {
         Name => 'DriveSettings',
         SubDirectory => { TagTable => 'Image::ExifTool::FujiFilm::DriveSettings' },
     },
     0x1105 => { Name => 'PixelShiftShots',  Writable => 'int16u' }, #IB
     0x1106 => { Name => 'PixelShiftOffset', Writable => 'rational64s', Count => 2 }, #IB
-    # (0x1150-0x1152 exist only for Pro Low-light and Pro Focus PictureModes)
-    # 0x1150 - Pro Low-light - val=1; Pro Focus - val=2 (ref 7); HDR - val=128 (forum10799)
-    # 0x1151 - Pro Low-light - val=4 (number of pictures taken?); Pro Focus - val=2,3 (ref 7); HDR - val=3 (forum10799)
-    # 0x1152 - Pro Low-light - val=1,3,4 (stacked pictures used?); Pro Focus - val=1,2 (ref 7); HDR - val=3 (forum10799)
+    0x1150 => {
+        Name => 'CompositeImageMode',
+        Writable => 'int32u',
+        PrintConv => {
+            0 => 'n/a', #PH
+            1 => 'Pro Low-light', #7
+            2 => 'Pro Focus', #7
+            32 => 'Panorama', #PH
+            128 => 'HDR', #forum10799
+            1024 => 'Multi-exposure', #forum17591
+        },
+    },
+    0x1151 => {
+        Name => 'CompositeImageCount1',
+        Writable => 'int16u',
+        # Pro Low-light - val=4 (number of pictures taken?); Pro Focus - val=2,3 (ref 7); HDR - val=3 (forum10799)
+    },
+    0x1152 => {
+        Name => 'CompositeImageCount2',
+        Writable => 'int16u',
+        # Pro Low-light - val=1,3,4 (stacked pictures used?); Pro Focus - val=1,2 (ref 7); HDR - val=3 (forum10799)
+    },
     0x1153 => { #forum7668
         Name => 'PanoramaAngle',
         Writable => 'int16u',
@@ -605,8 +643,8 @@ my %faceCategories = (
         Writable => 'int16u',
         PrintConv => {
             1 => 'Right',
-            2 => 'Up',
-            3 => 'Left',
+            2 => 'Up', # (or Left?, forum17591)
+            3 => 'Left', # (or Up?, forum17591)
             4 => 'Down',
         },
     },
@@ -1558,20 +1596,21 @@ my %faceCategories = (
     TAG_PREFIX => 'MRAW',
     NOTES => q{
         Tags extracted from the M-RAW header of multi-image RAF files.  The family 1
-        group name for these tags is "M-RAW".
-    },
-    1 => { Name => 'RawImageNumber', Format => 'int32u' },
-    # 3 - seen "0 100", "-300 100" and "300 100" for a sequence of 3 images
-    3 => { Name => 'ExposureCompensation', Format => 'rational32s', Unknown => 1, Hidden => 1, PrintConv => 'sprintf("%+.2f",$val)' },
-    # 4 - (same value as 3 in all my samples)
-    4 => { Name => 'ExposureCompensation2', Format => 'rational32s', Unknown => 1, Hidden => 1, PrintConv => 'sprintf("%+.2f",$val)' },
-    # 5 - seen "10 1600", "10 6800", "10 200", "10 35000" etc
-    5 => { Name => 'ExposureTime', Format => 'rational64u', PrintConv => 'Image::ExifTool::Exif::PrintExposureTime($val)' },
-    # 6 - seen "450 100", "400 100" (all images in RAF have same value)
-    6 => { Name => 'FNumber', Format => 'rational64u', PrintConv => 'Image::ExifTool::Exif::PrintFNumber($val)' },
-    # 7 - seen 200, 125, 250, 2000
-    7 => 'ISO',
-    # 8 - seen 0, 65536
+        group name for these tags is "M-RAW".  Additional metadata may be extracted
+        from the embedded RAW images with the ExtractEmbedded option.
+    },
+    0x2001 => { Name => 'RawImageNumber', Format => 'int32u' },
+    # 0x2003 - seen "0 100", "-300 100" and "300 100" for a sequence of 3 images
+    0x2003 => { Name => 'ExposureCompensation', Format => 'rational32s', Unknown => 1, Hidden => 1, PrintConv => 'sprintf("%+.2f",$val)' },
+    # 0x2004 - (same value as 3 in all my samples)
+    0x2004 => { Name => 'ExposureCompensation2', Format => 'rational32s', Unknown => 1, Hidden => 1, PrintConv => 'sprintf("%+.2f",$val)' },
+    # 0x2005 - seen "10 1600", "10 6800", "10 200", "10 35000" etc
+    0x2005 => { Name => 'ExposureTime', Format => 'rational64u', PrintConv => 'Image::ExifTool::Exif::PrintExposureTime($val)' },
+    # 0x2006 - seen "450 100", "400 100" (all images in RAF have same value)
+    0x2006 => { Name => 'FNumber', Format => 'rational64u', PrintConv => 'Image::ExifTool::Exif::PrintFNumber($val)' },
+    # 0x2007 - seen 200, 125, 250, 2000
+    0x2007 => 'ISO',
+    # 0x2008 - seen 0, 65536
 );
 
 #------------------------------------------------------------------------------
@@ -1684,6 +1723,7 @@ sub ProcessFujiDir($$$)
 sub ProcessMRAW($$$)
 {
     my ($et, $dirInfo, $tagTablePtr) = @_;
+    return 1 if $$et{DOC_NUM};
     my $dataPt = $$dirInfo{DataPt};
     my $dataPos = $$dirInfo{DataPos};
     my $dataLen = length $$dataPt;
@@ -1697,15 +1737,16 @@ sub ProcessMRAW($$$)
     my $pos = 44;
     my ($i, $n);
     for ($n=0; ; ++$n) {
-        $pos += 16;  # skip offset/size fields
-        my $end = $pos + $size;
+        my $end = $pos + 16 + $size;
         last if $end > $dataLen;
+        my $rafStart = Get64u($dataPt, $pos);
+        my $rafLen = Get64u($dataPt, $pos+8);
+        $pos += 16;  # skip offset/size fields
         $$et{DOC_NUM} = ++$$et{DOC_COUNT} if $pos > 60;
         $et->VPrint(0, "$$et{INDENT}(Raw image $n parameters: $size bytes, $num entries)\n");
         for ($i=0; $i<$num; ++$i) {
             last if $pos + 4 > $end;
-            # (don't know what the byte at the current $pos is for, value = 0x20)
-            my $tag = Get8u($dataPt, $pos+1);
+            my $tag = Get16u($dataPt, $pos);
             my $size = Get16u($dataPt, $pos+2);
             $pos += 4;
             last if $pos + $size > $end;
@@ -1717,6 +1758,21 @@ sub ProcessMRAW($$$)
             );
             $pos += $size;
         }
+        if ($rafStart and $et->Options('ExtractEmbedded')) {
+            if ($et->Options('Verbose')) {
+                my $msg = sprintf("$$et{INDENT}(RAW image $n data: Start=0x%x, Length=0x%x)\n",$rafStart,$rafLen);
+                $et->VPrint(0, $msg);
+            }
+            my $raf = $$et{RAF};
+            my $tell = $raf->Tell();
+            my $order = GetByteOrder();
+            my $fujiWidth = $$et{FujiWidth};
+            $raf->Seek($rafStart, 0) or next;
+            ProcessRAF($et, { RAF => $raf, Base => $rafStart });
+            $$et{FujiWidth} = $fujiWidth;
+            SetByteOrder($order);
+            $raf->Seek($tell, 0);
+        }
     }
     delete $$et{DOC_NUM};
     return 1;
@@ -1870,6 +1926,7 @@ sub ProcessRAF($$)
     my ($buff, $jpeg, $warn, $offset);
 
     my $raf = $$dirInfo{RAF};
+    my $base = $$dirInfo{Base} || 0;
     $raf->Read($buff,0x70) == 0x70    or return 0;
     $buff =~ /^FUJIFILM/              or return 0;
     # get position and size of M-RAW header and jpeg preview
@@ -1877,13 +1934,13 @@ sub ProcessRAF($$)
     my ($jpos, $jlen) = unpack('x84NN', $buff);
     $jpos & 0x8000                   and return 0;
     if ($jpos) {
-        $raf->Seek($jpos, 0)              or return 0;
+        $raf->Seek($jpos+$base, 0)        or return 0;
         $raf->Read($jpeg, $jlen) == $jlen or return 0;
     }
     SetByteOrder('MM');
-    $et->SetFileType();
+    $et->SetFileType() unless $$et{DOC_NUM};
     my $tbl = GetTagTable('Image::ExifTool::FujiFilm::RAFHeader');
-    $et->ProcessDirectory({ DataPt => \$buff, DirName => 'RAFHeader' }, $tbl);
+    $et->ProcessDirectory({ DataPt => \$buff, DirName => 'RAFHeader', Base => $base }, $tbl);
     
     # extract information from embedded JPEG
     my %dirInfo = (
@@ -1891,21 +1948,22 @@ sub ProcessRAF($$)
         RAF    => File::RandomAccess->new(\$jpeg),
     );
     if ($jpos) {
-        $$et{BASE} += $jpos;
+        $$et{BASE} += $jpos + $base;
         my $ok = $et->ProcessJPEG(\%dirInfo);
-        $$et{BASE} -= $jpos;
+        $$et{BASE} -= $jpos + $base;
         $et->FoundTag('PreviewImage', \$jpeg) if $ok;
     }
     # extract information from Fuji RAF and TIFF directories
     my ($rafNum, $ifdNum) = ('','');
     foreach $offset (0x48, 0x5c, 0x64, 0x78, 0x80) {
         last if $jpos and $offset >= $jpos;
-        unless ($raf->Seek($offset, 0) and $raf->Read($buff, 8)) {
+        unless ($raf->Seek($offset+$base, 0) and $raf->Read($buff, 8)) {
             $warn = 1;
             last;
         }
         my ($start, $len) = unpack('N2',$buff);
         next unless $start;
+        $start += $base;
         if ($offset == 0x64 or $offset == 0x80) {
             # parse FujiIFD directory
             %dirInfo = (

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

@@ -32,7 +32,7 @@ use strict;
 use vars qw($VERSION);
 use Image::ExifTool qw(:DataAccess :Utils);
 
-$VERSION = '1.29';
+$VERSION = '1.30';
 
 # program map table "stream_type" lookup (ref 6/1/9)
 my %streamType = (
@@ -557,7 +557,7 @@ sub ProcessM2TS($$)
 {
     my ($et, $dirInfo) = @_;
     my $raf = $$dirInfo{RAF};
-    my ($buff, $pLen, $upkPrefix, $j, $fileType, $eof);
+    my ($buff, $pLen, $j, $fileType, $eof);
     my (%pmt, %pidType, %data, %sectLen, %packLen, %fromStart);
     my ($startTime, $endTime, $fwdTime, $backScan, $maxBack);
     my $verbose = $et->Options('Verbose');
@@ -570,10 +570,8 @@ sub ProcessM2TS($$)
     unless ($1) {
         $pLen = 188;        # no timecode
         $fileType = 'M2T';  # (just as a way to tell there is no timecode)
-        $upkPrefix = 'N';
     } else {
         $pLen = 192; # 188-byte transport packet + leading 4-byte timecode (ref 4)
-        $upkPrefix = 'x4N';
     }
     my $prePos = $pLen - 188;       # byte position of packet prefix
     my $readSize = 64 * $pLen;      # size of our read buffer

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

@@ -49,7 +49,7 @@ use vars qw($VERSION %minoltaLensTypes %minoltaTeleconverters %minoltaColorMode
 use Image::ExifTool qw(:DataAccess :Utils);
 use Image::ExifTool::Exif;
 
-$VERSION = '2.88';
+$VERSION = '2.89';
 
 # Full list of product codes for Sony-compatible Minolta lenses
 # (ref http://www.kb.sony.com/selfservice/documentLink.do?externalId=C1000570)
@@ -603,6 +603,8 @@ $VERSION = '2.88';
     19 => 'Vivid 2', #JR (7SM3)
     20 => 'IN', #JR (7SM3)
     21 => 'SH', #JR (7SM3)
+    22 => 'FL2', #JR (ILME-FX2)
+    23 => 'FL3', #JR (ILME-FX2)
     100 => 'Neutral', #JD
     101 => 'Clear', #JD
     102 => 'Deep', #JD

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

@@ -65,7 +65,7 @@ use Image::ExifTool::Exif;
 use Image::ExifTool::GPS;
 use Image::ExifTool::XMP;
 
-$VERSION = '4.49';
+$VERSION = '4.51';
 
 sub LensIDConv($$$);
 sub ProcessNikonAVI($$$);
@@ -583,6 +583,7 @@ sub GetAFPointGrid($$;$);
     '0E 4A 31 48 23 2D 0E 02' => 'Tamron SP AF 20-40mm f/2.7-3.5 (166D)',
     'FE 48 37 5C 24 24 DF 0E' => 'Tamron SP 24-70mm f/2.8 Di VC USD (A007)', #24
     'CE 47 37 5C 25 25 DF 4E' => 'Tamron SP 24-70mm f/2.8 Di VC USD G2 (A032)', #forum9110
+    'CE 00 37 5C 25 25 DF 4E' => 'Tamron SP 24-70mm f/2.8 Di VC USD G2 (A032)', #github345
     '45 41 37 72 2C 3C 48 02' => 'Tamron SP AF 24-135mm f/3.5-5.6 AD Aspherical (IF) Macro (190D)',
     '33 54 3C 5E 24 24 62 02' => 'Tamron SP AF 28-75mm f/2.8 XR Di LD Aspherical (IF) Macro (A09)',
     'FA 54 3C 5E 24 24 84 06' => 'Tamron SP AF 28-75mm f/2.8 XR Di LD Aspherical (IF) Macro (A09NII)', #JD
@@ -723,6 +724,7 @@ sub GetAFPointGrid($$;$);
     '9F 48 48 48 24 24 A1 06' => 'Yongnuo YN40mm F2.8N', #30
     '9F 54 68 68 18 18 A2 06' => 'Yongnuo YN100mm F2N', #30
     '9F 4C 44 44 18 18 A1 06' => 'Yongnuo YN35mm F2', #30
+    '9F 4D 50 50 14 14 A0 06' => 'Yongnuo YN50mm F1.8N', #30
 #
     '02 40 44 5C 2C 34 02 00' => 'Exakta AF 35-70mm 1:3.5-4.5 MC',
 #

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

@@ -41,7 +41,7 @@ use Image::ExifTool qw(:DataAccess :Utils);
 use Image::ExifTool::Exif;
 use Image::ExifTool::APP12;
 
-$VERSION = '2.88';
+$VERSION = '2.90';
 
 sub PrintLensInfo($$$);
 
@@ -117,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
@@ -1944,14 +1945,14 @@ my %indexInfo = (
             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',
+            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 => {
@@ -2252,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',
         }],
@@ -2514,7 +2518,7 @@ my %indexInfo = (
             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 {
+        PrintConv => q{
             my ($a,$b,$c,$d,$e,$f) = split ' ',$val;
             if ($b) {
                 $b = ', Shot ' . $b;
@@ -2618,10 +2622,10 @@ my %indexInfo = (
         RawConv => '$$self{ImageStabilization} = $val',
         PrintConv => {
             0 => 'Off',
-            1 => 'On, S-IS1 (All Direction Shake I.S.)', #25
-            2 => 'On, S-IS2 (Vertical Shake I.S.)', #25
-            3 => 'On, S-IS3 (Horizontal Shake I.S.)', #25
-            4 => 'On, S-IS Auto (Auto I.S.)', #25
+            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)
@@ -2793,15 +2797,16 @@ my %indexInfo = (
     FIRST_ENTRY => 0,
     FORMAT => 'int16u',
     WRITABLE => 1,
-    0 => { Name => 'AFFrameSize', Format => 'int16u[2]' },
-    2 => { Name => 'AFFocusArea', Format => 'int16u[4]' },
+    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 Detection OFF: User selected AF target area.
-            Subject Detection ON: Area related to subject
-        }
+            X Y width height. Subject and Face Detection OFF: User selected AF target
+            area. Subject or Face Detection ON: Area related to detection process.
+        },
     },
 );
 
@@ -2810,21 +2815,35 @@ my %indexInfo = (
     PROCESS_PROC => \&Image::ExifTool::ProcessBinaryData,
     WRITE_PROC => \&Image::ExifTool::WriteBinaryData,
     CHECK_PROC => \&Image::ExifTool::CheckBinaryData,
-    NOTES => 'Subject Detection for OM cameras.',
     GROUPS => { 0 => 'MakerNotes', 2 => 'Camera' },
     FIRST_ENTRY => 0,
     FORMAT => 'int16u',
     WRITABLE => 1,
-    0 => { Name => 'SubjectDetectFrameSize', Format => 'int16u[2]' },
+    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]' },
+    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 => {
-            256 => 'Level 2 Detail', # (eye, airplane cockpit, ...)
-            257 => 'Level 1 Detail', # (head, airplane nose, ...)
-            260 => 'Subject Detected, No Detail',
-            772 => 'No Detection',
+              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',
         },
     },
 );

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

@@ -59,7 +59,7 @@ use Image::ExifTool::Exif;
 use Image::ExifTool::GPS;
 use Image::ExifTool::HP;
 
-$VERSION = '3.54';
+$VERSION = '3.57';
 
 sub CryptShutterCount($$);
 sub PrintFilter($$$);
@@ -564,6 +564,7 @@ my %pentaxModelID = (
     0x1329a => 'GR IIIx', # (Ricoh)
     0x132b8 => 'KF', #github322 (Ricoh)
     0x132d6 => 'K-3 Mark III Monochrome', #github226 (Ricoh)
+    0x132e0 => 'GR IV', #github347 (Ricoh)
 );
 
 # Pentax city codes - (PH, Optio WP)
@@ -1977,6 +1978,8 @@ my %binaryDataAttrs = (
             '18 3' => 'Auto Program (MTF)', #PH (NC)
             '18 22' => 'Auto Program (Shallow DOF)', #PH (NC)
             '20 22' => 'Blur Control', #PH (Q)
+            '24 0' => 'Aperture Priority (Adv.Hyp)', #KG
+            '25 0' => 'Manual Exposure (Adv.Hyp)', #KG
             '26 0' => 'Shutter and Aperture Priority (TAv)', #PH (K-3III)
             '249 0' => 'Movie (TAv)', #31
             '250 0' => 'Movie (TAv, Auto Aperture)', #31
@@ -1998,10 +2001,13 @@ my %binaryDataAttrs = (
         Count => 4,
         PrintConv => [{
             0 => 'Single-frame', # (also Interval Shooting for K-01 - PH)
-            1 => 'Continuous', # (K-5 Hi)
-            2 => 'Continuous (Lo)', #PH (K-5)
+            1 => 'Continuous',   #KG  *ist D, *ist Ds, *ist DS2, K110D, K10D, K100D, K100D Super, K20D, Ricoh GR III / GR IIIx
+                                 #KG  Hi:   K200D, K-x, K-7, K-r, K-5, K-01, K-5 II, K-5 IIs, K-30, K-500, K-50, K-S1, K-S2, K-70
+                                 #KG  High: K-3, K-3 II, K-1, K-1 II, KP, K-3 III, K-3 III Mono
+            2 => 'Continuous (Lo)',     #KG all models listed under 'Hi'
             3 => 'Burst', #PH (K20D)
-            4 => 'Continuous (Medium)', #PH (K-3)
+            4 => 'Continuous (Medium)', #KG all models listed under 'High'
+            5 => 'Continuous (Low)',    #KG all models listed under 'High'
             255 => 'Video', #PH (K-x)
         },{
             0 => 'No Timer',
@@ -3009,7 +3015,7 @@ my %binaryDataAttrs = (
     }],
     0x022b => [{
         Name => 'LevelInfoK3III',
-        Condition => '$$self{Model} eq "PENTAX K-3 Mark III"',
+        Condition => '$$self{Model} =~ /K-3 Mark III/',
         SubDirectory => { TagTable => 'Image::ExifTool::Pentax::LevelInfoK3III' },
     },{ #PH (K-5)
         Name => 'LevelInfo',
@@ -5066,7 +5072,7 @@ my %binaryDataAttrs = (
     },
     0x14 => {
         Name => 'AFPointValues',
-        Condition => '$$self{Model} eq "PENTAX K-3 Mark III"', # any other models?
+        Condition => '$$self{Model} =~ /K-3 Mark III/', #KG
         Format => 'int16uRev[69]',
         Unknown => 1,
         Notes => 'some unknown values related to each AFPoint',
@@ -5079,7 +5085,7 @@ my %binaryDataAttrs = (
     },
     0x12a => {
         Name => 'AFPointsSelected', # (should probably be "AFPointSelected", but the bitmask allows multiple points)
-        Condition => '$$self{Model} eq "PENTAX K-3 Mark III"', # any other models?
+        Condition => '$$self{Model} =~ /K-3 Mark III/',
         Notes => q{
             K-3III only. 41 selectable AF points from a total of 101 available in a 13x9
             grid. Columns are labelled A-M and rows are 1-9. The center point is G5. The
@@ -5097,7 +5103,7 @@ my %binaryDataAttrs = (
     0x18f => { # byte has a value of 1 if corresponding AF point is ... in focus maybe?
         # usually the same points as AFPointsSelected above, but not always
         Name => 'AFPointsUnknown',
-        Condition => '$$self{Model} eq "PENTAX K-3 Mark III"', # any other models?
+        Condition => '$$self{Model} =~ /K-3 Mark III/', #KG
         Unknown => 1,
         Format => 'int8u[101]',
         PrintConv => \&AFPointNamesK3III,
@@ -5105,7 +5111,7 @@ my %binaryDataAttrs = (
     0x1fa => {
         Name => 'LiveView',
         Notes => 'decoded only for the K-3 III',
-        Condition => '$$self{Model} eq "PENTAX K-3 Mark III"', # and other models?
+        Condition => '$$self{Model} =~ /K-3 Mark III/', #KG
         PrintConv => { 0 => 'Off', 1 => 'On' },
     },
     0x1fd => {
@@ -5114,6 +5120,54 @@ my %binaryDataAttrs = (
         Condition => '$$self{Model} eq "PENTAX K-3 II"',
         PrintConv => { 0 => 'Off', 1 => 'Short', 2 => 'Medium', 3 => 'Long' },
     },
+    0x021f => { #KG
+        Name => 'FirstFrameActionInAFC',
+        Condition => '$$self{Model} =~ /K-3 Mark III/',
+        PrintConv => {
+            '0'   => 'Auto',
+            '1'   => 'Release Priority',
+            '2'   => 'Focus Priority',
+            # there is at least another value '3' but I couldn't figure out the
+            # meaning. However, this occurs for a few AF-S captures, so it has
+            # no real practical meaning.
+        },
+    },
+    0x0220 => { #KG
+        Name => 'ActionInAFCCont',
+        Condition => '$$self{Model} =~ /K-3 Mark III/',
+        PrintConv => {
+            '0'   => 'Auto',
+            '1'   => 'Focus Priority',
+            '2'   => 'FPS Priority',
+        },
+    },
+    545 => { #KG
+        Name => 'AFCHold',
+        Condition => '$$self{Model} =~ /K-3 Mark III/',
+        Mask => 0x03,
+        PrintConv => { 0 => 'Low', 1 => 'Medium', 2 => 'High', 3 => 'Off' },
+    },
+    545.1 => { #KG
+        Name => 'AFCPointTracking',
+        Condition => '$$self{Model} =~ /K-3 Mark III/',
+        Mask => 0x0c,
+        PrintConv => { 0 => 'Type 1', 1 => 'Type 2', 2 => 'Type 3' },
+    },
+    545.2 => { #KG
+        Name => 'AFCSensitivity',
+        Condition => '$$self{Model} =~ /K-3 Mark III/',
+        Mask => 0x70,
+        PrintConv => '5 - $val',
+        PrintConvInv => '5 - $val',
+    },
+    0x0960 => { #KG
+        Name => 'SubjectRecognition',
+        Condition => '$$self{Model} =~ /K-3 Mark III/',
+        PrintConv => {
+            0 => 'Off',
+            1 => 'On',
+        },
+    },
 );
 
 # AF information for K-01 and later (ref Karsten Gieselmann private communication)
@@ -6023,6 +6077,14 @@ my %binaryDataAttrs = (
         K-500.  It is currently not known where the corresponding temperature
         sensors are located in the camera.
     },
+    0x0a => { #KG
+          Name => 'ShotNumber',
+          Condition => '$$self{Model} =~ /K-3 Mark III/',
+          # The exact same method to detect this tag with a similar set of files
+          # does not reveal anything for K-1. Is this only available for K-3-III ?
+          # Internal representation starts at 0 for the 1st shot
+          ValueConv => '$val+1',
+    },
     # (it would be nice to know where these temperature sensors are located,
     #  but since according to the manual the Slow Shutter Speed NR Auto mode
     #  is based on "internal temperature", my guess is that there must be

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

@@ -18,7 +18,7 @@ use strict;
 use vars qw($VERSION);
 use Image::ExifTool qw(:DataAccess :Utils);
 
-$VERSION = '1.03';
+$VERSION = '1.04';
 
 sub ProcessProtobuf($$$;$);
 

data/bin/lib/Image/ExifTool/QuickTimeStream.pl

@@ -111,7 +111,7 @@ my %insvLimit = (
         The tags below are extracted from timed metadata in QuickTime and other
         formats of video files when the ExtractEmbedded option is used.  Although
         most of these tags are combined into the single table below, ExifTool
-        currently reads 110 different types of timed GPS metadata from video files.
+        currently reads 111 different types of timed GPS metadata from video files.
     },
     GPSLatitude  => { PrintConv => 'Image::ExifTool::GPS::ToDMS($self, $val, 1, "N")', RawConv => '$$self{FoundGPSLatitude} = 1; $val' },
     GPSLongitude => { PrintConv => 'Image::ExifTool::GPS::ToDMS($self, $val, 1, "E")' },

data/bin/lib/Image/ExifTool/README

@@ -802,7 +802,8 @@ numerical, and generated automatically otherwise.
   Shift         : [Writable tags only] Specifies type of shift to apply if this
                   value may be shifted.  Set to 'Time' for shifting date/time
                   tags, or '0' to prevent tag from being shifted or
-                  conditionally deleted.
+                  conditionally deleted.  May not be used for Writable Composite
+                  tags.
 
   Writable      : Indicates this tag can be written (or not written if Writable
                   is set to zero), and for EXIF and QuickTime tables gives