exiftool-vendored.exe 13.25.0 → 13.29.0

package/bin/exiftool_files/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' },
         },
         {
@@ -2053,7 +2053,7 @@ my %offOn = ( 0 => 'Off', 1 => 'On' );
     # 0x4014 (similar to 0x83?)
     0x4015 => [{
         Name => 'VignettingCorr', # (LensPacket)
-        Condition => '$$valPt =~ /^\0/ and $$valPt !~ /^\0\0\0\0/', # (data may be all zeros for 60D)
+        Condition => '$$valPt =~ /^\0/ and $$valPt !~ /^(\0\0\0\0|\x00\x40\xdc\x05)/', # (data may be all zeros for 60D)
         SubDirectory => {
             # (the size word is at byte 2 in this structure)
             Validate => 'Image::ExifTool::Canon::Validate($dirData,$subdirStart+2,$size)',
@@ -2061,7 +2061,7 @@ my %offOn = ( 0 => 'Off', 1 => 'On' );
         },
     },{
         Name => 'VignettingCorrUnknown1',
-        Condition => '$$valPt =~ /^[\x01\x02\x10\x20]/ and $$valPt !~ /^\0\0\0\0/',
+        Condition => '$$valPt =~ /^[\x01\x02\x10\x20]/ and $$valPt !~ /^(\0\0\0\0|\x02\x50\x7c\x04)/',
         SubDirectory => {
             # (the size word is at byte 2 in this structure)
             Validate => 'Image::ExifTool::Canon::Validate($dirData,$subdirStart+2,$size)',
@@ -4758,6 +4758,7 @@ my %ciMaxFocal = (
         Format => 'int32u',
         Notes => 'includes electronic + mechanical shutter',
     },
+    # 0x0b5a - related to image stabilization (ref forum17239) (R5)
     # 0x0bb7 - counts down during focus stack (ref forum16111)
 );
 

package/bin/exiftool_files/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>
 

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

@@ -336,6 +336,7 @@ my %manuSig = ( #6
     'Zebr' => 'Zebra Technologies Inc',
     'ZRAN' => 'Zoran Corporation',
     # also seen: "    ",ACMS,KCMS,UCCM,etc2,SCTX
+    # registry: https://www.color.org/signatureRegistry/index.xalter
 );
 
 # ICC_Profile tag table

package/bin/exiftool_files/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,

package/bin/exiftool_files/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;

package/bin/exiftool_files/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 => {

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.45';
+$VERSION = '4.46';
 
 sub LensIDConv($$$);
 sub ProcessNikonAVI($$$);
@@ -552,6 +552,7 @@ sub GetAFPointGrid($$;$);
     '21 56 8E 8E 24 24 14 00' => 'Tamron SP AF 300mm f/2.8 LD-IF (60E)',
     '27 54 8E 8E 24 24 1D 02' => 'Tamron SP AF 300mm f/2.8 LD-IF (360E)',
     'E1 40 19 36 2C 35 DF 4E' => 'Tamron 10-24mm f/3.5-4.5 Di II VC HLD (B023)',
+    'E1 40 19 36 2C 35 DF 0E' => 'Tamron 10-24mm f/3.5-4.5 Di II VC HLD (B023)', #30
     'F6 3F 18 37 2C 34 84 06' => 'Tamron SP AF 10-24mm f/3.5-4.5 Di II LD Aspherical (IF) (B001)',
     'F6 3F 18 37 2C 34 DF 06' => 'Tamron SP AF 10-24mm f/3.5-4.5 Di II LD Aspherical (IF) (B001)', #30
     '00 36 1C 2D 34 3C 00 06' => 'Tamron SP AF 11-18mm f/4.5-5.6 Di II LD Aspherical (IF) (A13)',

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.84';
+$VERSION = '2.85';
 
 sub PrintLensInfo($$$);
 
@@ -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
@@ -446,6 +446,7 @@ my %olympusCameraTypes = (
     S0095 => 'OM-1', #IB
     S0101 => 'OM-5', #IB
     S0121 => 'OM-1MarkII', #forum15652
+    S0123 => 'OM-3', #forum17208
     SR45 => 'D220',
     SR55 => 'D320L',
     SR83 => 'D340L',

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

@@ -16,7 +16,7 @@ use strict;
 use vars qw($VERSION);
 use Image::ExifTool qw(:DataAccess :Utils);
 
-$VERSION = '1.00';
+$VERSION = '1.01';
 
 %Image::ExifTool::PCAP::Main = (
     GROUPS => { 0 => 'File', 1 => 'File', 2 => 'Other' },
@@ -261,14 +261,14 @@ $VERSION = '1.00';
         },
     },
     19373 => {
-        Name => 'CustomOption3',
+        Name => 'CustomOption4',
         Binary => 1,
     },
 #
 # "options" tags in Section Header Block
 #
     'SHB-2' => 'Hardware',
-    'SHB-3' => 'OperatingSytem',
+    'SHB-3' => 'OperatingSystem',
     'SHB-4' => 'UserApplication',
 #
 # "options" tags in Interface Description Block
@@ -308,8 +308,8 @@ $VERSION = '1.00';
         Name => 'Filter',
         ValueConv => 'Get8u(\$val,0) . ": " . substr($val, 1)',
     },
-    'IDB-12' => 'OperatingSytem',
-    'IDB-13' => { Name => 'FCSLen',  Format => 'int8u' },
+    'IDB-12' => 'OperatingSystem',
+    'IDB-13' => { Name => 'FrameCheckSequenceLength',  Format => 'int8u' },
     'IDB-14' => {
         Name => 'TimeStampOffset',
         Format => 'int64u',

package/bin/exiftool_files/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"',

package/bin/exiftool_files/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) {

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.47';
+$VERSION = '3.50';
 
 sub CryptShutterCount($$);
 sub PrintFilter($$$);
@@ -558,6 +558,7 @@ my %pentaxModelID = (
     0x13254 => 'K-3 Mark III', #IB (Ricoh)
     0x13290 => 'WG-70', # (Ricoh)
     0x1329a => 'GR IIIx', # (Ricoh)
+    0x132b8 => 'KF', #github322 (Ricoh)
     0x132d6 => 'K-3 Mark III Monochrome', #github226 (Ricoh)
 );
 
@@ -736,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
@@ -1943,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
@@ -4917,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',
@@ -4944,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',
@@ -5016,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',
@@ -5739,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',
@@ -5747,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',
@@ -5768,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
@@ -6356,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

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.02';
+$VERSION = '1.03';
 
 # default plot settings (lower-case settings may be overridden by the user)
 my %defaults = (
@@ -262,23 +262,35 @@ sub Draw($$)
 {
     my ($self, $fp) = @_;
     my ($min, $max, $xmin, $xmax, $name, $style) = @$self{qw(Min Max XMin XMax Name style)};
+    my ($plotNum, $multiMulti);
 
     if (not defined $min or not defined $xmin) {
         $$self{Error} = 'Nothing to plot';
         return;
     }
-    my ($i, $n, %col, %class, $dx, $dy, $dx2, $xAxis, $x, $y, $px, $py, @og);
-    my ($noLegend, $xname, $xdat, $xdiff, $diff, %markID, $plotNum);
     my $scat = $$self{type} =~ /^s/ ? 1 : 0;
     my $hist = $$self{type} =~ /^h/ ? [ ] : 0;
-    my $multi = int($$self{multi} || 0);
+    my $multi = $$self{multi} || 0;
+    my @multi = $multi =~ /\d+/g;
+    my @names = @$name;
+    shift @names if $scat;
+    $multi = shift @multi;
     $multi = 0 unless $multi > 0;
     $style or $style = $hist ? 'line+fill' : 'line';
     unless ($style =~ /\b[mpl]/ or ($hist and $style =~ /\bf/)) {
         $$self{Error} = 'Invalid plot Style setting';
         return;
     }
-    my $numPlots = $multi ? scalar(@$name) - $scat : 1;
+    my $numPlots = 0;
+    if ($multi) {
+        my $n;
+        for ($n=0; $n<scalar(@$name)-$scat; ++$numPlots) {
+            $n += ($multi[$numPlots] || 1);
+            $multiMulti = 1 if $multi[$numPlots] and $multi[$numPlots] > 1;
+        }
+    } else {
+        $numPlots = 1;
+    }
     my @size = @{$$self{size}};
     my $sy = $size[1];
     if ($multi) {
@@ -293,6 +305,8 @@ sub Draw($$)
 <title>$tmp</title>};
   # loop through all plots
   for ($plotNum=0; $plotNum<$numPlots; ++$plotNum) {
+    my ($i, $n, %col, %class, $dx, $dy, $dx2, $xAxis, $x, $y, $px, $py, @og);
+    my ($noLegend, $xname, $xdat, $xdiff, $diff, %markID);
     if ($numPlots > 1) {
         print $fp "\n<g transform='translate(", ($plotNum % $multi) * $size[0],
                   ',', int($plotNum/$multi) * $size[1], ")'>";
@@ -304,14 +318,19 @@ sub Draw($$)
         }
         $name = $$self{Name} = [ ];
         push @{$$self{Name}}, $$self{SaveName}[0] if $scat;
-        push @{$$self{Name}}, $$self{SaveName}[$scat + $plotNum];
-        my $dat = $$self{Data}{$$self{Name}[$scat]};
+        foreach (0 .. (($multi[$plotNum] || 1) - 1)) {
+            push @{$$self{Name}}, shift(@names);
+        }
+warn "@{$$self{Name}}\n";
         undef $min; undef $max;
-        foreach (@$dat) {
-            defined or next;
-            defined $min or $min = $max = $_, next;
-            $min > $_ and $min = $_;
-            $max < $_ and $max = $_;
+        foreach ($scat .. (@{$$self{Name}} - 1)) {
+            my $dat = $$self{Data}{$$self{Name}[$_]};
+            foreach (@$dat) {
+                defined or next;
+                defined $min or $min = $max = $_, next;
+                $min > $_ and $min = $_;
+                $max < $_ and $max = $_;
+            }
         }
     }
     my ($data, $title, $xlabel, $ylabel, $cols, $marks, $tpad, $wid) =
@@ -321,12 +340,12 @@ sub Draw($$)
 
     # set reasonable default titles and labels
     $xname = shift @name if $scat;
-    $title = "$name[0] vs $xname" if $scat and defined $title and not $title and @name == 1;
+    $title = "$name[0] vs $xname" if $scat and defined $title and not $title and @name == 1 and not $multi;
     if ($scat || $hist and defined $xlabel and not $xlabel) {
         $xlabel = $$name[0];
         $noLegend = 1 if $hist;
     }
-    if (defined $ylabel and not $ylabel and @name == 1) {
+    if (defined $ylabel and not $ylabel and @name == 1 and not $multiMulti) {
         $ylabel = $hist ? 'Count' : $name[0];
         $noLegend = 1 unless $hist;
     }
@@ -645,7 +664,9 @@ Change plot settings.
   Title, XLabel, YLabel - plot title and x/y axis labels (no default)
   XMin, XMax            - x axis minimum/maximum (autoscaling if not set)
   YMin, YMax            - y axis minimum/maximum
-  Multi                 - flag to draw multiple plots, one for each dataset
+  Multi                 - number of columns when drawing multiple plots,
+                          followed optional number of datasets for each
+                          plot (1 by default) using any separator
   Split                 - flag to split strings of numbers into lists
                           (> 1 to split into lists of N items)
   "Grid=darkgray"       - grid color