exiftool_vendored 13.42.0 → 13.45.0

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

@@ -15,7 +15,7 @@ use strict;
 use vars qw($VERSION);
 use Image::ExifTool qw(:DataAccess :Utils);
 
-$VERSION = '1.18';
+$VERSION = '1.19';
 
 sub HandleStruct($$;$$$$);
 
@@ -42,8 +42,8 @@ my %uidInfo = (
     GROUPS => { 2 => 'Video' },
     VARS => { NO_LOOKUP => 1 }, # omit tags from lookup
     NOTES => q{
-        The following tags are extracted from Matroska multimedia container files. 
-        This container format is used by file types such as MKA, MKV, MKS and WEBM. 
+        The following tags are extracted from Matroska multimedia container files.
+        This container format is used by file types such as MKA, MKV, MKS and WEBM.
         For speed, by default ExifTool extracts tags only up to the first Cluster
         unless a Seek element specifies the position of a Tags element after this.
         However, the L<Verbose|../ExifTool.html#Verbose> (-v) and L<Unknown|../ExifTool.html#Unknown> = 2 (-U) options force processing of
@@ -167,7 +167,7 @@ my %uidInfo = (
     0x489 => {
         Name => 'Duration',
         Format => 'float',
-        ValueConv => '$$self{TimecodeScale} ? $val * $$self{TimecodeScale} / 1e9 : $val',
+        ValueConv => '$$self{TimecodeScale} ? $val * $$self{TimecodeScale} / 1e9 : $val / 1000',
         PrintConv => '$$self{TimecodeScale} ? ConvertDuration($val) : $val',
     },
     0x461 => {
@@ -661,7 +661,19 @@ my %uidInfo = (
         SubDirectory => { TagTable => 'Image::ExifTool::Matroska::Main' },
     },
         # Targets elements
-        0x28ca => { Name => 'TargetTypeValue',  Format => 'unsigned' },
+        0x28ca => {
+            Name => 'TargetTypeValue',
+            Format => 'unsigned',
+            PrintConv => {
+                10 => 'Shot',
+                20 => 'Scene/Subtrack',
+                30 => 'Chapter/Track',
+                40 => 'Session',
+                50 => 'Movie/Album',
+                60 => 'Season/Edition',
+                70 => 'Collection',
+            },
+        },
         0x23ca => { Name => 'TargetType',       Format => 'string' },
         0x23c5 => { Name => 'TagTrackUID',      %uidInfo },
         0x23c9 => { Name => 'TagEditionUID',    %uidInfo },
@@ -737,7 +749,8 @@ my %uidInfo = (
 # standardized tag names (ref 2)
 %Image::ExifTool::Matroska::StdTag = (
     GROUPS => { 2 => 'Video' },
-    VARS => { LONG_TAGS => 1 },
+    PRIORITY => 0, # (don't want named tags to override numbered tags, eg. "DURATION")
+    VARS => { LONG_TAGS => 3 },
     NOTES => q{
         Standardized Matroska tags, stored in a SimpleTag structure (see
         L<https://www.matroska.org/technical/tagging.html>).
@@ -866,6 +879,15 @@ my %uidInfo = (
             ProcessProc => 'Image::ExifTool::XMP::ProcessGSpherical',
         },
     },
+#
+# other tags seen
+#
+    _STATISTICS_WRITING_DATE_UTC => { Name => 'StatisticsWritingDateUTC', %dateInfo },
+    _STATISTICS_WRITING_APP => 'StatisticsWritingApp',
+    _STATISTICS_TAGS => 'StatisticsTags',
+    DURATION => 'Duration',
+    NUMBER_OF_FRAMES => 'NumberOfFrames',
+    NUMBER_OF_BYTES => 'NumberOfBytes',
 );
 
 #------------------------------------------------------------------------------
@@ -885,6 +907,7 @@ sub HandleStruct($$;$$$$)
         $name =~ tr/0-9a-zA-Z_//dc;
         $name =~ s/_([a-z])/\U$1/g;
         $name = "Tag_$name" if length $name < 2;
+        $et->VPrint(0, "  [adding $tag = $name]\n");
         $tagInfo = AddTagToTable($tagTbl, $tag, { Name => $name });
     }
     my ($id, $nm);
@@ -894,6 +917,7 @@ sub HandleStruct($$;$$$$)
         unless ($$tagTbl{$id}) {
             my %copy = %$tagInfo;
             $copy{Name} = $nm;
+            $et->VPrint(0, "  [adding $id = $nm]\n");
             $tagInfo = AddTagToTable($tagTbl, $id, \%copy);
         }
     } else {
@@ -965,7 +989,8 @@ sub ProcessMKV($$)
 {
     my ($et, $dirInfo) = @_;
     my $raf = $$dirInfo{RAF};
-    my ($buff, $buf2, @dirEnd, $trackIndent, %trackTypes, $struct, %seekInfo, %seek);
+    my ($buff, $buf2, @dirEnd, $trackIndent, %trackTypes, %trackNum,
+        $struct, %seekInfo, %seek);
 
     $raf->Read($buff, 4) == 4 or return 0;
     return 0 unless $buff =~ /^\x1a\x45\xdf\xa3/;
@@ -1024,6 +1049,7 @@ sub ProcessMKV($$)
                 # use INDENT to decide whether or not we are done this Track element
                 delete $$et{SET_GROUP1} if $trackIndent and $trackIndent eq $$et{INDENT};
                 $$et{INDENT} = substr($$et{INDENT}, 0, -2);
+                pop @{$$et{PATH}};
             } else {
                 $dirName = $dirEnd[-1][1];
                 last;
@@ -1043,7 +1069,7 @@ sub ProcessMKV($$)
         $$et{SeekHeadOffset} = $pos if $tag == 0x14d9b74;   # save offset of seek head
         my $size = GetVInt($buff, $pos);
         last unless defined $size;
-        my ($unknownSize, $seekInfoOnly);
+        my ($unknownSize, $seekInfoOnly, $tagName);
         $size < 0 and $unknownSize = 1, $size = 1e20;
         if (@dirEnd and $pos + $dataPos + $size > $dirEnd[-1][0]) {
             $et->Warn("Invalid or corrupted $dirEnd[-1][1] master element");
@@ -1063,10 +1089,11 @@ sub ProcessMKV($$)
             $seekInfoOnly = 1;
         }
         if ($tagInfo) {
+            $tagName = $$tagInfo{Name};
             if ($$tagInfo{SubDirectory} and not $$tagInfo{NotEBML}) {
                 # stop processing at first cluster unless we are using -v -U or -ee
                 # or there are Tags after this
-                if ($$tagInfo{Name} eq 'Cluster' and $processAll < 2) {
+                if ($tagName eq 'Cluster' and $processAll < 2) {
                     # jump to Tags if possible
                     unless ($processAll) {
                         if ($seek{Tags} and $seek{Tags} > $pos + $dataPos and $raf->Seek($seek{Tags},0)) {
@@ -1081,13 +1108,18 @@ sub ProcessMKV($$)
                 } else {
                     # just fall through into the contained EBML elements
                     $$et{INDENT} .= '| ';
-                    $et->VerboseDir($$tagTablePtr{$tag}{Name}, undef, $size);
-                    $dirName = $$tagInfo{Name};
+                    $dirName = $tagName;
+                    $et->VerboseDir($dirName, undef, $size);
+                    push @{$$et{PATH}}, $dirName;
                     push @dirEnd, [ $pos + $dataPos + $size, $dirName, $struct ];
                     $struct = { } if $dirName eq 'SimpleTag';   # keep track of SimpleTag elements
-                    if ($$tagInfo{Name} eq 'ChapterAtom') {
+                    # set Chapter# and Info family 1 group names
+                    if ($tagName eq 'ChapterAtom') {
                         $$et{SET_GROUP1} = 'Chapter' . (++$chapterNum);
                         $trackIndent = $$et{INDENT};
+                    } elsif ($tagName eq 'Info' and not $$et{SET_GROUP1}) {
+                        $$et{SET_GROUP1} = 'Info';
+                        $trackIndent = $$et{INDENT};
                     }
                     next;
                 }
@@ -1170,10 +1202,19 @@ sub ProcessMKV($$)
                     $val = $val * 256 + $_ foreach @vals;
                 }
             }
-            # set group1 to Track/Chapter number
-            if ($$tagInfo{Name} eq 'TrackNumber') {
+            if ($tagName eq 'TrackNumber') {
+                # set Track# family 1 group name for tags directly in the track
                 $$et{SET_GROUP1} = 'Track' . $val;
                 $trackIndent = $$et{INDENT};
+            } elsif ($tagName eq 'TrackUID' and $$et{SET_GROUP1}) {
+                # save the Track# group associated with this TrackUID
+                $trackNum{$val} = $$et{SET_GROUP1};
+            } elsif ($tagName eq 'TagTrackUID' and $trackNum{$val}) {
+                # set Track# group for associated SimpleTags tags
+                $$et{SET_GROUP1} = $trackNum{$val};
+                # we're already one deeper than the level where we want to
+                # reset the group name, so trigger at one indent level higher
+                $trackIndent = substr($$et{INDENT}, 0, -2);
             }
         }
         my %parms = (
@@ -1184,7 +1225,7 @@ sub ProcessMKV($$)
         );
         if ($$tagInfo{NoSave} or $struct) {
             $et->VerboseInfo($tag, $tagInfo, Value => $val, %parms) if $verbose;
-            $$struct{$$tagInfo{Name}} = $val if $struct;
+            $$struct{$tagName} = $val if $struct;
         } elsif ($$tagInfo{SeekInfo}) {
             my $p = $pos;
             $val = GetVInt($buff, $p) unless defined $val;

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

@@ -970,7 +970,7 @@ sub ReadXtraValue($$)
 {
     my ($et, $data) = @_;
     my ($format, $i, @vals);
-    
+
     return undef if length($data) < 10;
 
     # (version flags according to the reference, but looks more like a count - PH)

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.51';
+$VERSION = '4.52';
 
 sub LensIDConv($$$);
 sub ProcessNikonAVI($$$);
@@ -1352,6 +1352,7 @@ my %subjectDetectionZ9 = (
     4 => 'Vehicles',
     5 => 'Birds',
     6 => 'Airplanes',
+    7 => 'Faces',               #introduced with Z9 firmware 5.30 as an Auto Capture option
 );
 
 my %timeZoneZ9 = (
@@ -4848,17 +4849,17 @@ my %base64coord = (
     },
     0x31 => [
     {
-        Name => 'FocusPositionVertical',   # 209/233 focus point cameras
+        Name => 'FocusPositionVertical',    # 209/233 focus point cameras
         Condition => '$$self{Model} =~ /^NIKON (Z 30|Z 50|Z fc)\b/i and $$self{AFAreaYPosition}',   #models Z30, Z50, Zfc
         ValueConv => 'int($$self{AFAreaYPosition} / 286 )',      #divisor is an estimate (chosen to cause center point to report 'C')
         PrintConv => sub { my ($val) = @_; PrintAFPointsUpDown($val, 11 ) },
     },{
-        Name => 'FocusPositionVertical',  #273/299 focus point cameras
+        Name => 'FocusPositionVertical',    # 273/299 focus point cameras
         Condition => '$$self{Model} =~ /^NIKON (Z 5|Z 6|Z 6_2|D780)\b/i and $$self{AFAreaYPosition}',   #models Z5, Z6, Z6ii, D780
         ValueConv => 'int($$self{AFAreaYPosition} / 286 )',     #divisor is an estimate (chosen to cause center point to report 'C')
         PrintConv => sub { my ($val) = @_; PrintAFPointsUpDown($val, 13 ) },
     },{
-        Name => 'FocusPositionVertical',   #405/493 focus point cameras
+        Name => 'FocusPositionVertical',    # 405/493 focus point cameras
         Condition => '$$self{Model} =~ /^NIKON (Z 7|Z 7_2)\b/i and $$self{AFAreaYPosition}',   #models Z7/Z7ii
         ValueConv => 'int($$self{AFAreaYPosition} / 292 )',     #divisor is the measured vertical pixel separation between adjacent points
         PrintConv => sub { my ($val) = @_; PrintAFPointsUpDown($val, 17 ) },
@@ -5843,7 +5844,7 @@ my %nikonFocalConversions = (
             28 => 'Nikkor Z 100-400mm f/4.5-5.6 VR S', #28
             29 => 'Nikkor Z 28mm f/2.8', #IB
             30 => 'Nikkor Z 400mm f/2.8 TC VR S', #28
-            31 => 'Nikkor Z 24-120mm f/4 S', #github#250
+            31 => 'Nikkor Z 24-120mm f/4 S', #github250
             32 => 'Nikkor Z 800mm f/6.3 VR S', #28
             35 => 'Nikkor Z 28-75mm f/2.8', #IB
             36 => 'Nikkor Z 400mm f/4.5 VR S', #IB
@@ -9010,7 +9011,7 @@ my %nikonFocalConversions = (
         RawConv => '$$self{FocusShiftShooting} = $val',
         PrintConv => q{
             return 'Off' if $val == 0 ;
-            my $i = sprintf("Frame %.0f of %.0f",$val, $$self{FocusShiftNumberShots}); # something like Frame 1 of 100"   
+            my $i = sprintf("Frame %.0f of %.0f",$val, $$self{FocusShiftNumberShots}); # something like Frame 1 of 100"
             if ($$self{PixelShiftActive} and $$self{PixelShiftActive} eq 1) {$i = sprintf("Frame %.0f",$val);}   #for the Z8 fw3 with PixelShift Enabled, the frame count is correct, but the frame total needs to be multiplied by the number of PixelShift frames (which I cannot find)
             return "On: $i"
         },
@@ -9018,7 +9019,7 @@ my %nikonFocalConversions = (
     },
 #
 # Note: Offsets after this are shifted by +2 for Z8 firmware 3.0 (see Hook above)
-#    
+#
     0x0028 => {
         Name => 'IntervalShooting',    #will be 'On' when Interval Shooting is selected via the Photo Shooting Menu and also when a non-zero interval is specified when using Focus Shift and/or Pixel Shift Shooting
         Condition => '$$self{ShutterMode} and $$self{ShutterMode} ne 96',    #not valid for C30/C60/C120
@@ -9346,12 +9347,9 @@ my %nikonFocalConversions = (
     106 => {
         Name => 'AutoCaptureCriteriaSubjectType',
         Condition => '$$self{AutoCapturedFrame} and $$self{AutoCapturedFrame} ne 0',
-        PrintConv => {
-            0 => 'Auto (all)',
-            1 => 'People',
-            2 => 'Animals',
-            3 => 'Vehicle'
-        },
+        ValueConv => '$val + 1',    # change value range to align with %subjectDetectionZ9 
+        ValueConvInv => '$val - 1',
+        PrintConv => \%subjectDetectionZ9,
     },
 );
 
@@ -9929,14 +9927,14 @@ my %nikonFocalConversions = (
     618 => { Name => 'ToneMap',                    PrintConv => { 0 => 'SDR', 1 => 'HLG' }, Unknown => 1 },
     622 => { Name => 'PortraitImpressionBalance',  PrintConv => \%portraitImpressionBalanceZ8 },
     636 => {
-        Name => 'HighFrequencyFlickerReduction', 
+        Name => 'HighFrequencyFlickerReduction',
         PrintConv => \%offOn,
         Unknown => 1,
         Hook => '$varSize += 4 if $$self{FirmwareVersion} and $$self{FirmwareVersion} ge "03.00"',
     },
 #
 # firmware 3.00 adds 4 bytes somewhere in the range 638-730 (hence the Hook above)
-# 
+#
     730 => {
         Name => 'MovieImageArea',
         Unknown => 1,

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

@@ -15,7 +15,7 @@ package Image::ExifTool::NikonCustom;
 use strict;
 use vars qw($VERSION @ISA @EXPORT_OK %buttonsZ8 %buttonsZ9);
 
-$VERSION = '1.27';
+$VERSION = '1.28';
 
 @ISA = qw(Exporter);
 @EXPORT_OK = qw(%buttonsZ8 %buttonsZ9);
@@ -115,10 +115,10 @@ my %buttonsCommonZ8Z9 = (  #button roles shared by the Z8 & Z9.  Assigments bega
     SeparateTable => 'ButtonsZ8',
     PrintConv => {
         %buttonsCommonZ8Z9,
-        116 => 'Pixel Shift Shooting', 
+        116 => 'Pixel Shift Shooting',
         117 => 'Cycle AF-area Mode',
         119 => 'Focus Limiter',
-        120 => 'Jump to Source Image', 
+        120 => 'Jump to Source Image',
         121 => 'Raw Processing (Current)',
         122 => 'Raw Processing (Multiple)',
         123 => 'Trim',
@@ -140,9 +140,9 @@ my %buttonsCommonZ8Z9 = (  #button roles shared by the Z8 & Z9.  Assigments bega
     SeparateTable => 'ButtonsZ9',
     PrintConv => {
         %buttonsCommonZ8Z9,
-        116 => 'Save and Load Power Zoom Position', 
+        116 => 'Save and Load Power Zoom Position',
         117 => 'Cycle AF-area Mode',
-        118 => 'Raw Processing (Current)',  #118-131 are Playback Retouch options
+        118 => 'Raw Processing (Current)',  #118-131 and 135 are Playback Retouch options
         119 => 'Raw Processing (Multiple)',
         120 => 'Trim',
         121 => 'Resize (Current)',
@@ -156,6 +156,9 @@ my %buttonsCommonZ8Z9 = (  #button roles shared by the Z8 & Z9.  Assigments bega
         129 => 'Lighten',
         130 => 'Darken',
         131 => 'Motion Blend',
+        133 => 'Focus Limiter',
+        134 => 'Cycle Subject Detection Options',
+        135 => 'Jump To Source Image',
     },
 );
 my %buttonsZ6III= (
@@ -9880,11 +9883,10 @@ my %noYes = ( 0 => 'No', 1 => 'Yes' );
     17 => { Name => 'LimitAF-AreaModeSelPinpoint',  PrintConv => \%limitNolimit, Unknown => 1 }, # CSa8
     19 => { Name => 'LimitAF-AreaModeSelWideAF_S',  PrintConv => \%limitNolimit, Unknown => 1 }, # CSa8
     20 => { Name => 'LimitAF-AreaModeSelWideAF_L',  PrintConv => \%limitNolimit, Unknown => 1 }, # CSa8
-    21 => { Name => 'LimitAFAreaModeSelAuto',       PrintConv => \%limitNolimit, Unknown => 1 }, # CSa8     
+    21 => { Name => 'LimitAFAreaModeSelAuto',       PrintConv => \%limitNolimit, Unknown => 1 }, # CSa8
     22 => { Name => 'FocusPointWrap',               PrintConv => { 0 => 'No Wrap', 1 => 'Wrap' }, Unknown => 1 }, # CSa10
     23 => { Name => 'ManualFocusPointIllumination', PrintConv => {0 => 'On During Focus Point Selection Only', 1 => 'On', }, Unknown => 1 },  # CSa10a
     24 => { Name => 'DynamicAreaAFAssist',     PrintConv => { 0 => 'Focus Point Only',1 => 'Focus and Surrounding Points',}, Unknown => 1 },  # CSa10b
-    
     26 => { Name => 'AF-AssistIlluminator',    PrintConv => \%offOn }, # CSa11
     27 => { Name => 'ManualFocusRingInAFMode', PrintConv => \%offOn }, # CSa14
     29 => { Name => 'ExposureControlStepSize', PrintConv => \%thirdHalfFull },     # CSb2
@@ -9999,7 +10001,7 @@ my %noYes = ( 0 => 'No', 1 => 'Yes' );
         },
     },
     85 => { Name => 'ContinuousModeDisplay',  PrintConv => \%offOn }, # CSd14
-    87 => { # CSe1-a            Previous cameras reported this with HighSpeedSync indicator appended as '(Auto FP)'.  
+    87 => { # CSe1-a            Previous cameras reported this with HighSpeedSync indicator appended as '(Auto FP)'.
         Name => 'FlashSyncSpeed',
         ValueConv => '($val-144)/8',
         PrintConv => {

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

@@ -53,7 +53,7 @@ my %formatType = (
         L<http://www.openexr.com/> for the official specification.
     },
     _ver => { Name => 'EXRVersion', Notes => 'low byte of Flags word' },
-    _flags => { Name => 'Flags', 
+    _flags => { Name => 'Flags',
         PrintConv => { BITMASK => {
             9 => 'Tiled',
             10 => 'Long names',

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

@@ -95,7 +95,7 @@ sub ProcessPPM($$)
         } elsif ($seal and $$et{DEL_GROUP}{SEAL}) {
             # delete SEAL comment
             $et->VerboseValue('- Comment', $oldComment);
-            ++$$et{CHANGED};            
+            ++$$et{CHANGED};
         } else {
             $newComment = $oldComment;  # use existing comment
         }

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.26';
+$VERSION = '2.28';
 
 sub ProcessLeicaLEIC($$$);
 sub WhiteBalanceConv($;$$);
@@ -916,13 +916,21 @@ my %shootingMode = (
         Name => 'AFPointPosition',
         Writable => 'rational64u',
         Count => 2,
-        Notes => 'X Y coordinates of primary AF area center, in the range 0.0 to 1.0',
+        Notes => q{
+            X Y coordinates of primary AF area center, in the range 0.0 to 1.0, or
+            "n/a" or "none" for invalid values
+        },
         PrintConv => q{
             return 'none' if $val eq '16777216 16777216';
+            return 'n/a' if $val =~ /^4194303\.9/;
             my @a = split ' ', $val;
             sprintf("%.2g %.2g",@a);
         },
-        PrintConvInv => '$val eq "none" ? "16777216 16777216" : $val',
+        PrintConvInv => q{
+            return '16777216 16777216' if $val eq 'none';
+            return '4294967295/1024 4294967295/1024' if $val eq 'n/a';
+            return $val;
+        },
     },
     0x4e => { #PH
         Name => 'FaceDetInfo',
@@ -1441,8 +1449,8 @@ my %shootingMode = (
         Writable => 'rational64u',
         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',
+        PrintConv => '$val =~ /^4194303\.9/ ? "n/a" : $val',
+        PrintConvInv => '$val eq "n/a" ? "4294967295/1024 4294967295/1024" : $val',
     },
     0xe4 => { #IB
         Name => 'LensTypeModel',
@@ -1485,6 +1493,22 @@ my %shootingMode = (
         Writable => 'int16u',
         PrintConv => { 0 => 'Off', 1 => 'On' },
     },
+    0xf1 => { #github365
+        Name => 'LUT1Name',
+        Writable => 'string',
+    },
+    0xf3 => { #github365
+        Name => 'LUT1Opacity',
+        Writable => 'int8u',    # (percent)
+    },
+    0xf4 => { #github365
+        Name => 'LUT2Name',
+        Writable => 'string',
+    },
+    0xf5 => { #github365
+        Name => 'LUT2Opacity',
+        Writable => 'int8u',    # (percent)
+    },
     0x0e00 => {
         Name => 'PrintIM',
         Description => 'Print Image Matching',
@@ -2271,7 +2295,7 @@ my %shootingMode = (
         Format => 'int16u[4]',
         RawConv => '$$self{NumFacePositions} < 1 ? undef : $val',
         Notes => q{
-            4 numbers: X/Y coordinates of the face center and width/height of face. 
+            4 numbers: X/Y coordinates of the face center and width/height of face.
             Coordinates are relative to an image twice the size of the thumbnail, or 320
             pixels wide
         },

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

@@ -909,10 +909,18 @@ my %binaryDataAttrs = (
         # 11.3.0.0 - K-S1
         # 11.5.0.0 - K-S2
         # 11.6.1.0 - K-3 II
-        # 11.7.5.0 - WG-M2
+        # 11.7.5.0 - Ricoh WG-M2
         # 12.0.0.0 - K-1
         # 12.1.3.0 - K-70
         # 12.1.5.0 - KP
+        # 12.3.2.0 - K-1 Mark II
+        # 12.7.5.0 - Ricoh WG-M2
+        # 13.0.0.0 - Ricoh GR III / G900SE
+        # 13.1.1.0 - Ricoh WG-70
+        # 14.0.0.0 - K-3 Mark III
+        # 14.0.1.0 - Ricoh GR IIIx
+        # 14.2.0.0 - KF
+        # 15.2.3.0 - Ricoh GR IV
     },
     0x0001 => { #PH
         Name => 'PentaxModelType',

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

@@ -15,7 +15,7 @@ use vars qw($VERSION);
 use Image::ExifTool qw(:DataAccess :Utils);
 use Image::ExifTool::Exif;
 
-$VERSION = '1.11';
+$VERSION = '1.12';
 
 sub WritePhaseOne($$$);
 sub ProcessPhaseOne($$$);
@@ -193,6 +193,22 @@ my @formatName = ( undef, 'string', 'int16s', undef, 'int32s' );
         Flags => ['Unknown','Hidden'],
         PrintConv => \&Image::ExifTool::LimitLongValues,
     },
+    0x0262 => { Name => 'SequenceID', Format => 'string' },
+    0x0263 => {
+        Name => 'SequenceKind',
+        PrintConv => {
+            0 => 'Bracketing: Shutter Speed',
+            1 => 'Bracketing: Aperture',
+            2 => 'Bracketing: ISO',
+            3 => 'Hyperfocal',
+            4 => 'Time Lapse',
+            5 => 'HDR',
+            6 => 'Focus Stacking',
+        },
+        PrintConvInv => '$val',
+    },
+    0x0264 => 'SequenceFrameNumber',
+    0x0265 => 'SequenceFrameCount',
     # 0x0300 - int32u: 100,101,102
     0x0301 => { Name => 'FirmwareVersions', Format => 'string' },
     # 0x0304 - int32u: 8,3073,3076

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

@@ -461,7 +461,7 @@ sub Draw($$)
             $mark = $markerData{$m[0]};
             $mark or $markID{$mark} = '', next; # skip 'none' or unrecognized marker name
             if ($fill and $fill ne 'none') {
-                my $op = $m[3] || ($$cols[$i] eq 'none' ? 50 : 20); 
+                my $op = $m[3] || ($$cols[$i] eq 'none' ? 50 : 20);
                 $mark .= qq( fill="$fill" style="fill-opacity: $op%");
             } else {
                 $mark .= ' fill="none"';
@@ -573,7 +573,7 @@ sub Draw($$)
         $xsclr = int($xscl * 100 + 0.5) / 100;
         if ($style =~ /\bf/) {
             my @m = split /-/, $$marks[0];
-            my $op = $m[3] || ($style =~ /\bl/ ? 20 : 50); 
+            my $op = $m[3] || ($style =~ /\bl/ ? 20 : 50);
             $fill = " fill='$$cols[0]'";
             $fill .= " style='fill-opacity: $op%'" if $$cols[0] ne 'none';
         }

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

@@ -9,7 +9,7 @@
 #               and 'int64s' formats for VARINT (type 0) values, 'int64u',
 #               'int64s', 'rational64u', 'rational64s' and 'double' for I64
 #               (type 1), 'undef', 'string' and 'rational' for LEN (type 2),
-#               and 'int32u', 'int32s', 'rational32u', 'rational32s', 
+#               and 'int32u', 'int32s', 'rational32u', 'rational32s',
 #               'fixed32u', 'fixed32s' and 'float' for I32 (type 5) values.
 #
 # References:   1) https://protobuf.dev/programming-guides/encoding/
@@ -21,10 +21,16 @@ use strict;
 use vars qw($VERSION);
 use Image::ExifTool qw(:DataAccess :Utils);
 
-$VERSION = '1.05';
+$VERSION = '1.06';
 
 sub ProcessProtobuf($$$;$);
 
+# largest unsigned integer on this system (2^32 or 2^64 - 1)
+my $intMax = ~0;
+
+# smallest unsigned integer that we interpret as int64s (0xffffffff00000000)
+my $int64sMin = 18446744069414584320;
+
 #------------------------------------------------------------------------------
 # Read bytes from dirInfo object
 # Inputs: 0) dirInfo ref (with DataPt and Pos set), 1) number of bytes
@@ -43,17 +49,23 @@ sub GetBytes($$)
 # Read variable-length integer
 # Inputs: 0) dirInfo ref
 # Returns: integer value
+# - sets $$dirInfo{Bit0} according to bit 0 of returned value
+#   (necessary for cases where a signed integer exceeds $intMax)
 sub VarInt($)
 {
     my $dirInfo = shift;
-    my $val = 0;
-    my $shift = 0;
+    my $buff = GetBytes($dirInfo, 1);
+    return undef unless defined $buff;
+    my $val = ord($buff) & 0x7f;
+    $$dirInfo{Bit0} = $val & 0x01;
+    my $mult = 128;
     for (;;) {
-        my $buff = GetBytes($dirInfo, 1);
-        defined $buff or return undef;
-        $val += (ord($buff) & 0x7f) << $shift;
         last unless ord($buff) & 0x80;
-        $shift += 7;
+        $buff = GetBytes($dirInfo, 1);
+        return undef unless defined $buff;
+        $val += (ord($buff) & 0x7f) * $mult;
+        last unless ord($buff) & 0x80;
+        $mult *= 128;   # (Note: don't use integer bit shift to avoid integer overflow)
     }
     return $val;
 }
@@ -62,7 +74,8 @@ sub VarInt($)
 # Read protobuf record
 # Inputs: 0) dirInfo ref
 # Returns: 0) record payload (plus tag id and format type in list context)
-# Notes: Updates dirInfo Pos to start of next record
+# Notes: Updates $$dirInfo{Pos} to start of next record, and sets $$dirInfo{Bit0}
+#        according to the least significant bit of type 0 (varInt) records
 sub ReadRecord($)
 {
     my $dirInfo = shift;
@@ -133,7 +146,7 @@ sub ProcessProtobuf($$$;$)
     }
     # prefix for unknown tags
     my $unkPre = $$tagTbl{TAG_PREFIX} ? $$tagTbl{TAG_PREFIX} . '_' : 'Protobuf ';
-    
+
     # loop through protobuf records
     for (;;) {
         my $pos = $$dirInfo{Pos};
@@ -170,11 +183,19 @@ sub ProcessProtobuf($$$;$)
             if ($type == 0) {
                 $val = $buff;
                 if ($$tagInfo{Format} eq 'signed') {
-                    $val = ($val & 1) ? -($val >> 1)-1 : ($val >> 1);
-                } elsif ($$tagInfo{Format} eq 'int64s' and $val > 0xffffffff) {
+                    if ($val > $intMax) {
+                        # use double math (15 decimal digits precision)
+                        $val = $$dirInfo{Bit0} ? -int($val / 2) - 1 : $val / 2;
+                    } else {
+                        # use integer math
+                        $val = ($val & 1) ? -($val >> 1)-1 : ($val >> 1);
+                    }
+                } elsif ($$tagInfo{Format} eq 'int64s' and $val >= $int64sMin) {
                     # hack for DJI drones which store 64-bit signed integers improperly
                     # (just toss upper 32 bits which should be all 1's anyway)
-                    $val = ($val & 0xffffffff) - 4294967296;
+                    # Note: do the two subtractions because $int64sMin + 4294967296
+                    # is too large for a 64-bit integer
+                    $val = $val - $int64sMin - 4294967296;
                 }
             } elsif ($type == 2 and $$tagInfo{Format} eq 'rational') {
                 my $dir = { DataPt => \$buff, Pos => 0 };
@@ -187,11 +208,16 @@ sub ProcessProtobuf($$$;$)
         } elsif ($type == 0) { # varInt
             $val = $buff;
             my $hex = sprintf('%x', $val);
-            if (length($hex) == 16 and $hex =~ /^ffffffff/) {
-                my $s64 = hex(substr($hex, 8)) - 4294967296;
+            if ($val >= $int64sMin) {
+                my $s64 = $val - $int64sMin - 4294967296;
                 $val .= " (0x$hex, int64s $s64)";
             } else {
-                my $signed = ($val & 1) ? -($val >> 1)-1 : ($val >> 1);
+                my $signed;
+                if ($val > $intMax) {
+                    $signed = $$dirInfo{Bit0} ? -int($val / 2) - 1 : $val / 2;
+                } else {
+                    $signed = ($val & 1) ? -($val >> 1)-1 : ($val >> 1);
+                }
                 $val .= " (0x$hex, signed $signed)";
             }
         } elsif ($type == 1) { # 64-bit number