exiftool-vendored.pl 12.69.0 → 12.70.0

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

@@ -962,8 +962,8 @@ my %imageAreaZ9b = (
 );
 
 my %infoZSeries = (
-    Condition => '$$self{Model} =~ /^NIKON Z (30|5|50|6|6_2|7|7_2|8|fc|9)\b/i',
-    Notes => 'Z Series cameras thru July 2023',
+    Condition => '$$self{Model} =~ /^NIKON Z (30|5|50|6|6_2|7|7_2|8|f|fc|9)\b/i',
+    Notes => 'Z Series cameras thru October 2023',
 );
 
 my %iSOAutoHiLimitZ7 = (
@@ -2582,9 +2582,21 @@ my %base64coord = (
                 DirOffset => 4,
             },
         },
-        {   # (D5200/D7100=0218, D5300=0219, D610/Df=0220, D3300=0221, CoolpixA=0601)
-            Name => 'ColorBalanceUnknown02',
-            Condition => '$$valPt =~ /^0[26]/',
+        {   #PH (NC)
+            # (D5300=0219, D3300=0221, D4S=0222, D750/D810=0223, D3400/D3500/D5500/D5600/D7200=0224)
+            Condition => '$$valPt =~ /^02(19|2[1234])/',
+            Name => 'ColorBalance0219',
+            SubDirectory => {
+                TagTable => 'Image::ExifTool::Nikon::ColorBalance2',
+                ProcessProc => \&ProcessNikonEncrypted,
+                WriteProc => \&ProcessNikonEncrypted,
+                DecryptStart => 4,
+                DirOffset => 0x7c,
+            },
+        },
+        {   # (D610/Df=0220, CoolpixA=0601)
+            Name => 'ColorBalanceUnknown1',
+            Condition => '$$valPt =~ /^0(220|6)/',
             SubDirectory => {
                 TagTable => 'Image::ExifTool::Nikon::ColorBalanceUnknown',
                 ProcessProc => \&ProcessNikonEncrypted,
@@ -2592,11 +2604,12 @@ my %base64coord = (
                 DecryptStart => 284,
             },
         },
-        {   # (1J1/1J2/1V1=0400, 1V2=0401, 1J3/1S1=0402, 1AW1=0403, Z6/Z7=0800)
-            Name => 'ColorBalanceUnknown04',
-            Condition => '$$valPt =~ /^0[48]/',
+        {   # (D5200/D7200=0218, D5/D500=0225, D7500=0226, D850=0227, D6/D780=0228,
+            #  1J1/1J2/1V1=0400, 1V2=0401, 1J3/1S1=0402, 1AW1=0403, Z6/Z7=0800)
+            Name => 'ColorBalanceUnknown2',
+            Condition => '$$valPt =~ /^0(18|[248])/',
             SubDirectory => {
-                TagTable => 'Image::ExifTool::Nikon::ColorBalanceUnknown',
+                TagTable => 'Image::ExifTool::Nikon::ColorBalanceUnknown2',
                 ProcessProc => \&ProcessNikonEncrypted,
                 WriteProc => \&ProcessNikonEncrypted, # (necessary to recrypt this if serial number changed)
                 DecryptStart => 4,
@@ -4956,6 +4969,16 @@ my %nrwLevels = (
     },
 );
 
+%Image::ExifTool::Nikon::ColorBalanceUnknown2 = (
+    %binaryDataAttrs,
+    GROUPS => { 0 => 'MakerNotes', 2 => 'Camera' },
+    FORMAT => 'int16u',
+    0 => {
+        Name => 'ColorBalanceVersion',
+        Format => 'undef[4]',
+    },
+);
+
 %Image::ExifTool::Nikon::Type2 = (
     WRITE_PROC => \&Image::ExifTool::Exif::WriteExif,
     CHECK_PROC => \&Image::ExifTool::Exif::CheckExif,
@@ -5448,7 +5471,7 @@ my %nikonFocalConversions = (
             43 => 'NIKKOR Z DX 24mm f/1.7', #28
             44 => 'NIKKOR Z 70-180mm f/2.8', #28
             45 => 'NIKKOR Z 600mm f/6.3 VR S', #28
-            48 => 'Nikkor Z 135mm f/1.8 S Plena', #28
+            46 => 'Nikkor Z 135mm f/1.8 S Plena', #28
             32768 => 'Nikkor Z 400mm f/2.8 TC VR S TC-1.4x', #28
             32769 => 'Nikkor Z 600mm f/4 TC VR S TC-1.4x', #28
         },
@@ -8195,7 +8218,7 @@ my %nikonFocalConversions = (
     CHECK_PROC => \&Image::ExifTool::CheckBinaryData,
     VARS => { ID_LABEL => 'Index', NIKON_OFFSETS => 0x24 },
     DATAMEMBER => [ 0x04 ],
-    IS_SUBDIR => [ 0x30, 0x38, 0x98, 0xa0 ],
+    IS_SUBDIR => [ 0x30, 0x38, 0x88, 0x98, 0xa0 ],
     WRITABLE => 1,
     GROUPS => { 0 => 'MakerNotes', 2 => 'Camera' },
     NOTES => 'These tags are extracted from encrypted data in images from the Z7II.',
@@ -8245,9 +8268,19 @@ my %nikonFocalConversions = (
             Start => '$val',
         }
     },
+    0x88 => {
+        Name => 'OrientationOffset',
+        Format => 'int32u',
+        Condition => '$$self{Model} =~ /^NIKON Z f\b/i',
+        SubDirectory => {
+            TagTable => 'Image::ExifTool::Nikon::OrientationInfo',
+            Start => '$val',
+        }
+    },
     0x98 => {
         Name => 'OrientationOffset',
         Format => 'int32u',
+        Condition => '$$self{Model} =~ /^NIKON Z (30|5|50|6|6_2|7|7_2|8|fc)\b/i',   #models other then the Z f
         SubDirectory => {
             TagTable => 'Image::ExifTool::Nikon::OrientationInfo',
             Start => '$val',
@@ -8514,7 +8547,7 @@ my %nikonFocalConversions = (
     0x002a => {
         Name => 'IntervalFrame',
         RawConv => '$$self{IntervalFrame} = $val',
-        Condition => '$$self{ShutterMode} and $$self{ShutterMode} ne 96 and $$self{FocusShiftShooting} > 0',     #not valid for C30/C60/C120
+        Condition => '$$self{ShutterMode} and $$self{ShutterMode} ne 96 and $$self{IntervalShooting} > 0',     #not valid for C30/C60/C120
         Format => 'int16u',
         Hidden => 1,
     },

package/bin/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.81';
+$VERSION = '2.82';
 
 sub PrintLensInfo($$$);
 
@@ -186,7 +186,9 @@ my %olympusLensTypes = (
     '2 36 10' => 'Leica DG Elmarit 200mm F2.8 Power OIS', #IB
     '2 37 10' => 'Leica DG Vario-Elmarit 50-200mm F2.8-4 Asph. Power OIS', #IB
     '2 38 10' => 'Leica DG Vario-Summilux 10-25mm F1.7 Asph.', #IB
+    '2 39 10' => 'Leica DG Summilux 25mm F1.4 II Asph.', #forum15345
     '2 40 10' => 'Leica DG Vario-Summilux 25-50mm F1.7 Asph.', #IB (H-X2550)
+    '2 41 10' => 'Leica DG Summilux 9mm F1.7 Asph.', #forum15345
     '3 01 00' => 'Leica D Vario Elmarit 14-50mm F2.8-3.5 Asph.', #11
     '3 02 00' => 'Leica D Summilux 25mm F1.4 Asph.', #11
     # Tamron lenses
@@ -358,6 +360,7 @@ my %olympusCameraTypes = (
     D4521 => 'SH-25MR',
     D4523 => 'SP-720UZ',
     D4529 => 'VG170',
+    D4530 => 'VH210',
     D4531 => 'XZ-2',
     D4535 => 'SP-620UZ',
     D4536 => 'TG-320',
@@ -383,9 +386,11 @@ my %olympusCameraTypes = (
     D4585 => 'SH-2 / SH-3',
     D4586 => 'TG-4',
     D4587 => 'TG-860',
+    D4590 => 'TG-TRACKER',
     D4591 => 'TG-870',
     D4593 => 'TG-5', #IB
     D4603 => 'TG-6', #IB
+    D4605 => 'TG-7',
     D4809 => 'C2500L',
     D4842 => 'E-10',
     D4856 => 'C-1',
@@ -431,6 +436,7 @@ my %olympusCameraTypes = (
     S0076 => 'E-PL9', #IB
     S0080 => 'E-M1X', #IB
     S0085 => 'E-PL10', #IB
+    S0088 => 'E-M10MarkIV',
     S0089 => 'E-M5MarkIII',
     S0092 => 'E-M1MarkIII', #IB
     S0093 => 'E-P7', #IB

package/bin/lib/Image/ExifTool/PNG.pm

@@ -80,6 +80,7 @@ my %pngMap = (
     ICC_Profile  => 'PNG',
     Photoshop    => 'PNG',
    'PNG-pHYs'    => 'PNG',
+    JUMBF        => 'PNG',
     IPTC         => 'Photoshop',
     MakerNotes   => 'ExifIFD',
 );
@@ -341,6 +342,7 @@ my %noLeapFrog = ( SAVE => 1, SEEK => 1, IHDR => 1, JHDR => 1, IEND => 1, MEND =
     },
     caBX => { # C2PA metadata
         Name => 'JUMBF',
+        Deletable => 1,
         SubDirectory => { TagTable => 'Image::ExifTool::Jpeg2000::Main' },
     },
     cICP => {
@@ -973,20 +975,13 @@ sub FoundPNG($$$$;$$$$)
                 undef $processProc if $wasCompressed and $processProc and $processProc eq \&ProcessPNG_Compressed;
                 # rewrite this directory if necessary (but always process TextualData normally)
                 if ($outBuff and not $processProc and $subTable ne \%Image::ExifTool::PNG::TextualData) {
-                    # allow JUMBF to be deleted (may want to expand this for other types too?)
-                    if ($dirName eq 'JUMBF' and $$et{DEL_GROUP}{$dirName}) {
-                        $$outBuff = '';
-                        ++$$et{CHANGED};
-                        $et->VPrint(0, "  Deleting $dirName");
-                    } else {
-                        return 1 unless $$et{EDIT_DIRS}{$dirName};
-                        $$outBuff = $et->WriteDirectory(\%subdirInfo, $subTable);
-                        if ($tagName eq 'XMP' and $$outBuff) {
-                            # make sure the XMP is marked as read-only
-                            Image::ExifTool::XMP::ValidateXMP($outBuff,'r');
-                        }
-                        DoneDir($et, $dirName, $outBuff, $$tagInfo{NonStandard});
+                    return 1 unless $$et{EDIT_DIRS}{$dirName};
+                    $$outBuff = $et->WriteDirectory(\%subdirInfo, $subTable);
+                    if ($tagName eq 'XMP' and $$outBuff) {
+                        # make sure the XMP is marked as read-only
+                        Image::ExifTool::XMP::ValidateXMP($outBuff,'r');
                     }
+                    DoneDir($et, $dirName, $outBuff, $$tagInfo{NonStandard});
                 } else {
                     $processed = $et->ProcessDirectory(\%subdirInfo, $subTable, $processProc);
                 }

package/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.20';
+$VERSION = '2.21';
 
 sub ProcessLeicaLEIC($$$);
 sub WhiteBalanceConv($;$$);
@@ -1991,6 +1991,15 @@ my %shootingMode = (
         },
         PrintConvInv => '$_=$val; tr/A-Z0-9//dc; s/(.{3})(19|20)/$1/; $_',
     },
+    0x05ff => {
+        Name => 'CameraIFD', # (Leica Q3)
+        Condition => '$$valPt =~ /^(II\x2a\0\x08\0\0\0|MM\0\x2a\0\0\0\x08)/',
+        SubDirectory => {
+            TagTable => 'Image::ExifTool::PanasonicRaw::CameraIFD',
+            Base => '$start',
+            ProcessProc => \&Image::ExifTool::ProcessTIFF,
+        },
+    },
 );
 
 # Leica type5 ShotInfo (ref PH) (X2)

package/bin/lib/Image/ExifTool/QuickTime.pm

@@ -48,7 +48,7 @@ use Image::ExifTool qw(:DataAccess :Utils);
 use Image::ExifTool::Exif;
 use Image::ExifTool::GPS;
 
-$VERSION = '2.88';
+$VERSION = '2.89';
 
 sub ProcessMOV($$;$);
 sub ProcessKeys($$$);
@@ -638,6 +638,33 @@ my %isImageData = ( av01 => 1, avc1 => 1, hvc1 => 1, lhv1 => 1, hvt1 => 1 );
             Condition => '$$valPt=~/^\xef\xe1\x58\x9a\xbb\x77\x49\xef\x80\x95\x27\x75\x9e\xb1\xdc\x6f/ and $$self{OPTIONS}{ExtractEmbedded}',
             SubDirectory => { TagTable => 'Image::ExifTool::QuickTime::Tags360Fly' },
         },
+        { #https://c2pa.org/specifications/
+            Name => 'JUMBF',
+            Condition => '$$valPt=~/^\xd8\xfe\xc3\xd6\x1b\x0e\x48\x3c\x92\x97\x58\x28\x87\x7e\xc4\x81.{4}manifest\0/s',
+            Deletable => 1,
+            SubDirectory => {
+                TagTable => 'Image::ExifTool::Jpeg2000::Main',
+                # 16 bytes uuid
+                # +4 bytes 0
+                # +9 bytes "manifest\0"
+                # +8 bytes absolute(!!!) offset to C2PA uuid "merkle\0" box
+                # =37 bytes total
+                Start => 37,
+            },
+        },
+        { #https://c2pa.org/specifications/ (NC)
+            Name => 'CBOR',
+            Condition => '$$valPt=~/^\xd8\xfe\xc3\xd6\x1b\x0e\x48\x3c\x92\x97\x58\x28\x87\x7e\xc4\x81.{4}merkle\0/s',
+            Deletable => 1, # (NC)
+            SubDirectory => {
+                TagTable => 'Image::ExifTool::CBOR::Main',
+                # 16 bytes uuid
+                # +4 bytes 0
+                # +7 bytes "merkle\0"
+                # =27 bytes total
+                Start => 27,
+            },
+        },
         {
             Name => 'SensorData',
             Condition => '$$valPt=~/^\xef\xe1\x58\x9a\xbb\x77\x49\xef\x80\x95\x27\x75\x9e\xb1\xdc\x6f/',
@@ -9504,7 +9531,7 @@ sub ProcessMOV($$;$)
         # stop processing at mdat/idat if -fast2 is used
         last if $fast > 1 and ($tag eq 'mdat' or ($tag eq 'idat' and $$et{FileType} ne 'HEIC'));
         # load values only if associated with a tag (or verbose) and not too big
-        if ($size > 0x2000000) {    # start to get worried above 32 MB
+        if ($size > 0x2000000) {    # start to get worried above 32 MiB
             # check for RIFF trailer (written by Auto-Vox dashcam)
             if ($buff =~ /^(gpsa|gps0|gsen|gsea)...\0/s) { # (yet seen only gpsa as first record)
                 $et->VPrint(0, "Found RIFF trailer");
@@ -9521,9 +9548,9 @@ sub ProcessMOV($$;$)
             if ($tagInfo and not $$tagInfo{Unknown} and not $eeTag) {
                 my $t = PrintableTagID($tag,2);
                 if ($size > 0x8000000) {
-                    $et->Warn("Skipping '${t}' atom > 128 MB", 1);
+                    $et->Warn("Skipping '${t}' atom > 128 MiB", 1);
                 } else {
-                    $et->Warn("Skipping '${t}' atom > 32 MB", 2) or $ignore = 0;
+                    $et->Warn("Skipping '${t}' atom > 32 MiB", 2) or $ignore = 0;
                 }
             }
         }

package/bin/lib/Image/ExifTool/README

@@ -616,9 +616,9 @@ numerical, and generated automatically otherwise.
                   arguments: the value, a flag which is set for the inverse
                   conversion, and a reference to the PrintConv hash, and returns
                   the converted value or undef on error -- it may call warn() to
-                  return an error message. The lookup hash may also contain a
+                  return an error message.  The lookup hash may also contain a
                   'Notes' entry which is used for documentation if the
-                  SeparateTable flag is set). In an expression, $self is a
+                  SeparateTable flag is set).  In an expression, $self is a
                   reference to the current ExifTool object, $val is the Raw
                   value, and $tag is the tag key.  The subroutine takes 2
                   arguments: the Raw value and a reference to the current
@@ -894,6 +894,11 @@ numerical, and generated automatically otherwise.
                   writing this tag.  Only needed if tag can be written to
                   groups other than the normal groups for this tag (very rare).
 
+  Deletable     : [Writable SubDirectory's only] Overrides internal test for
+                  metadata types with permanent directories (currently QuickTime
+                  and Jpeg2000), allowing the tag containing these directories
+                  to be deleted
+
   OffsetPair    : Used in EXIF table to specify the tagID for the corresponding
                   offset or length tag.
 

package/bin/lib/Image/ExifTool/RIFF.pm

@@ -30,7 +30,7 @@ use strict;
 use vars qw($VERSION $AUTOLOAD);
 use Image::ExifTool qw(:DataAccess :Utils);
 
-$VERSION = '1.66';
+$VERSION = '1.67';
 
 sub ConvertTimecode($);
 sub ProcessSGLT($$$);
@@ -500,6 +500,11 @@ my %code2charset = (
         Name => 'OldXMP',
         Binary => 1,
     },
+    C2PA => { #https://c2pa.org/specifications/
+        Name => 'JUMBF',
+        Deletable => 1,
+        SubDirectory => { TagTable => 'Image::ExifTool::Jpeg2000::Main' },
+    },
     olym => {
         Name => 'Olym',
         SubDirectory => { TagTable => 'Image::ExifTool::Olympus::WAV' },
@@ -1069,7 +1074,16 @@ my %code2charset = (
     },
     1 => {
         Name => 'MaxDataRate',
-        PrintConv => 'sprintf("%.4g kB/s",$val / 1024)',
+        Notes => q{
+            converted using SI byte prefixes unles the API ByteUnit option is set to
+            "Binary"
+        },
+        PrintConv => q{
+            my ($unit, $div) = $self->Options('ByteUnit') eq 'Binary' ? ('KiB/s',1024) : ('kB/s',1000);
+            my $tmp = $val / $div;
+            $tmp > 9999 and $tmp /= $div, $unit =~ s/^./M/;
+            sprintf('%.4g %s', $tmp, $unit);
+        },
     },
   # 2 => 'PaddingGranularity',
   # 3 => 'Flags',
@@ -1989,7 +2003,7 @@ sub ProcessRIFF($$)
 {
     my ($et, $dirInfo) = @_;
     my $raf = $$dirInfo{RAF};
-    my ($buff, $buf2, $type, $mime, $err, $rf64);
+    my ($buff, $buf2, $type, $mime, $err, $rf64, $moviEnd);
     my $verbose = $et->Options('Verbose');
     my $unknown = $et->Options('Unknown');
     my $validate = $et->Options('Validate');
@@ -2023,8 +2037,34 @@ sub ProcessRIFF($$)
 # Read chunks in RIFF image
 #
     for (;;) {
+        if ($err) {
+            last unless $moviEnd;
+            # we arrived here because there was a problem parsing the movie data
+            # so seek to the end to continue processing
+            if ($moviEnd > 0x7fffffff and not $et->Options('LargeFileSupport')) {
+                $et->Warn('Possibly corrupt LIST_movi data');
+                $et->Warn('Stopped parsing at large LIST_movi chunk (LargeFileSupport not set)');
+                undef $err;
+                last;
+            }
+            if ($validate) {
+                # (must actually try to read something after seeking to detect error)
+                $raf->Seek($moviEnd-1, 0) and $raf->Read($buff, 1) == 1 or last;
+            } else {
+                $raf->Seek($moviEnd, 0) or last;
+            }
+            $pos = $moviEnd;
+            $et->Warn('Possibly corrupt LIST_movi data');
+            undef $err;
+            undef $moviEnd;
+        }
+        if ($moviEnd) {
+            $pos > $moviEnd and $err = 1, next;     # error if we parsed past the end of the movie data
+            undef $moviEnd if $pos == $moviEnd;     # parsed all movie data?
+        }
         my $num = $raf->Read($buff, 8);
         if ($num < 8) {
+            $moviEnd and $err = 1, next;
             $err = 1 if $num;
             $et->Warn('Incorrect RIFF chunk size' . " $pos vs. $riffEnd") if $validate and $pos != $riffEnd;
             last;
@@ -2035,7 +2075,7 @@ sub ProcessRIFF($$)
         $et->OverrideFileType('Extended WEBP',undef,'webp') if $tag eq 'VP8X' and $type eq 'WEBP';
         # special case: construct new tag name from specific LIST type
         if ($tag eq 'LIST') {
-            $raf->Read($buff, 4) == 4 or $err=1, last;
+            $raf->Read($buff, 4) == 4 or $err=1, next;
             $pos += 4;
             $tag .= "_$buff";
             $len -= 4;  # already read 4 bytes (the LIST type)
@@ -2044,6 +2084,7 @@ sub ProcessRIFF($$)
         }
         $et->VPrint(0, "RIFF '${tag}' chunk ($len bytes of data):\n");
         if ($len <= 0) {
+            $moviEnd and $err = 1, next;
             if ($len < 0) {
                 $et->Warn('Invalid chunk length');
             } elsif ($tag eq "\0\0\0\0") {
@@ -2074,7 +2115,7 @@ sub ProcessRIFF($$)
         my $tagInfo = $$tagTbl{$tag};
         # (in LIST_movi chunk: ##db = uncompressed DIB, ##dc = compressed DIB, ##wb = audio data)
         if ($tagInfo or (($verbose or $unknown) and $tag !~ /^(data|idx1|LIST_movi|RIFF|\d{2}(db|dc|wb))$/)) {
-            $raf->Read($buff, $len2) == $len2 or $err=1, last;
+            $raf->Read($buff, $len2) == $len2 or $err=1, next;
             if ($hash and $isImageData{$tag}) {
                 $hash->add($buff);
                 $et->VPrint(0, "$$et{INDENT}(ImageDataHash: '${tag}' chunk, $len2 bytes)\n");
@@ -2100,7 +2141,7 @@ sub ProcessRIFF($$)
             $et->Warn('Incorrect RIFF chunk size') if $validate and $pos - 8 != $riffEnd;
             $riffEnd += $len2 + 8;
             # don't read into RIFF chunk (eg. concatenated video file)
-            $raf->Read($buff, 4) == 4 or $err=1, last;  # (skip RIFF type word)
+            $raf->Read($buff, 4) == 4 or $err=1, next;  # (skip RIFF type word)
             $pos += 4;
             # extract information from remaining file as an embedded file
             $$et{DOC_NUM} = ++$$et{DOC_COUNT};
@@ -2113,18 +2154,21 @@ sub ProcessRIFF($$)
                 $et->ImageDataHash($raf, $len2, "'${tag}' chunk");
             }
             if ($tag eq 'LIST_movi' and $ee) {
-                $raf->Seek($rewind, 0) or $err = 1, last if $rewind;
+                $raf->Seek($rewind, 0) or $err = 1, next if $rewind;
+                # save end-of-movie offset so we can seek there if we get errors parsing the movie data
+                $moviEnd = $raf->Tell() + $len2;
                 next; # parse into movi chunk
             } elsif (not $rewind) {
                 if ($len > 0x7fffffff and not $et->Options('LargeFileSupport')) {
+                    $tag =~ s/([\0-\x1f\x7f-\xff])/sprintf('\\x%.2x',ord $1)/eg;
                     $et->Warn("Stopped parsing at large $tag chunk (LargeFileSupport not set)");
                     last;
                 }
                 if ($validate and $len2) {
                     # (must actually try to read something after seeking to detect error)
-                    $raf->Seek($len2-1, 1) and $raf->Read($buff, 1) == 1 or $err = 1, last;
+                    $raf->Seek($len2-1, 1) and $raf->Read($buff, 1) == 1 or $err = 1, next;
                 } else {
-                    $raf->Seek($len2, 1) or $err=1, last;
+                    $raf->Seek($len2, 1) or $err=1, next;
                 }
             }
         }