exiftool_vendored 13.26.0 → 13.29.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7ade24a22d85fc4d797e0fa157ccbcab31f7ef49a375c50849f76e075e1366ea
-  data.tar.gz: e4f4a5da9a42324b16bc953f1f326abf2700f57e9f15d58661f3863cf359ea01
+  metadata.gz: 100fd830d0ad83694462874c851c5caa93a6b286d694450fba9a56286a99907d
+  data.tar.gz: 452ee823b075cfc924180bb9df5ec0cc959bbc6659e059866c9212c62df73e3e
 SHA512:
-  metadata.gz: a3bd7b0e0211feb8854f98a1de7956776cb7dcfc36eb4f224a333a7bf6912e50d433af4c806ca3bde62100a3eb99dd8704862da9092e06a2bc831d5bbba41b3c
-  data.tar.gz: c19b405e58717505f77791c5115bc67d98651b48d4872d25270ecda79ac42a00740495ec324616650c33d3c9931763a1ddb31722318b8ab9071d3476b3033361
+  metadata.gz: c6682ad9ca29d84314dc4bdb142c4ce097a70b60a4b32b99e2768d57e3012c72ba7156092cc3e449e80dc80355101d43185b3f8583f16cd09e6bbb33e742b75e
+  data.tar.gz: 1d735972885fb37be03d9995f8c5fb146c786fc75b3314d7f70b004308d0a6ffd7086782e5a0ccf5cd58758ccc590354e6a7143bc1d84e761d4c96df4770aebc

data/bin/Changes

@@ -7,6 +7,46 @@ RSS feed: https://exiftool.org/rss.xml
 Note: The most recent production release is Version 13.25. (Other versions are
 considered development releases, and are not uploaded to MetaCPAN.)
 
+Apr. 27, 2025 - Version 13.29
+
+  - Changed default -geotime argument to use SubSecDateTimeOriginal if available
+    instead of DateTimeOriginal, instead of applying both (as was done since
+    ExifTool 13.18).  This is more efficient, and avoids an unnecessary warning
+  - Properly return warnings from inverse value conversions when copying a tag
+    using -tagsFromFile with a tag name string
+  - Fixed issue where RW2 images from the Panasonic DC-S1RM2 could be corrupted
+    when writing
+
+Apr. 25, 2025 - Version 13.28
+
+  - Added print conversion for Pentax AFPointValues
+  - Added another Pentax PictureMode value
+  - Decode timed GPS from GKU D900 dashcam videos
+  - Decode timed telemetry data from newer ARCore videos
+  - Decode Panasonic AFAreaSize (thanks andrewj)
+  - Decode ShutterCount for Canon EOS R8 and R50 (github #325)
+  - Decode ThumbnailTIFF from some Insta360 videos
+  - Decode AROT:HDRGainCurveSize from APP10
+  - Updated to the 2025 MPF specification
+  - Renamed K-3III AFPoints to AFPointsSelected and changed decoding
+  - Fixed bug introduced in 13.23 that could cause an incorrect parsing of XMP
+    attributes containing an equals sign
+  - Fixed issue reading timed GPS from some Insta360 videos, and issue where
+    writing these videos would fail
+  - Fixed exif2xmp.args and xmp2exif.args to properly handle EXIF:ImageUniqueID
+
+Apr. 8, 2025 - Version 13.27
+
+  - Decode AF points for the Pentax K-3III
+  - Decode timed GPS from a variant of the Rove R2-4K dashcam
+  - Properly decode SensorTemperature for Pentax K3-III
+  - Patched PCAP test to avoid potential failure
+  - Patched to avoid potential "not a HASH reference" error when writing MOV/MP4
+    videos
+  - Fixed issue which could result in "uninitialized value" errors when reading
+    one type of timed GPS from MP4 videos
+  - Fixed problem writing MotionPhotoVideo in MP4 files
+
 Mar. 31, 2025 - Version 13.26
 
   - Added a new Olympus CameraType (thanks Herb)

data/bin/META.json

@@ -50,5 +50,5 @@
       }
    },
    "release_status" : "stable",
-   "version" : "13.26"
+   "version" : "13.29"
 }

data/bin/META.yml

@@ -31,4 +31,4 @@ recommends:
   Time::HiRes: '0'
 requires:
   perl: '5.004'
-version: '13.26'
+version: '13.29'

data/bin/README

@@ -109,8 +109,8 @@ your home directory, then you would type the following commands in a
 terminal window to extract and run ExifTool:
 
   cd ~/Desktop
-  gzip -dc Image-ExifTool-13.26.tar.gz | tar -xf -
-  cd Image-ExifTool-13.26
+  gzip -dc Image-ExifTool-13.29.tar.gz | tar -xf -
+  cd Image-ExifTool-13.29
   ./exiftool t/images/ExifTool.jpg
 
 Note:  These commands extract meta information from one of the test images. 

data/bin/arg_files/exif2xmp.args

@@ -15,6 +15,7 @@
 #               2022/03/31 - PH IPTC Photometadata Mapping Guidelines 2202.1 update
 #               2024/10/24 - PH Additions for the 2024 EXIF for XMP spec
 #               2025/01/16 - PH Copy Composite SubSec tags to XMP-exif
+#               2025-04-22 - PH Fixed DigitalImageGUID source tag
 #
 # References:   http://www.metadataworkinggroup.org/specs/
 #               https://iptc.org/std/photometadata/documentation/mappingguidelines/
@@ -43,7 +44,7 @@
 -XMP-xmp:CreatorTool < EXIF:Software
 -XMP-dc:Rights < EXIF:Copyright
 -XMP-dc:Creator < EXIF:Artist
--XMP-iptcExt:DigitalImageGUID < EXIF:DigImageGUID
+-XMP-iptcExt:DigitalImageGUID < EXIF:ImageUniqueID
 # XMP flash information is translated by the Composite Flash tag
 -Composite:Flash < EXIF:Flash
 # overwrite GPS tags which have different formats in XMP

data/bin/arg_files/xmp2exif.args

@@ -19,6 +19,7 @@
 #                               XMP-exif:DateTimeOriginal
 #               2024/10/24 - PH Additions for the 2024 EXIF for XMP spec
 #               2025/01/16 - PH Write Composite:SubSecCreateDate from XMP-exif
+#               2025-04-22 - PH Fixed DigitalImageGUID translation
 #
 # References:   http://www.metadataworkinggroup.org/specs/
 #               https://iptc.org/std/photometadata/documentation/mappingguidelines/
@@ -51,7 +52,7 @@
 -EXIF:Copyright < XMP-dc:Rights
 -EXIF:Artist < XMP-plus:ImageCreatorName
 -EXIF:Artist < XMP-dc:Creator
--EXIF:DigImageGUID < XMP-iptcExt:DigitalImageGUID
+-EXIF:ImageUniqueID < XMP-iptcExt:DigitalImageGUID
 # XMP flash information is translated by the Composite Flash tag
 -EXIF:Flash < Composite:Flash
 # generate GPS tags which have been combined into other XMP tags

data/bin/exiftool

@@ -11,7 +11,7 @@ use strict;
 use warnings;
 require 5.004;
 
-my $version = '13.26';
+my $version = '13.29';
 
 $^W = 1;    # enable global warnings
 
@@ -1396,8 +1396,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') || $_}];
                 }
             }
         }
@@ -1696,9 +1695,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
@@ -4289,6 +4287,7 @@ sub ScanDir($$;$)
             next unless $recurse;
             # ignore directories starting with "." by default
             next if $file =~ /^\./ and $recurse == 1;
+            # note: this doesn't work in Windows cmd (see forum17243)
             next if $ignore{$file} or ($ignore{SYMLINKS} and -l $path);
             ScanDir($et, $path, $list);
             last if $end;
@@ -6053,7 +6052,7 @@ with this command:
 
 produces output like this:
 
-    -- Generated by ExifTool 13.26 --
+    -- Generated by ExifTool 13.29 --
     File: a.jpg - 2003:10:31 15:44:19
     (f/5.6, 1/60s, ISO 100)
     File: b.jpg - 2006:05:23 11:57:38
@@ -6550,9 +6549,10 @@ name, or a full path, and is case sensitive.  If a full path is specified,
 it must match the Directory tag exactly to be ignored.  Use multiple B<-i>
 options to ignore more than one directory name.  A special I<DIR> value of
 C<SYMLINKS> may be specified to avoid recursing into directories which are
-symbolic links when the B<-r> option is used.  As well, a value of C<HIDDEN>
-may be used to ignore files with names that start with a "." (ie. hidden
-files on Unix systems) when scanning a directory.
+symbolic links when the B<-r> option is used (note this does not currently
+work under Windows).  As well, a value of C<HIDDEN> may be used to ignore
+files with names that start with a "." (ie. hidden files on Unix systems)
+when scanning a directory.
 
 =item B<-if>[I<NUM>] I<EXPR>
 
@@ -6935,12 +6935,14 @@ Geotag images from the specified GPS track log file.  Using the B<-geotag>
 option is equivalent to writing a value to the C<Geotag> tag.  The GPS
 position is interpolated from the track at a time specified by the value
 written to the C<Geotime> tag.  If C<Geotime> is not specified, the value is
-copied from C<DateTimeOriginal#> (the C<#> is added to copy the unformatted
-value, avoiding potential conflicts with the B<-d> option).  For example,
-the following two commands are equivalent:
+copied from C<SubSecDateTimeOriginal#> if it exists, otherwise
+C<DateTimeOriginal#> (the C<#> is added to copy the unformatted value,
+avoiding potential conflicts with the B<-d> option).  For example, the
+following two commands are equivalent if SubSecDateTimeOriginal exists in
+the file:
 
     exiftool -geotag trk.log image.jpg
-    exiftool -geotag trk.log "-Geotime<DateTimeOriginal#" image.jpg
+    exiftool -geotag trk.log "-Geotime<SubSecDateTimeOriginal#" image.jpg
 
 If the C<Geotime> value does not contain a time zone then the local system
 timezone is assumed.  Writing C<Geotime> causes the following tags to be

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

@@ -88,7 +88,7 @@ sub ProcessCTMD($$$);
 sub ProcessExifInfo($$$);
 sub SwapWords($);
 
-$VERSION = '4.89';
+$VERSION = '4.90';
 
 # Note: Removed 'USM' from 'L' lenses since it is redundant - PH
 # (or is it?  Ref 32 shows 5 non-USM L-type lenses)
@@ -1410,7 +1410,7 @@ my %offOn = ( 0 => 'Off', 1 => 'On' );
         },
         {
             Name => 'CanonCameraInfoR6m2',
-            Condition => '$$self{Model} =~ /\bEOS R6m2$/',
+            Condition => '$$self{Model} =~ /\bEOS (R6m2|R8|R50)$/',
             SubDirectory => { TagTable => 'Image::ExifTool::Canon::CameraInfoR6m2' },
         },
         {

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

@@ -279,7 +279,7 @@ under the same terms as Perl itself.
 
 =over 4
 
-=item L<GIMP source code>
+=item L<https://developer.gimp.org/core/setup/git/>
 
 =item L<http://svn.gnome.org/viewvc/gimp/trunk/devel-docs/xcf.txt?view=markup>
 

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

@@ -260,15 +260,9 @@ sub ProcessJPEG_HDR($$$);
         Condition => '$$valPt =~ /^UNICODE\0/',
         Notes => 'PhotoStudio Unicode comment',
       }, {
-        Name => 'HDRGainCurve', #PH (NC)
+        Name => 'HDRGainInfo', #PH (NC)
         Condition => '$$valPt =~ /^AROT\0\0.{4}/s',
-        Groups => { 1 => 'APP10', 2 => 'Image' },
-        ValueConv => q{
-            my $n = unpack('x6N', $val);
-            return '<truncated AROT data>' if length($val)-6 < $n * 4;
-            my $str = join ' ', unpack("x10V$n", $val);
-            return \$str;
-        },
+        SubDirectory => { TagTable => 'Image::ExifTool::JPEG::HDRGainInfo' },
     }],
     APP11 => [{
         Name => 'JPEG-HDR',
@@ -347,6 +341,9 @@ sub ProcessJPEG_HDR($$$);
             $$valPt =~ /~\0\x04\0zmie~\0\0\x0a.{8}[\x10\x18]\x08$/s
         },
         SubDirectory => { TagTable => 'Image::ExifTool::MIE::Main' },
+      }, {
+        Name => 'MPF',
+        SubDirectory => { TagTable => 'Image::ExifTool::MPF::Main' },
       }, {
         Name => 'Samsung',
         Condition => '$$valPt =~ /QDIOBS$/',
@@ -382,6 +379,21 @@ sub ProcessJPEG_HDR($$$);
     }],
 );
 
+# HDR gain information (ref PH)
+%Image::ExifTool::JPEG::HDRGainInfo = (
+    PROCESS_PROC => \&Image::ExifTool::ProcessBinaryData,
+    GROUPS => { 0 => 'APP10', 1 => 'AROT', 2 => 'Image' },
+    6 => {
+        Name => 'HDRGainCurveSize',
+        Format => 'int32u',
+    },
+    10 => {
+        Name => 'HDRGainCurve', # (NC)
+        Format => 'int32uRev[$val{6}]',
+        Binary => 1,
+    },
+);
+
 # JPS APP3 segment (ref http://paulbourke.net/stereographics/stereoimage/)
 %Image::ExifTool::JPEG::JPS = (
     PROCESS_PROC => \&Image::ExifTool::ProcessBinaryData,

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

@@ -11,7 +11,7 @@ use strict;
 use vars qw($VERSION);
 use Image::ExifTool;
 
-$VERSION = '1.02';
+$VERSION = '1.04';
 
 sub ProcessLigoGPS($$$;$);
 sub ProcessLigoJSON($$$);
@@ -264,6 +264,20 @@ sub ParseLigoGPS($$$;$)
     delete $$et{SET_GROUP1};
 }
 
+#------------------------------------------------------------------------------
+# Process GKU dashcam trailer containing JSON-format LigoGPS
+# Inputs: 0) ExifTool ref, 1) dirInfo ref, 2) tag table ref
+# Returns: 1 on success
+sub ProcessGKU($$$;$)
+{
+    my ($et, $dirInfo, $tagTbl) = @_;
+    my $dataPt = $$dirInfo{DataPt};
+    my $pos = unpack('V', $$dataPt);
+    return 0 if $pos + 13 > length $$dataPt or substr($$dataPt, $pos, 13) ne 'LIGOGPSINFO {';
+    pos($$dataPt) = $pos;
+    return ProcessLigoJSON($et, $dirInfo, $tagTbl);
+}
+
 #------------------------------------------------------------------------------
 # Process LIGOGPSINFO data (non-JSON format)
 # Inputs: 0) ExifTool object ref, 1) dirInfo ref, 2) tag table ref
@@ -315,7 +329,7 @@ sub ProcessLigoJSON($$$)
     my $dataPt = $$dirInfo{DataPt};
     my $dirLen = $$dirInfo{DirLen};
     require Image::ExifTool::Import;
-    $et->VerboseDir('LIGO_JSON', undef, length($$dataPt));
+    $et->VerboseDir('LIGO_JSON', undef, length($$dataPt) - pos($$dataPt));
     $$et{SET_GROUP1} = 'LIGO';
     while ($$dataPt =~ /LIGOGPSINFO (\{.*?\})/g) {
         my $json = $1;

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

@@ -15,7 +15,7 @@ use vars qw($VERSION);
 use Image::ExifTool qw(:DataAccess :Utils);
 use Image::ExifTool::Exif;
 
-$VERSION = '1.15';
+$VERSION = '1.16';
 
 sub ProcessMPImageList($$$);
 
@@ -127,11 +127,15 @@ sub ProcessMPImageList($$$);
             0x000000 => 'Undefined',
             0x010001 => 'Large Thumbnail (VGA equivalent)',
             0x010002 => 'Large Thumbnail (full HD equivalent)',
+            0x010003 => 'Large Thumbnail (4K equivalent)',
+            0x010004 => 'Large Thumbnail (8K equivalent)',
+            0x010005 => 'Large Thumbnail (16K equivalent)',
             0x020001 => 'Multi-frame Panorama',
             0x020002 => 'Multi-frame Disparity',
             0x020003 => 'Multi-angle',
             0x030000 => 'Baseline MP Primary Image',
             0x040000 => 'Original Preservation Image', # (Exif 3.0)
+            0x050000 => 'Gain Map Image',
         },
     },
     4 => {

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

@@ -113,7 +113,7 @@ my %olympusLensTypes = (
     '0 34 00' => 'Olympus Zuiko Digital ED 9-18mm F4.0-5.6', #7
     '0 34 10' => 'Olympus M.Zuiko Digital ED 12-45mm F4.0 Pro', #IB
     '0 35 00' => 'Olympus Zuiko Digital 14-54mm F2.8-3.5 II', #PH
-    '0 35 10' => 'Olympus M.Zuiko 100-400mm F5.0-6.3', #IB
+    '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 39 10' => 'Olympus M.Zuiko Digital ED 90mm F3.5 Macro IS Pro', #forum3833

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.24';
+$VERSION = '2.25';
 
 sub ProcessLeicaLEIC($$$);
 sub WhiteBalanceConv($;$$);
@@ -1436,6 +1436,14 @@ my %shootingMode = (
         Name => 'NoiseReductionStrength',
         Writable => 'rational64s',
     },
+    0xde => { #forum17299
+        Name => 'AFAreaSize',
+        Writable => 'rational64u',
+        Notes => 'relative to size of image',
+        Count => 2,
+        PrintConv => '$val =~ /^4194303.999/ ? "n/a" : $val',
+        PrintConvInv => '$val eq "n/a" ? "4194303.999 4194303.999" : $val',
+    },
     0xe4 => { #IB
         Name => 'LensTypeModel',
         Condition => '$format eq "int16u"',

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

@@ -15,7 +15,7 @@ use strict;
 use vars qw($VERSION);
 use Image::ExifTool qw(:DataAccess :Utils);
 
-$VERSION = '1.02';
+$VERSION = '1.03';
 
 sub Process_mett($$$);
 
@@ -61,10 +61,18 @@ sub Process_mett($$$);
         Name => 'ARCoreAccel',
         SubDirectory => { TagTable => 'Image::ExifTool::Parrot::ARCoreAccel', ByteOrder => 'II' },
     },
+    'application/arcore-accel-0' => {
+        Name => 'ARCoreAccel0',
+        SubDirectory => { TagTable => 'Image::ExifTool::Parrot::ARCoreAccel0', ByteOrder => 'II' },
+    },
     'application/arcore-gyro' => {
         Name => 'ARCoreGyro',
         SubDirectory => { TagTable => 'Image::ExifTool::Parrot::ARCoreGyro', ByteOrder => 'II' },
     },
+    'application/arcore-gyro-0' => {
+        Name => 'ARCoreGyro0',
+        SubDirectory => { TagTable => 'Image::ExifTool::Parrot::ARCoreGyro0', ByteOrder => 'II' },
+    },
     'application/arcore-video-0' => {
         Name => 'ARCoreVideo',
         SubDirectory => { TagTable => 'Image::ExifTool::Parrot::ARCoreVideo', ByteOrder => 'II' },
@@ -684,11 +692,24 @@ sub Process_mett($$$);
     # 33: increments slowly (about once every 56 samples or so)
 );
 
+# ARCore Accel data (ref PH)
+%Image::ExifTool::Parrot::ARCoreAccel0 = (
+    PROCESS_PROC => \&Image::ExifTool::ProcessBinaryData,
+    GROUPS => { 2 => 'Location' },
+    NOTES => 'ARCore accelerometer data.',
+    FIRST_ENTRY => 0,
+    9  => { # (NC)
+        Name => 'Accelerometer',
+        Format => 'undef[14]',
+        RawConv => 'GetFloat(\$val,0) . " " . GetFloat(\$val,5) . " " . GetFloat(\$val,10)',
+    },
+);
+
 # ARCore Gyro data (ref PH)
 %Image::ExifTool::Parrot::ARCoreGyro = (
     PROCESS_PROC => \&Image::ExifTool::ProcessBinaryData,
     GROUPS => { 2 => 'Location' },
-    NOTES => 'ARCore accelerometer data.',
+    NOTES => 'ARCore gyro data.',
     FIRST_ENTRY => 0,
     # 00-04: always 10 34 16 3 29
     4  => {
@@ -704,6 +725,19 @@ sub Process_mett($$$);
     },
 );
 
+# ARCore Gyro data (ref PH)
+%Image::ExifTool::Parrot::ARCoreGyro0 = (
+    PROCESS_PROC => \&Image::ExifTool::ProcessBinaryData,
+    GROUPS => { 2 => 'Location' },
+    NOTES => 'ARCore gyro data.',
+    FIRST_ENTRY => 0,
+    9  => { # (NC)
+        Name => 'Gyroscope',
+        Format => 'undef[14]',
+        RawConv => 'GetFloat(\$val,0) . " " . GetFloat(\$val,5) . " " . GetFloat(\$val,10)',
+    },
+);
+
 %Image::ExifTool::Parrot::ARCoreVideo = (
     PROCESS_PROC => \&Image::ExifTool::ProcessBinaryData,
     FIRST_ENTRY => 0,
@@ -766,11 +800,24 @@ sub Process_mett($$$)
     $et->VerboseDir('Parrot mett', undef, $dirEnd);
 
     if ($$tagTbl{$metaType}) {
-        $et->HandleTag($tagTbl, $metaType, undef,
-            DataPt  => $dataPt,
-            DataPos => $dataPos,
-            Base    => $$dirInfo{Base},
-        );
+        # loop through ARCore records
+        while ($pos < $dirEnd - 2) {
+            last unless substr($$dataPt,$pos,1) eq "\x0a";
+            my $len = ord(substr($$dataPt, $pos+1, 1));
+            if ($pos + $len + 2 > $dirEnd) {
+                $et->Warn("Unexpected length for $metaType record", 1);
+                last;
+            }
+            $len or $len = $dirEnd - $pos - 2;  # use entire record if length is 0
+            $et->HandleTag($tagTbl, $metaType, undef,
+                DataPt   => $dataPt,
+                DataPos  => $dataPos,
+                DirStart => $pos,
+                DirLen   => $len,
+                Base     => $$dirInfo{Base},
+            );
+            $pos += $len + 2;
+        }
         return 1;
     }
     while ($pos + 4 < $dirEnd) {

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

@@ -58,7 +58,7 @@ use Image::ExifTool::Exif;
 use Image::ExifTool::GPS;
 use Image::ExifTool::HP;
 
-$VERSION = '3.48';
+$VERSION = '3.50';
 
 sub CryptShutterCount($$);
 sub PrintFilter($$$);
@@ -737,6 +737,18 @@ my %filterSettings = (
     52 => ['Toning2', '%+d'], #31 Extract Color (-3-+3)
 );
 
+# order of selectable K-3iii AF points.  The array looks like this:
+#     B1 C1 E1 G1 I1 K1 L1
+#  A3 B3 C3 E3 G3 I3 K3 L3 M3
+#  A5 B5 C5 E5 G5 I5 K5 L5 M5
+#  A7 B7 C7 E7 G7 I7 K7 L7 M7
+#     B9 C9 E9 G9 I9 K9 L9
+my @k3iiiAF = qw(
+    C1 E1 G1 I1 K1 C3 E3 G3 I3 K3 C5 E5 G5
+    I5 K5 C7 E7 G7 I7 K7 C9 E9 G9 I9 K9 A5 M5 B3
+    L3 B5 L5 B7 L7 B1 L1 B9 L9 A3 M3 A7 M7
+);
+
 # decoding for Pentax Firmware ID tags - PH
 my %pentaxFirmwareID = (
     # the first 2 numbers are the firmware version, I'm not sure what the second 2 mean
@@ -1944,6 +1956,7 @@ my %binaryDataAttrs = (
             '18 3' => 'Auto Program (MTF)', #PH (NC)
             '18 22' => 'Auto Program (Shallow DOF)', #PH (NC)
             '20 22' => 'Blur Control', #PH (Q)
+            '26 0' => 'Shutter and Aperture Priority (TAv)', #PH (K-3III)
             '249 0' => 'Movie (TAv)', #31
             '250 0' => 'Movie (TAv, Auto Aperture)', #31
             '251 0' => 'Movie (Manual)', #31
@@ -4918,6 +4931,7 @@ my %binaryDataAttrs = (
     # CalFlag, ContrastFlag, PrecalFlag, SelectSensor
     0x00 => { #PH
         Name => 'AFPointsUnknown1',
+        Condition => '$$self{Model} !~ /K-3 Mark III/', # (and maybe others?)
         Unknown => 1,
         Format => 'int16u',
         ValueConv => '$self->Options("Unknown") ? $val : $val & 0x7ff',
@@ -4945,6 +4959,7 @@ my %binaryDataAttrs = (
     },
     0x02 => { #PH
         Name => 'AFPointsUnknown2',
+        Condition => '$$self{Model} !~ /K-3 Mark III/', # (and maybe others?)
         Unknown => 1,
         Format => 'int16u',
         ValueConv => '$self->Options("Unknown") ? $val : $val & 0x7ff',
@@ -5017,6 +5032,41 @@ my %binaryDataAttrs = (
             20 => 'Mid-right',
         },
     },
+    0x14 => {
+        Name => 'AFPointValues',
+        Condition => '$$self{Model} eq "PENTAX K-3 Mark III"', # any other models?
+        Format => 'int16uRev[69]',
+        Unknown => 1,
+        Notes => 'some unknown values related to each AFPoint',
+        # order is the same as AFPoints below, but there is an additional value for
+        # each AF point starting at offset 28 in the array (yes, the range overlaps
+        # with the 1st values)
+        # (values are int16s stored in reversed byte order)
+        ValueConv => 'my @a=split " ",$val;$_>32767 and $_-=65536 foreach @a;join " ",@a',
+        PrintConv => \&AFPointValues,
+    },
+    0x12a => { # byte has a value of 2 if corresponding AF point is selected
+        Name => 'AFPointsSelected',
+        Condition => '$$self{Model} eq "PENTAX K-3 Mark III"', # any other models?
+        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
+        },
+        Format => 'int8u[41]',
+        PrintConv => 'Image::ExifTool::Pentax::AFPointsK3iii($val,$self,2)',
+    },
+#
+# (maybe not coincidentally, there are 60 unknown bytes
+#  here, and there are also 60 non-selectable AF points)
+#
+    0x18f => { # byte has a value of 1 if corresponding AF point is ... in focus maybe?
+        # usually the same points as AFPoints above, but not always
+        Name => 'AFPointsUnknown',
+        Condition => '$$self{Model} eq "PENTAX K-3 Mark III"', # any other models?
+        Unknown => 1,
+        Format => 'int8u[41]',
+        PrintConv => \&AFPointsK3iii,
+    },
     0x1fa => {
         Name => 'LiveView',
         Notes => 'decoded only for the K-3 III',
@@ -5740,6 +5790,7 @@ my %binaryDataAttrs = (
     #  more quickly than CameraTemperature when shooting video.)
     0x0c => {
         Name => 'SensorTemperature', #forum6677 (was CameraTemperature2)
+        Condition => '$$self{Model} !~ /K-3 Mark III/', # (and maybe others?)
         Format => 'int16s',
         ValueConv => '$val / 10',
         ValueConvInv => '$val * 10',
@@ -5748,6 +5799,7 @@ my %binaryDataAttrs = (
     },
     0x0e => {
         Name => 'SensorTemperature2', #forum6677 (was CameraTemperature3)
+        Condition => '$$self{Model} !~ /K-3 Mark III/', # (and maybe others?)
         Format => 'int16s',
         ValueConv => '$val / 10',
         ValueConvInv => '$val * 10',
@@ -5769,6 +5821,15 @@ my %binaryDataAttrs = (
         PrintConvInv => '$val=~s/ ?c$//i; $val',
     },
     # 0x18,0x1a,0x1c,0x1e = int16u[4] BlackPoint - PH
+    0x2a => {
+        Name => 'SensorTemperature',
+        Condition => '$$self{Model} =~ /K-3 Mark III/',
+        Format => 'int16s',
+        ValueConv => '$val / 10',
+        ValueConvInv => '$val * 10',
+        PrintConv => 'sprintf("%.1f C", $val)',
+        PrintConvInv => '$val=~s/ ?c$//i; $val',
+    },
 );
 
 # currently unknown info
@@ -6357,6 +6418,45 @@ sub DecodeAFPoints($$$$;$)
     return join(',', @bitList);
 }
 
+#------------------------------------------------------------------------------
+# Print AF Point names for K-3III (ref PH)
+# Inputs: 0) value, 1) ExifTool ref, 2) optional value to match
+sub AFPointsK3iii($$;$)
+{
+    my @a = split ' ', $_[0];
+    my $match = $_[2];
+    my @pts;
+    if ($match) {
+        $a[$_] == $match and push @pts, $k3iiiAF[$_] || "Unknown($_)" foreach 0..$#a;
+    } else {
+        $a[$_] and push @pts, $k3iiiAF[$_] || "Unknown($_)" foreach 0..$#a;
+    }
+    return @pts ? join ',', sort @pts : '(none)';
+}
+
+#------------------------------------------------------------------------------
+# Print AF point values for K-3III (ref PH)
+# Inputs: 0) value, 1) ExifTool ref
+# Notes: this is experimental and not well understood
+sub AFPointValues($$)
+{
+    my @a = split ' ', shift;
+    my @vals;
+    # (I really don't understand why Pentax seemed to use 28 instead of 41 for
+    # the first index of the 2nd value, because as it stands there is
+    # overlap between the ranges of the 1st and 2nd values, and there is
+    # no way to tell which is which for cases were multiple points have values)
+    foreach (0 .. $#a) {
+        next unless $a[$_];
+        my $pt = $k3iiiAF[$_] ? $k3iiiAF[$_] . '=' : $k3iiiAF[$_-28] . '=/';
+        push @vals, "$pt$a[$_]";
+        next unless $a[$_ + 28];
+        $vals[-1] .= '/' . $a[$_ + 28];
+        $a[$_ + 28] = undef;
+    }
+    return @vals ? join ',', sort @vals : '(none)';
+}
+
 #------------------------------------------------------------------------------
 # Convert Pentax hex-based EV (modulo 8) to real number
 # Inputs: 0) value to convert