exiftool-vendored.exe 13.29.0 → 13.31.0

package/bin/exiftool_files/exiftool.pl

@@ -11,7 +11,7 @@ use strict;
 use warnings;
 require 5.004;
 
-my $version = '13.29';
+my $version = '13.31';
 
 $^W = 1;    # enable global warnings
 
@@ -26,9 +26,9 @@ BEGIN {
     # add lib directory at start of include path
     unshift @INC, ($0 =~ /(.*)[\\\/]/) ? "$1/lib" : './lib';
     # load or disable config file if specified
-    if (@ARGV and lc($ARGV[0]) eq '-config') {
+    while (@ARGV and lc($ARGV[0]) eq '-config') {
         shift;
-        $Image::ExifTool::configFile = shift;
+        push @Image::ExifTool::configFiles, shift;
     }
 }
 use Image::ExifTool qw{:Public};
@@ -1409,8 +1409,7 @@ for (;;) {
                 # add geotag/geosync/geolocate commands first
                 unshift @newValues, pop @newValues;
                 if (lc $2 eq 'geotag' and (not defined $addGeotime or $addGeotime) and length $val) {
-                    $addGeotime = [ ($1 || '') . 'Geotime<DateTimeOriginal#',
-                                    ($1 || '') . 'Geotime<SubSecDateTimeOriginal#' ];
+                    $addGeotime = ($1 || '') . q[Geotime<${DateTimeOriginal#;$_=$self->GetValue('SubSecDateTimeOriginal','ValueConv') || $_}];
                 }
             }
         }
@@ -1698,9 +1697,8 @@ if (@newValues) {
     # assume -geotime value if -geotag specified without -geotime
     if ($addGeotime) {
         AddSetTagsFile($setTagsFile = '@') unless $setTagsFile and $setTagsFile eq '@';
-        push @{$setTags{$setTagsFile}}, @$addGeotime;
-        my @a = map qq("-$_"), @$addGeotime;
-        $verbose and print $vout 'Arguments ',join(' and ', @a)," are assumed\n";
+        push @{$setTags{$setTagsFile}}, $addGeotime;
+        $verbose and print $vout qq(Using default "-$addGeotime"\n);
     }
     my %setTagsIndex;
     # add/delete option lookup

package/bin/exiftool_files/lib/Image/ExifTool/BuildTagLookup.pm

@@ -995,7 +995,7 @@ TagID:  foreach $tagID (@keys) {
                     if ($format and $format =~ /\$val\{/ and
                         ($$tagInfo{Writable} or not defined $$tagInfo{Writable}))
                     {
-                        warn "Warning: \$var{} used in Format of writable tag - $short $name\n"
+                        warn "Warning: \$val{} used in Format of writable tag - $short $name\n"
                     }
                 }
                 if ($$tagInfo{Hidden}) {

package/bin/exiftool_files/lib/Image/ExifTool/Canon.pm

@@ -88,7 +88,7 @@ sub ProcessCTMD($$$);
 sub ProcessExifInfo($$$);
 sub SwapWords($);
 
-$VERSION = '4.90';
+$VERSION = '4.92';
 
 # Note: Removed 'USM' from 'L' lenses since it is redundant - PH
 # (or is it?  Ref 32 shows 5 non-USM L-type lenses)
@@ -636,8 +636,10 @@ $VERSION = '4.90';
    '61182.58' => 'Canon RF 70-200mm F2.8 L IS USM Z + RF1.4x', #42
    '61182.59' => 'Canon RF 70-200mm F2.8 L IS USM Z + RF2x', #42
    '61182.60' => 'Canon RF 16-28mm F2.8 IS STM', #42
-   '61182.61' => 'Canon RF 50mm F1.4 L VCM', #42
-   '61182.62' => 'Canon RF 24mm F1.4 L VCM', #42
+   '61182.61' => 'Canon RF-S 14-30mm F4-6.3 IS STM PZ', #42
+   '61182.62' => 'Canon RF 50mm F1.4 L VCM', #42
+   '61182.63' => 'Canon RF 24mm F1.4 L VCM', #42
+   '61182.64' => 'Canon RF 20mm F1.4 L VCM', #42
     65535 => 'n/a',
 );
 
@@ -1005,6 +1007,7 @@ $VERSION = '4.90';
     0x80000495 => 'EOS R1', #PH
     0x80000496 => 'R5 Mark II', #forum16406
     0x80000498 => 'EOS R100', #25
+    0x80000516 => 'EOS R50 V', #42
     0x80000520 => 'EOS D2000C', #IB
     0x80000560 => 'EOS D6000C', #PH (guess)
 );
@@ -7031,8 +7034,10 @@ my %ciMaxFocal = (
             320 => 'Canon RF 70-200mm F2.8 L IS USM Z + RF1.4x', #42
             321 => 'Canon RF 70-200mm F2.8 L IS USM Z + RF2x', #42
             323 => 'Canon RF 16-28mm F2.8 IS STM', #42
+            324 => 'Canon RF-S 14-30mm F4-6.3 IS STM PZ', #42
             325 => 'Canon RF 50mm F1.4 L VCM', #42
             326 => 'Canon RF 24mm F1.4 L VCM', #42
+            327 => 'Canon RF 20mm F1.4 L VCM', #42
             # Note: add new RF lenses to %canonLensTypes with ID 61182
         },
     },

package/bin/exiftool_files/lib/Image/ExifTool/Exif.pm

@@ -57,7 +57,7 @@ use vars qw($VERSION $AUTOLOAD @formatSize @formatName %formatNumber %intFormat
 use Image::ExifTool qw(:DataAccess :Utils);
 use Image::ExifTool::MakerNotes;
 
-$VERSION = '4.56';
+$VERSION = '4.58';
 
 sub ProcessExif($$$);
 sub WriteExif($$$);
@@ -2081,7 +2081,7 @@ my %opcodeInfo = (
     0x8822 => {
         Name => 'ExposureProgram',
         Groups => { 2 => 'Camera' },
-        Notes => 'the value of 9 is not standard EXIF, but is used by the Canon EOS 7D',
+        Notes => 'the value of 9 is not standard EXIF, but is used by some Canon models',
         Writable => 'int16u',
         PrintConv => {
             0 => 'Not Defined',
@@ -4350,6 +4350,7 @@ my %opcodeInfo = (
         Writable => 'undef',
         WriteGroup => 'IFD0',
         Protected => 1,
+        Binary => 1,
     },
     0xcd40 => { # DNG 1.7
         Name => 'ProfileGainTableMap2',
@@ -5804,6 +5805,8 @@ sub PrintLensID($$@)
     }
     if ($$et{Make} eq 'SONY') {
         if ($lensType eq 65535) {
+            # patch for manual lens (forum17379)
+            return $$printConv{$lensType} if $$printConv{$lensType} and not $focalLength and $maxAperture == 1;
             # handle Sony E-type lenses when LensType2 isn't valid (NEX/ILCE models only)
             if ($$et{Model} =~ /NEX|ILCE/) {
                 unless (%sonyEtype) {

package/bin/exiftool_files/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.96';
+$VERSION = '1.97';
 
 sub ProcessFujiDir($$$);
 sub ProcessFaceRec($$$);
@@ -628,6 +628,10 @@ my %faceCategories = (
             0x60006 => 'Partial Color Purple',
             0x70000 => 'Soft Focus',
             0x90000 => 'Low Key',
+            0x100000 => 'Light Leak', #forum17392
+            0x130000 => 'Expired Film Green', #forum17392
+            0x130001 => 'Expired Film Red', #forum17392 (NC)
+            0x130002 => 'Expired Film Neutral', #forum17392
         },
     },
     0x1210 => { #2

package/bin/exiftool_files/lib/Image/ExifTool/GoPro.pm

@@ -17,7 +17,7 @@ use vars qw($VERSION);
 use Image::ExifTool qw(:DataAccess :Utils);
 use Image::ExifTool::QuickTime;
 
-$VERSION = '1.12';
+$VERSION = '1.13';
 
 sub ProcessGoPro($$$);
 sub ProcessString($$$);
@@ -762,7 +762,7 @@ sub ProcessString($$$)
 }
 
 #------------------------------------------------------------------------------
-# Process "GP\x06\0" records in MP4 'mdat'atom
+# Process "GP\x06\0" records in MP4 'mdat' atom
 # Inputs: 0) ExifTool object ref, 1) dirInfo ref (RAF and DirLen)
 # Returns: size of GoPro record, or 0 on error
 sub ProcessGP6($$)
@@ -815,9 +815,16 @@ sub ProcessGoPro($$$)
 
     for (; $pos+8<=$dirEnd; $pos+=($size+3)&0xfffffffc) {
         my ($tag,$fmt,$len,$count) = unpack("x${pos}a4CCn", $$dataPt);
+        if ($tag =~ /[^-_a-zA-Z0-9 ]/) {
+            $et->Warn('Unrecognized GoPro record') unless $tag eq "\0\0\0\0";
+            last;
+        }
         $size = $len * $count;
         $pos += 8;
-        last if $pos + $size > $dirEnd;
+        if ($pos + $size > $dirEnd) {
+            $et->Warn('Truncated GoPro record');
+            last;
+        }
         my $tagInfo = $et->GetTagInfo($tagTablePtr, $tag);
         last if $tag eq "\0\0\0\0";     # stop at null tag
         next unless $size or $verbose;  # don't save empty values unless verbose

package/bin/exiftool_files/lib/Image/ExifTool/LNK.pm

@@ -7,6 +7,7 @@
 #
 # References:   1) http://msdn.microsoft.com/en-us/library/dd871305(PROT.10).aspx
 #               2) http://www.i2s-lab.com/Papers/The_Windows_Shortcut_File_Format.pdf
+#               3) https://harfanglab.io/insidethelab/sadfuture-xdspy-latest-evolution/#tid_specifications_ignored
 #------------------------------------------------------------------------------
 
 package Image::ExifTool::LNK;
@@ -15,7 +16,7 @@ use strict;
 use vars qw($VERSION);
 use Image::ExifTool qw(:DataAccess :Utils);
 
-$VERSION = '1.09';
+$VERSION = '1.10';
 
 sub ProcessItemID($$$);
 sub ProcessLinkInfo($$$);
@@ -647,17 +648,32 @@ sub ProcessLNK($$)
     my @strings = qw(Description RelativePath WorkingDirectory
                      CommandLineArguments IconFileName);
     for ($i=0; $i<@strings; ++$i) {
+        my ($val, $limit);
         my $mask = 0x04 << $i;
         next unless $flags & $mask;
         $raf->Read($buff, 2) or return 1;
+        my $pos = $raf->Tell();
         $len = unpack('v', $buff) or next;
+        # Windows doesn't follow their own specification and limits the length
+        # for most of these strings (ref 3)
+        if ($i != 3 and $len >= 260) {
+            $limit = 1;
+            if ($len > 260) {
+                $len = 260;
+                $et->Warn('LNK string data overrun! Possible security issue');
+            }
+        }
         $len *= 2 if $flags & 0x80;  # characters are 2 bytes if Unicode flag is set
         $raf->Read($buff, $len) or return 1;
-        my $val;
+        # remove last character if string is at length limit (Windows treats this as a null)
+        if ($limit) {
+            $len -= $flags & 0x80 ? 2 : 1;
+            $buff = substr($buff, 0, $len);
+        }
         $val = $et->Decode($buff, 'UCS2') if $flags & 0x80;
         $et->HandleTag($tagTablePtr, 0x30000 | $mask, $val,
             DataPt  => \$buff,
-            DataPos => $raf->Tell() - $len,
+            DataPos => $pos,
             Size    => $len,
         );
     }
@@ -716,6 +732,8 @@ under the same terms as Perl itself.
 
 =item L<http://www.i2s-lab.com/Papers/The_Windows_Shortcut_File_Format.pdf>
 
+=item L<https://harfanglab.io/insidethelab/sadfuture-xdspy-latest-evolution/#tid_specifications_ignored>
+
 =back
 
 =head1 SEE ALSO

package/bin/exiftool_files/lib/Image/ExifTool/Lang/de.pm

@@ -11,7 +11,7 @@ package Image::ExifTool::Lang::de;
 use strict;
 use vars qw($VERSION);
 
-$VERSION = '1.37';
+$VERSION = '1.38';
 
 %Image::ExifTool::Lang::de::Translate = (
    'AEAperture' => 'AE-Blende',
@@ -5126,6 +5126,7 @@ $VERSION = '1.37';
    'LensType' => {
       Description => 'Objektivtyp',
       PrintConv => {
+        'None' => 'Keiner',
         'Uncoded lens' => 'Nicht kodiertes Objektiv',
       },
     },

package/bin/exiftool_files/lib/Image/ExifTool/Lang/fr.pm

@@ -11,7 +11,7 @@ package Image::ExifTool::Lang::fr;
 use strict;
 use vars qw($VERSION);
 
-$VERSION = '1.36';
+$VERSION = '1.37';
 
 %Image::ExifTool::Lang::fr::Translate = (
    'AEAperture' => 'Ouverture AE',
@@ -6607,6 +6607,7 @@ $VERSION = '1.36';
    'LensType' => {
       Description => 'Type d\'objectif',
       PrintConv => {
+        'None' => 'Aucun',
         'n/a' => 'Non applicable',
         'smc PENTAX-F 100-300mm F4.5-5.6 or Sigma Lens' => 'smc PENTAX-F 100-300mm F4.5-5.6 ou objectif Sigma',
         'smc PENTAX-F 28-80mm F3.5-4.5 or Tokina Lens' => 'smc PENTAX-F 28-80mm F3.5-4.5 ou objectif Tokina',

package/bin/exiftool_files/lib/Image/ExifTool/LigoGPS.pm

@@ -11,7 +11,7 @@ use strict;
 use vars qw($VERSION);
 use Image::ExifTool;
 
-$VERSION = '1.04';
+$VERSION = '1.06';
 
 sub ProcessLigoGPS($$$;$);
 sub ProcessLigoJSON($$$);
@@ -223,11 +223,12 @@ sub DecipherLigoGPS($$$;$)
 #------------------------------------------------------------------------------
 # Parse decrypted/deciphered (but not defuzzed) LIGOGPSINFO record
 # (record starts with 4-byte int32u counter followed by date/time, etc)
-# Inputs: 0) ExifTool ref, 1) GPS string, 2) tag table ref, 3) not fuzzed
+# Inputs: 0) ExifTool ref, 1) GPS string, 2) tag table ref,
+#         3) flags: 0x01=not fuzzed, 0x02=spd in km/h
 # Returns: nothing
 sub ParseLigoGPS($$$;$)
 {
-    my ($et, $str, $tagTbl, $noFuzz) = @_;
+    my ($et, $str, $tagTbl, $flags) = @_;
 
     # example string input
     # "....2022/09/19 12:45:24 N:31.285065 W:124.759483 46.93 km/h x:-0.000 y:-0.000 z:-0.000"
@@ -235,15 +236,16 @@ sub ParseLigoGPS($$$;$)
         $et->Warn('LIGOGPSINFO format error');
         return;
     }
+    $flags or $flags = 0;
     my ($time,$latRef,$latNeg,$lat,$lonRef,$lonNeg,$lon,$spd) = ($1,$2,$3,$4,$5,$6,$7,$8);
     my %gpsScl = ( 1 => 1.524855137, 2 => 1.456027985, 3 => 1.15368 );
-    my $spdScl = $noFuzz ? $knotsToKph : 1.85407333;
+    my $spdScl = $flags & 0x01 ? ($flags & 0x02 ? 1 : $knotsToKph) : 1.85407333;
     $$et{DOC_NUM} = ++$$et{DOC_COUNT};
     $time =~ tr(/)(:);
     # convert from DDMM.MMMMMM to DD.DDDDDD if necessary
     # (speed wasn't scaled in my 1 sample with this format)
     $lat =~ /^\d{3}/ and Image::ExifTool::QuickTime::ConvertLatLon($lat,$lon), $spdScl = 1;
-    unless ($noFuzz) { # unfuzz the coordinates if necessary
+    unless ($flags & 0x01) { # unfuzz the coordinates if necessary
         my $scl = $$et{OPTIONS}{LigoGPSScale} || $$et{LigoGPSScale} || 1;
         $scl = $gpsScl{$scl} if $gpsScl{$scl};
         ($lat, $lon) = UnfuzzLigoGPS($lat, $lon, $scl);
@@ -298,7 +300,13 @@ sub ProcessLigoGPS($$$;$)
     $et->VerboseDir($dirName);
     for (; $pos + 0x84 <= length($$dataPt); $pos+=0x84) {
         my $dat = substr($$dataPt, $pos, 0x84);
-        $dat =~ /^####/ or next; # (have seen blank records filled with zeros, so keep trying)
+        unless ($dat =~ /^####/) {
+            next unless $dat =~ m(^.{4}\d{4}/\d{2}/\d{2} )s; # (have seen blank records filled with zeros, so keep trying)
+            # non-encrypted format written by Redtiger F9 4K
+            $dat =~ s/\0+$//;   # remove trailing nulls
+            ParseLigoGPS($et, $dat, $tagTbl, 0x03);
+            next;
+        }
         # decipher if we already know the encryption
         $cipherInfo and $$cipherInfo{decipher} and DecipherLigoGPS($et, $dat, $tagTbl, $noFuzz) and next;
         my $str = DecryptLigoGPS($dat);
@@ -329,7 +337,7 @@ sub ProcessLigoJSON($$$)
     my $dataPt = $$dirInfo{DataPt};
     my $dirLen = $$dirInfo{DirLen};
     require Image::ExifTool::Import;
-    $et->VerboseDir('LIGO_JSON', undef, length($$dataPt) - pos($$dataPt));
+    $et->VerboseDir('LIGO_JSON', undef, length($$dataPt) - (pos($$dataPt) || 0));
     $$et{SET_GROUP1} = 'LIGO';
     while ($$dataPt =~ /LIGOGPSINFO (\{.*?\})/g) {
         my $json = $1;

package/bin/exiftool_files/lib/Image/ExifTool/MakerNotes.pm

@@ -21,7 +21,7 @@ sub ProcessKodakPatch($$$);
 sub WriteUnknownOrPreview($$$);
 sub FixLeicaBase($$;$);
 
-$VERSION = '2.16';
+$VERSION = '2.17';
 
 my $debug;          # set to 1 to enable debugging code
 
@@ -991,9 +991,9 @@ my $debug;          # set to 1 to enable debugging code
     {
         Name => 'MakerNoteSigma',
         Condition => q{
-            return undef unless $$self{Make}=~/^(SIGMA|FOVEON)/;
+            return undef unless $$self{Make}=~/^(SIGMA|FOVEON)/i;
             # save version number in "MakerNoteSigmaVer" member variable
-            $$self{MakerNoteSigmaVer} = $$valPt=~/^SIGMA\0\0\0\0(.)/ ? ord($1) : -1;
+            $$self{MakerNoteSigmaVer} = $$valPt=~/^SIGMA\0\0\0.(.)/s ? ord($1) : -1;
             return 1;
         },
         SubDirectory => {

package/bin/exiftool_files/lib/Image/ExifTool/Nikon.pm

@@ -65,7 +65,7 @@ use Image::ExifTool::Exif;
 use Image::ExifTool::GPS;
 use Image::ExifTool::XMP;
 
-$VERSION = '4.46';
+$VERSION = '4.47';
 
 sub LensIDConv($$$);
 sub ProcessNikonAVI($$$);
@@ -5856,6 +5856,7 @@ my %nikonFocalConversions = (
             46 => 'Nikkor Z 135mm f/1.8 S Plena', #28
             47 => 'Nikkor Z 35mm f/1.2 S', #28
             48 => 'Nikkor Z 28-400mm f/4-8 VR', #30
+            49 => 'Nikkor Z 28-135mm f/4 PZ', #28
             51 => 'Nikkor Z 35mm f/1.4', #28
             52 => 'Nikkor Z 50mm f/1.4', #28
             2305 => 'Laowa FFII 10mm F2.8 C&D Dreamer', #30
@@ -12791,7 +12792,7 @@ my %nikonFocalConversions = (
         Name => 'UnknownInfo',
         SubDirectory => { TagTable => 'Image::ExifTool::Nikon::UnknownInfo' },
     },
-    # 0x200002d - int16u[3]: "512 0 0"
+    # 0x200002d - int16u[3]: "512 0 0", "512 1 14", "512 3 10"
     0x2000032 => {
         Name => 'UnknownInfo2',
         SubDirectory => { TagTable => 'Image::ExifTool::Nikon::UnknownInfo2' },
@@ -12804,10 +12805,12 @@ my %nikonFocalConversions = (
     # 0x200003f - rational64s[2]: "0 0"
     # 0x2000042 - undef[6]: "0100\x03\0"
     # 0x2000043 - undef[12]: all zeros
+    # 0x200004d - undef[84]: "0100\0\0\0\0x020100\0\0\0\x010100\0\0\0\x05\0\0\..."
     0x200004e => {
         Name => 'NikonSettings',
         SubDirectory => { TagTable => 'Image::ExifTool::NikonSettings::Main' },
     },
+    # 0x2000055 - undef[8]: "0100\x01\0\0\0"
     0x2000083 => {
         Name => 'LensType',
         # credit to Tom Christiansen (ref 7) for figuring this out...
@@ -13011,7 +13014,11 @@ my %nikonFocalConversions = (
         Condition => '$$valPt =~ /^040[012]/',
         SubDirectory => { TagTable => 'Image::ExifTool::Nikon::AFInfo2V0400' },
     }],
-    # 0x20000c0 - undef[8]
+    # 0x20000c0 - undef[8]:
+    #    34 01 0c 00 90 01 0c 00
+    #    34 01 0c 00 9c 01 0c 00
+    #    3c 01 0c 00 9c 01 0c 00
+    #    3c 01 0c 00 a8 01 0c 00
     0x20000c3 => {
         Name => 'BarometerInfo',
         SubDirectory => {

package/bin/exiftool_files/lib/Image/ExifTool/Olympus.pm

@@ -40,7 +40,7 @@ use Image::ExifTool qw(:DataAccess :Utils);
 use Image::ExifTool::Exif;
 use Image::ExifTool::APP12;
 
-$VERSION = '2.85';
+$VERSION = '2.86';
 
 sub PrintLensInfo($$$);
 
@@ -550,6 +550,7 @@ my %filters = (
     4 => 'Light Tone',
     5 => 'Pin Hole', # (SZ-10 magic filter 2,SZ-31MR,E-PL3)
     6 => 'Grainy Film',
+    8 => 'Underwater', #forum17348
     9 => 'Diorama',
     10 => 'Cross Process',
     12 => 'Fish Eye', # (SZ-10 magic filter 3)
@@ -581,6 +582,9 @@ my %filters = (
     39 => 'Partial Color', #forum6269
     40 => 'Partial Color II', #forum6269
     41 => 'Partial Color III', #forum6269
+    42 => 'Bleach Bypass', #forum17348
+    43 => 'Bleach Bypass II', #forum17348
+    44 => 'Instant Film', #forum17348
 );
 
 my %toneLevelType = (

package/bin/exiftool_files/lib/Image/ExifTool/PDF.pm

@@ -234,6 +234,7 @@ my %supportedFilter = (
     Kids => {
         SubDirectory => { TagTable => 'Image::ExifTool::PDF::Kids' },
     },
+    MediaBox => { Name => 'MediaBox', List => 1 },
 );
 
 # tags in PDF Perms dictionary

package/bin/exiftool_files/lib/Image/ExifTool/Panasonic.pm

@@ -1439,7 +1439,7 @@ my %shootingMode = (
     0xde => { #forum17299
         Name => 'AFAreaSize',
         Writable => 'rational64u',
-        Notes => 'relative to size of image',
+        Notes => 'relative to size of image.  "n/a" for manual focus',
         Count => 2,
         PrintConv => '$val =~ /^4194303.999/ ? "n/a" : $val',
         PrintConvInv => '$val eq "n/a" ? "4194303.999 4194303.999" : $val',

package/bin/exiftool_files/lib/Image/ExifTool/Parrot.pm

@@ -56,7 +56,7 @@ sub Process_mett($$$);
         Name => 'ParrotAutomation',
         SubDirectory => { TagTable => 'Image::ExifTool::Parrot::Automation' },
     },
-    # timed metadata written by ARCore (see forum13653)
+    # MetaType of timed metadata written by ARCore (see forum13653)
     'application/arcore-accel' => {
         Name => 'ARCoreAccel',
         SubDirectory => { TagTable => 'Image::ExifTool::Parrot::ARCoreAccel', ByteOrder => 'II' },

package/bin/exiftool_files/lib/Image/ExifTool/Pentax.pm

@@ -58,7 +58,7 @@ use Image::ExifTool::Exif;
 use Image::ExifTool::GPS;
 use Image::ExifTool::HP;
 
-$VERSION = '3.50';
+$VERSION = '3.52';
 
 sub CryptShutterCount($$);
 sub PrintFilter($$$);
@@ -1263,7 +1263,7 @@ my %binaryDataAttrs = (
         }],
     },{
         Name => 'AFPointSelected',
-        Condition => '$$self{Model} =~ /K-3\b/',
+        Condition => '$$self{Model} =~ /(K-3|KP)\b/',
         Writable => 'int16u',
         Notes => 'K-3',
         PrintConvColumns => 2,
@@ -1354,6 +1354,7 @@ my %binaryDataAttrs = (
             0xfffd => 'Automatic Tracking AF', #JD
             0xfffc => 'Face Detect AF', #JD
             0xfffb => 'AF Select', #PH (Q select from 25-areas)
+            0xfffa => 'Auto 2', #KarstenGieselmann
             0 => 'None', #PH (Q in manual focus mode)
             1 => 'Upper-left',
             2 => 'Top',
@@ -3038,6 +3039,10 @@ my %binaryDataAttrs = (
     # 0x0236 - undef[52] (Q)
     # 0x0237 - undef[11] possibly related to smart effect setting? (Q)
     # 0x0238 - undef[9] (Q)
+    0x0238 => { #KarstenGieselmann
+        Name => 'CAFPointInfo',
+        SubDirectory => { TagTable => 'Image::ExifTool::Pentax::CAFPointInfo' },
+    },
     0x0239 => { #PH
         Name => 'LensInfoQ',
         SubDirectory => { TagTable => 'Image::ExifTool::Pentax::LensInfoQ' },
@@ -5001,10 +5006,10 @@ my %binaryDataAttrs = (
     # 0x0a - values: 00,05,0d,15,86,8e,a6,ae
     0x0b => { #JD
         Name => 'AFPointsInFocus',
-        Condition => '$$self{Model} !~ /K-[13]\b/',
+        Condition => '$$self{Model} !~ /(K-(1|3|70)|KP)\b/',
         Notes => q{
-            models other than the K-1 and K-3.  May report two points in focus even
-            though a single AFPoint has been selected, in which case the selected
+            models other than the K-1, K-3, K-70 and KP.  May report two points in focus
+            even though a single AFPoint has been selected, in which case the selected
             AFPoint is the first reported
         },
         PrintConvColumns => 2,
@@ -5081,6 +5086,37 @@ my %binaryDataAttrs = (
     },
 );
 
+# AF information for K-01 and later (ref Karsten Gieselmann private communication)
+%Image::ExifTool::Pentax::CAFPointInfo = (
+    %binaryDataAttrs,
+    FIRST_ENTRY => 0,
+    DATAMEMBER => [ 1 ],
+    GROUPS => { 0 => 'MakerNotes', 2 => 'Camera' },
+    NOTES => 'Contrast-detect AF-point information for the K-01 and later models.',
+    1 => {
+        Name => 'NumCAFPoints',
+        RawConv => '$$self{NumCAFPoints} = ($val & 0x0f) * ($val >> 4); $val',
+        ValueConv => '($val >> 4) * ($val & 0x0f)',
+    }, 
+    1.1 => {
+        Name => 'CAFGridSize',
+        ValueConv => '($val >> 4) . " " . ($val & 0x0f)', # (width x height)
+        PrintConv => '$val =~ tr/ /x/; $val',
+    },
+    2 => {
+        Name => 'CAFPointsInFocus',
+        Format => 'int8u[int(($val{1}+3)/4)]',
+        Writable => 0,
+        PrintConv => 'Image::ExifTool::Pentax::DecodeAFPoints($val,$$self{NumCAFPoints},2,0x02)',
+    },
+    2.1 => {
+        Name => 'CAFPointsSelected',
+        Format => 'int8u[int(($val{1}+3)/4)]',
+        Writable => 0,
+        PrintConv => 'Image::ExifTool::Pentax::DecodeAFPoints($val,$$self{NumCAFPoints},2,0x03)',
+    },
+);
+
 # Kelvin white balance information (ref 28, topic 4834)
 %Image::ExifTool::Pentax::KelvinWB = (
     %binaryDataAttrs,
@@ -5747,29 +5783,34 @@ my %binaryDataAttrs = (
 %Image::ExifTool::Pentax::AFPointInfo = (
     %binaryDataAttrs,
     GROUPS => { 0 => 'MakerNotes', 2 => 'Camera' },
+    DATAMEMBER => [ 2 ],
     NOTES => 'AF point information written by the K-1.',
     # 0 - int16u: 1 (version?)
     2 => {
         Name => 'NumAFPoints',
         Format => 'int16u',
+        RawConv => '$$self{NumAFPoints} = $val',
     },
     4 => {
         Name => 'AFPointsInFocus',
-        Condition => '$$self{Model} =~ /K-1\b/',
-        Format => 'int8u[9]',
-        PrintConv => 'Image::ExifTool::Pentax::DecodeAFPoints($val,33,2,0x02)',
+        Condition => '$$self{Model} =~ /K(P|-1|-70)\b/',
+        Format => 'int8u[int(($val{2}+3)/4)]',
+        Writable => 0,
+        PrintConv => 'Image::ExifTool::Pentax::DecodeAFPoints($val,$$self{NumAFPoints},2,0x02)',
     },
     4.1 => {
         Name => 'AFPointsSelected',
-        Condition => '$$self{Model} =~ /K-1\b/',
-        Format => 'int8u[9]',
-        PrintConv => 'Image::ExifTool::Pentax::DecodeAFPoints($val,33,2,0x03)',
+        Condition => '$$self{Model} =~ /K(P|-1|-70)\b/',
+        Format => 'int8u[int(($val{2}+3)/4)]',
+        Writable => 0,
+        PrintConv => 'Image::ExifTool::Pentax::DecodeAFPoints($val,$$self{NumAFPoints},2,0x03)',
     },
     4.2 => {
         Name => 'AFPointsSpecial',
-        Condition => '$$self{Model} =~ /K-1\b/',
-        Format => 'int8u[9]',
-        PrintConv => 'Image::ExifTool::Pentax::DecodeAFPoints($val,33,2,0x03,0x03)',
+        Condition => '$$self{Model} =~ /K(P|-1|-70)\b/',
+        Format => 'int8u[int(($val{2}+3)/4)]',
+        Writable => 0,
+        PrintConv => 'Image::ExifTool::Pentax::DecodeAFPoints($val,$$self{NumAFPoints},2,0x03,0x03)',
     },
 );
 
@@ -6397,6 +6438,7 @@ sub DecodeAFPoints($$$$;$)
 {
     my ($val, $num, $bits, $mask, $bitVal) = @_;
     my @bytes = split ' ', $val;
+    return '(none)' unless @bytes;
     my $i = 1;  # (starts at AF point number 1)
     my $shift = 8 - $bits;
     my $byte = shift @bytes;

package/bin/exiftool_files/lib/Image/ExifTool/Plot.pm

@@ -11,7 +11,7 @@ package Image::ExifTool::Plot;
 use strict;
 use vars qw($VERSION);
 
-$VERSION = '1.03';
+$VERSION = '1.05';
 
 # default plot settings (lower-case settings may be overridden by the user)
 my %defaults = (
@@ -201,7 +201,7 @@ sub AddPoints($$$)
             $$data{$name}[$xmax - $xmin] = $val if $xmax >= $xmin;
             next;
         }
-        if ($docNum and $num{$name} < $docNum) {
+        if ($docNum and defined $num{$name} and $num{$name} < $docNum) {
             $num{$name} = $docNum; # keep documents synchronized if some tags are missing
         } else {
             $num{$name} = $xmax unless defined $num{$name};
@@ -321,7 +321,6 @@ sub Draw($$)
         foreach (0 .. (($multi[$plotNum] || 1) - 1)) {
             push @{$$self{Name}}, shift(@names);
         }
-warn "@{$$self{Name}}\n";
         undef $min; undef $max;
         foreach ($scat .. (@{$$self{Name}} - 1)) {
             my $dat = $$self{Data}{$$self{Name}[$_]};