exiftool-vendored.pl 12.55.0 → 12.60.0

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

@@ -47,7 +47,7 @@ use Image::ExifTool qw(:DataAccess :Utils);
 use Image::ExifTool::Exif;
 use Image::ExifTool::GPS;
 
-$VERSION = '2.83';
+$VERSION = '2.84';
 
 sub ProcessMOV($$;$);
 sub ProcessKeys($$$);
@@ -419,6 +419,18 @@ my %channelLabel = (
     0x1ffff => 'Discrete_65535',
 );
 
+my %qtFlags = ( #12
+    0 => 'undef',       22 => 'unsigned int',   71 => 'float[2] size',
+    1 => 'UTF-8',       23 => 'float',          72 => 'float[4] rect',
+    2 => 'UTF-16',      24 => 'double',         74 => 'int64s',
+    3 => 'ShiftJIS',    27 => 'BMP',            75 => 'int8u',
+    4 => 'UTF-8 sort',  28 => 'QT atom',        76 => 'int16u',
+    5 => 'UTF-16 sort', 65 => 'int8s',          77 => 'int32u',
+    13 => 'JPEG',       66 => 'int16s',         78 => 'int64u',
+    14 => 'PNG',        67 => 'int32s',         79 => 'double[3][3]',
+    21 => 'signed int', 70 => 'float[2] point',
+);
+
 # properties which don't get inherited from the parent
 my %dontInherit = (
     ispe => 1,  # size of parent may be different
@@ -435,15 +447,16 @@ my %dupDirOK = ( ipco => 1, '----' => 1 );
 my %eeStd = ( stco => 'stbl', co64 => 'stbl', stsz => 'stbl', stz2 => 'stbl',
               stsc => 'stbl', stts => 'stbl' );
 
+# atoms required for generating ImageDataMD5
+my %md5Box = ( vide => { %eeStd }, soun => { %eeStd } );
+
 # boxes and their containers for the various handler types that we want to save
 # when the ExtractEmbedded is enabled (currently only the 'gps ' container name is
 # used, but others have been checked against all available sample files and may be
 # useful in the future if the names are used for different boxes on other locations)
 my %eeBox = (
     # (note: vide is only processed if specific atoms exist in the VideoSampleDesc)
-    vide => { %eeStd,
-        JPEG => 'stsd',
-    },
+    vide => { %eeStd, JPEG => 'stsd' },
     text => { %eeStd },
     meta => { %eeStd },
     sbtl => { %eeStd },
@@ -1159,7 +1172,10 @@ my %eeBox2 = (
         },
         {
             Name => 'GarminGPS',
-            Condition => '$$valPt=~/^\x9b\x63\x0f\x8d\x63\x74\x40\xec\x82\x04\xbc\x5f\xf5\x09\x17\x28/ and $$self{OPTIONS}{ExtractEmbedded}',
+            Condition => q{
+                $$valPt=~/^\x9b\x63\x0f\x8d\x63\x74\x40\xec\x82\x04\xbc\x5f\xf5\x09\x17\x28/ and
+                $$self{OPTIONS}{ExtractEmbedded}
+            },
             SubDirectory => {
                 TagTable => 'Image::ExifTool::QuickTime::Stream',
                 ProcessProc => \&ProcessGarminGPS,
@@ -1961,7 +1977,7 @@ my %eeBox2 = (
             Name => 'SanyoMOV',
             Condition => q{
                 $$valPt =~ /^SANYO DIGITAL CAMERA\0/ and
-                $self->{VALUE}->{FileType} eq "MOV"
+                $$self{FileType} eq "MOV"
             },
             SubDirectory => {
                 TagTable => 'Image::ExifTool::Sanyo::MOV',
@@ -1972,7 +1988,7 @@ my %eeBox2 = (
             Name => 'SanyoMP4',
             Condition => q{
                 $$valPt =~ /^SANYO DIGITAL CAMERA\0/ and
-                $self->{VALUE}->{FileType} eq "MP4"
+                $$self{FileType} eq "MP4"
             },
             SubDirectory => {
                 TagTable => 'Image::ExifTool::Sanyo::MP4',
@@ -7146,7 +7162,7 @@ my %eeBox2 = (
             $$self{AudioFormat} = $val;
             return undef unless $val =~ /^[\w ]{4}$/i;
             # check for protected audio format
-            $self->OverrideFileType('M4P') if $val eq 'drms' and $$self{VALUE}{FileType} eq 'M4A';
+            $self->OverrideFileType('M4P') if $val eq 'drms' and $$self{FileType} eq 'M4A';
             return $val;
         },
         # see this link for print conversions (not complete):
@@ -8768,6 +8784,16 @@ sub HandleItemInfo($)
                     $et->VPrint(0, "$$et{INDENT}    [snip $snip bytes]\n") if $snip;
                 }
             }
+            # do MD5 checksum of AVIF "av01" image data
+            if ($type eq 'av01' and $$et{ImageDataMD5}) {
+                my $md5 = $$et{ImageDataMD5};
+                my $tot = 0;
+                foreach $extent (@{$$item{Extents}}) {
+                    $raf->Seek($$extent[1] + $base, 0) or $et->Warn('Seek error in av01 image data'), last;
+                    $tot += $et->ImageDataMD5($raf, $$extent[2], 'av01 image', 1);
+                }
+                $et->VPrint(0, "$$et{INDENT}(ImageDataMD5: $tot bytes of av01 data)\n") if $tot;
+            }
             next unless $name;
             # assemble the data for this item
             undef $buff;
@@ -9270,7 +9296,8 @@ sub ProcessMOV($$;$)
     $$raf{NoBuffer} = 1 if $fast;   # disable buffering in FastScan mode
 
     my $ee = $$et{OPTIONS}{ExtractEmbedded};
-    if ($ee) {
+    my $md5 = $$et{ImageDataMD5};
+    if ($ee or $md5) {
         $unkOpt = $$et{OPTIONS}{Unknown};
         require 'Image/ExifTool/QuickTimeStream.pl';
     }
@@ -9352,7 +9379,7 @@ sub ProcessMOV($$;$)
         # set flag to store additional information for ExtractEmbedded option
         my $handlerType = $$et{HandlerType};
         if ($eeBox{$handlerType} and $eeBox{$handlerType}{$tag}) {
-            if ($ee) {
+            if ($ee or $md5) {
                 # (there is another 'gps ' box with a track log that doesn't contain offsets)
                 if ($tag ne 'gps ' or $eeBox{$handlerType}{$tag} eq $dirID) {
                     $eeTag = 1;
@@ -9364,6 +9391,9 @@ sub ProcessMOV($$;$)
         } elsif ($ee and $ee > 1 and $eeBox2{$handlerType} and $eeBox2{$handlerType}{$tag}) {
             $eeTag = 1;
             $$et{OPTIONS}{Unknown} = 1;
+        } elsif ($md5 and $md5Box{$handlerType} and $md5Box{$handlerType}{$tag}) {
+            $eeTag = 1;
+            $$et{OPTIONS}{Unknown} = 1;
         }
         my $tagInfo = $et->GetTagInfo($tagTablePtr, $tag);
 
@@ -9596,7 +9626,7 @@ ItemID:         foreach $id (keys %$items) {
                     }
                     if ($tag eq 'stbl') {
                         # process sample data when exiting SampleTable box if extracting embedded
-                        ProcessSamples($et) if $ee;
+                        ProcessSamples($et) if $ee or $md5;
                     } elsif ($tag eq 'minf') {
                         $$et{HandlerType} = ''; # reset handler type at end of media info box
                     }
@@ -9656,6 +9686,7 @@ ItemID:         foreach $id (keys %$items) {
                             }
                         }
                         $langInfo or $langInfo = $tagInfo;
+                        my $str = $qtFlags{$flags} ? " ($qtFlags{$flags})" : '';
                         $et->VerboseInfo($tag, $langInfo,
                             Value   => ref $value ? $$value : $value,
                             DataPt  => \$val,
@@ -9664,7 +9695,7 @@ ItemID:         foreach $id (keys %$items) {
                             Size    => $len,
                             Format  => $format,
                             Index   => $index,
-                            Extra   => sprintf(", Type='${type}', Flags=0x%x, Lang=0x%.4x",$flags,$lang),
+                            Extra   => sprintf(", Type='${type}', Flags=0x%x%s, Lang=0x%.4x",$flags,$str,$lang),
                         ) if $verbose;
                         # use "Keys" in path instead of ItemList if this was defined by a Keys tag
                         my $isKey = $$tagInfo{Groups} && $$tagInfo{Groups}{1} && $$tagInfo{Groups}{1} eq 'Keys';
@@ -9793,7 +9824,7 @@ ItemID:         foreach $id (keys %$items) {
         ++$index if defined $index;
     }
     # tweak file type based on track content ("iso*" and "dash" ftyp only)
-    if ($topLevel and $$et{VALUE}{FileType} and $$et{VALUE}{FileType} eq 'MP4' and
+    if ($topLevel and $$et{FileType} and $$et{FileType} eq 'MP4' and
         $$et{save_ftyp} and $$et{HasHandler} and $$et{save_ftyp} =~ /^(iso|dash)/ and
         $$et{HasHandler}{soun} and not $$et{HasHandler}{vide})
     {

package/bin/lib/Image/ExifTool/QuickTimeStream.pl

@@ -81,12 +81,15 @@ my %processByMetaFormat = (
     ctbx => 1,  # ('marl' in GM videos)
 );
 
-# data lengths for each INSV record type
+# data lengths for each INSV/INSP record type
 my %insvDataLen = (
+    0x200 => 0,     # PreivewImage (any size) (a duplicate of PreviewImage in APP2 of INSP files)
     0x300 => 0,     # accelerometer (could be either 20 or 56 bytes)
     0x400 => 16,    # exposure (ref 6)
     0x600 => 8,     # timestamps (ref 6)
     0x700 => 53,    # GPS
+  # 0x900 => 48,    # ? (Insta360 X3)
+  # 0xb00 => 10,    # ? (Insta360 X3)
 );
 
 # limit the default amount of data we read for some record types
@@ -596,6 +599,8 @@ my %insvLimit = (
     0x1a => 'Firmware',
     0x2a => {
         Name => 'Parameters',
+        # (see https://exiftool.org/forum/index.php?msg=78942)
+        Notes => 'number of lenses, 6-axis orientation of each lens, raw resolution',
         ValueConv => '$val =~ tr/_/ /; $val',
     },
 );
@@ -1122,23 +1127,37 @@ sub Process_text($$$;$)
 # Inputs: 0) ExifTool ref
 # Notes: Also accesses ExifTool RAF*, SET_GROUP1, HandlerType, MetaFormat,
 #        ee*, and avcC elements (* = must exist)
+# - may be called either due to ExtractEmbedded option, or ImageDataMD5 requested
+# - MD5 includes only video and audio data
 sub ProcessSamples($)
 {
     my $et = shift;
     my ($raf, $ee) = @$et{qw(RAF ee)};
-    my ($i, $buff, $pos, $hdrLen, $hdrFmt, @time, @dur, $oldIndent);
+    my ($i, $buff, $pos, $hdrLen, $hdrFmt, @time, @dur, $oldIndent, $md5);
 
     return unless $ee;
     delete $$et{ee};    # use only once
 
-    # only process specific types of video streams
+    my $eeOpt = $et->Options('ExtractEmbedded');
     my $type = $$et{HandlerType} || '';
     if ($type eq 'vide') {
-        if    ($$ee{avcC}) { $type = 'avcC' }
-        elsif ($$ee{JPEG}) { $type = 'JPEG' }
-        else { return }
+        # only process specific types of video streams
+        $md5 = $$et{ImageDataMD5};
+        # only process specific video types if ExtractEmbedded was used
+        # (otherwise we are only here to calculate the audio/video MD5)
+        if ($eeOpt) {
+            if    ($$ee{avcC}) { $type = 'avcC' }
+            elsif ($$ee{JPEG}) { $type = 'JPEG' }
+            else { return unless $md5 }
+        }
+    } elsif ($type eq 'soun') {
+        $md5 = $$et{ImageDataMD5};
+        return unless $md5;
+    } else {
+        return unless $eeOpt;   # (don't do MD5 on other types)
     }
 
+    my $md5size = 0;
     my ($start, $size) = @$ee{qw(start size)};
 #
 # determine sample start offsets from chunk offsets (stco) and sample-to-chunk table (stsc),
@@ -1157,13 +1176,16 @@ sub ProcessSamples($)
             $timeDelta = shift @$stts;
         }
         my $ts = $$et{MediaTS} || 1;
+        my @chunkSize;  # total size of each chunk
         foreach $chunkStart (@$stco) {
             if ($iChunk >= $nextChunk and @$stsc) {
                 ($startChunk, $samplesPerChunk, $descIdx) = @{shift @$stsc};
                 $nextChunk = $$stsc[0][0] if @$stsc;
             }
             @$size < @$start + $samplesPerChunk and $et->WarnOnce('Sample size error'), last;
+            last unless defined $chunkStart and length $chunkStart;
             my $sampleStart = $chunkStart;
+            my $chunkSize = 0;
 Sample:     for ($i=0; ; ) {
                 push @$start, $sampleStart;
                 if (defined $time) {
@@ -1181,12 +1203,19 @@ Sample:     for ($i=0; ; ) {
                     --$timeCount;
                 }
                 # (eventually should use the description indices: $descIdx)
+                $chunkSize += $$size[$#$start];
                 last if ++$i >= $samplesPerChunk;
                 $sampleStart += $$size[$#$start];
             }
+            push @chunkSize, $chunkSize;
             ++$iChunk;
         }
         @$start == @$size or $et->WarnOnce('Incorrect sample start/size count'), return;
+        # process as chunks if we are only interested in calculating MD5
+        if ($type eq 'soun' or $type eq 'vide') {
+            $start = $stco;
+            $size = \@chunkSize;
+        }
     }
 #
 # extract and parse the sample data
@@ -1218,6 +1247,10 @@ Sample:     for ($i=0; ; ) {
         my $size = $$size[$i];
         next unless $raf->Seek($$start[$i], 0) and $raf->Read($buff, $size) == $size;
 
+        if ($md5) {
+            $md5->add($buff);
+            $md5size += length $buff;
+        }
         if ($type eq 'avcC') {
             next if length($buff) <= $hdrLen;
             # scan through all NAL units and send them to ParseH264Video()
@@ -1344,6 +1377,8 @@ Sample:     for ($i=0; ; ) {
         SetGPSDateTime($et, $tagTbl, $time[$i]) if $$et{FoundGPSLatitude} and not $$et{FoundGPSDateTime};
     }
     if ($verbose) {
+        my $str = $type eq 'soun' ? 'Audio' : 'Video';
+        $et->VPrint(0, "$$et{INDENT}(ImageDataMD5: $md5size bytes of $str data)\n") if $md5size;
         $$et{INDENT} = $oldIndent;
         $et->VPrint(0, "--------------------------\n");
     }
@@ -1485,7 +1520,7 @@ sub ProcessFreeGPS($$$)
             # Kenwood dashcam sometimes stores absolute year and local time
             # (but sometimes year since 2000 and UTC time in same video!)
             require Time::Local;
-            my $time = Image::ExifTool::TimeLocal($sec,$min,$hr,$day,$mon-1,$yr-1900);
+            my $time = Image::ExifTool::TimeLocal($sec,$min,$hr,$day,$mon-1,$yr);
             ($sec,$min,$hr,$day,$mon,$yr) = gmtime($time);
             $yr += 1900;
             ++$mon;
@@ -2758,7 +2793,6 @@ sub ProcessInsta360($;$)
         my ($id, $len) = unpack('vV', $buff);
         ($epos -= $len) + $trailerLen < 0 and last;
         $raf->Seek($epos, 2) or last;
-        my $dlen = $insvDataLen{$id};
         if ($verbose) {
             $et->VPrint(0, sprintf("Insta360 Record 0x%x (offset 0x%x, %d bytes):\n", $id, $fileEnd + $epos, $len));
         }
@@ -2771,20 +2805,25 @@ sub ProcessInsta360($;$)
         # 2. 20 byte records
         # 0000: c1 d8 d9 0b 00 00 00 00 f5 83 14 80 df 7f fe 7f [................]
         # 0010: fe 7f 01 80
-        if ($id == 0x300) {
-            if ($len % 20 and not $len % 56) {
-                $dlen = 56;
-            } elsif ($len % 56 and not $len % 20) {
-                $dlen = 20;
-            } else {
-                if ($raf->Read($buff, 20) == 20) {
-                    if (substr($buff, 16, 3) eq "\0\0\0") {
-                        $dlen = 56;
-                    } else {
-                        $dlen = 20;
+        my $dlen = $insvDataLen{$id};
+        if (defined $dlen and not $dlen) {
+            if ($id == 0x300) {
+                if ($len % 20 and not $len % 56) {
+                    $dlen = 56;
+                } elsif ($len % 56 and not $len % 20) {
+                    $dlen = 20;
+                } else {
+                    if ($raf->Read($buff, 20) == 20) {
+                        if (substr($buff, 16, 3) eq "\0\0\0") {
+                            $dlen = 56;
+                        } else {
+                            $dlen = 20;
+                        }
                     }
+                    $raf->Seek($epos, 2) or last;
                 }
-                $raf->Seek($epos, 2) or last;
+            } elsif ($id == 0x200) {
+                $dlen = $len;
             }
         }
         # limit the number of records we read if necessary
@@ -2798,6 +2837,8 @@ sub ProcessInsta360($;$)
         if ($dlen) {
             if ($len % $dlen) {
                 $et->Warn(sprintf('Unexpected Insta360 record 0x%x length',$id));
+            } elsif ($id == 0x200) {
+                $et->FoundTag(PreviewImage => $buff);
             } elsif ($id == 0x300) {
                 for ($p=0; $p<$len; $p+=$dlen) {
                     $$et{DOC_NUM} = ++$$et{DOC_COUNT};
@@ -2915,6 +2956,7 @@ sub ProcessGarminGPS($$$)
     my $epoch = (66 * 365 + 17) * 24 * 3600; # time is relative to Jan 1, 1904
     my $scl = 180 / (32768 * 65536);         # scaling factor for lat/lon
     $et->VerboseDir('GarminGPS');
+    $$et{SET_GROUP1} = 'Garmin';
     while ($pos + 20 <= $dataLen) {
         $$et{DOC_NUM} = ++$$et{DOC_COUNT};
         my $time = Image::ExifTool::ConvertUnixTime(Get32u($dataPt, $pos) - $epoch) . 'Z';
@@ -2929,6 +2971,7 @@ sub ProcessGarminGPS($$$)
         $pos += 20;
     }
     delete $$et{DOC_NUM};
+    delete $$et{SET_GROUP1};
     return 1;
 }
 

package/bin/lib/Image/ExifTool/README

@@ -249,6 +249,13 @@ key:
                   within this atom.  Currently used only for Canon CNTH atom,
                   which contains garbage after the first contained atom.
 
+    NIKON_OFFSETS [Nikon Encrypted tables only] Pointer to int32u NumberOffsets
+                  for offset-type encrypted Nikon directories.  When set,
+                  directory and decryption lengths are calculated automatically.
+
+    ALLOW_REPROCESS Flag to allow reprocessing of another directory at this
+                  same location in the file, bypassing recursion avoidance test.
+
   DATAMEMBER : BinaryData tables only.  A reference to a list of sorted tag ID's
   which must be extracted as data members when writing.  Must also list "var_"
   format tags and tags with Hook so offsets are properly calculated if the table
@@ -404,6 +411,10 @@ numerical, and generated automatically otherwise.
 
                   'IsComposite' - flag set for Composite tags
 
+                  'IsImageData' - flag set if this is an image data offset to
+                  be included in ImageDataMD5 calculation.  Must have an
+                  OffsetPair entry which is the ID of the corresponding size.
+
                   'IsOffset' - flag set if the tag represents an offset to some
                   data, and causes value will be adjusted to an absolute file
                   offset.  If set to 2, the offset base of the parent directory
@@ -465,6 +476,10 @@ numerical, and generated automatically otherwise.
                   documentation, padded to the number of digits given by the
                   PrintHex value.
 
+                  'PrintInt' - remove decimal part of tag ID in HTML tag name
+                  documentation.  (To avoid confusing ExifTool users because
+                  the LensType decimal numbers are for internal use only.)
+
                   'PrintSort' - causes PrintConv values to be sorted by value
                   rather than key in the HTML tag name documentation.
 
@@ -713,7 +728,7 @@ numerical, and generated automatically otherwise.
                   BitShift are applied before evaluating RawConv.
 
   BitShift      : [Mask tags only] Bit shift for Mask-ed values.  If not
-                  specified, set to the number of trailing bits in the Mask.
+                  specified, set to the number of trailing zero bits in Mask.
                   When reading, the value is shifted right by this number of
                   bits after the Mask is applied.
 
@@ -1003,7 +1018,9 @@ numerical, and generated automatically otherwise.
                   current Base.  This is a Perl expression which may use
                   $valuePtr to represent the location of the tag value in the
                   file, or $val for the value itself.  If not specified, a Start
-                  of '$valuePtr' is assumed.
+                  of '$valuePtr' is assumed.  Subdirectories in BinaryData may
+                  also use $dirStart to represent the offset of the current
+                  directory start relative to the start of the data block.
 
      OffsetPt   : [EXIF directories only] If specified, this is a Perl
                   expression that gives the position of a 32-bit word in the

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.61';
+$VERSION = '1.64';
 
 sub ConvertTimecode($);
 sub ProcessSGLT($$$);
@@ -38,6 +38,13 @@ sub ProcessSLLT($$$);
 sub ProcessLucas($$$);
 sub WriteRIFF($$);
 
+# RIFF chunks containing image data (to include in ImageDataMD5 digest)
+my %isImageData = (
+    LIST_movi => 1, # (AVI: contains ##db, ##dc, ##wb)
+    data => 1,      # (WAV)
+    'VP8 '=>1, VP8L=>1, ANIM=>1, ANMF=>1, ALPH=>1, # (WebP)
+);
+
 # recognized RIFF variants
 my %riffType = (
     'WAVE' => 'WAV', 'AVI ' => 'AVI', 'WEBP' => 'WEBP',
@@ -1522,7 +1529,7 @@ my %code2charset = (
         },
         # (can't calculate duration like this for compressed audio types)
         RawConv => q{
-            return undef if $$self{VALUE}{FileType} =~ /^(LA|OFR|PAC|WV)$/;
+            return undef if $$self{FileType} =~ /^(LA|OFR|PAC|WV)$/;
             return(($val[0] and not ($val[2] or $val[3])) ? $val[1] / $val[0] : undef);
         },
         PrintConv => 'ConvertDuration($val)',
@@ -1980,6 +1987,7 @@ sub ProcessRIFF($$)
     my $unknown = $et->Options('Unknown');
     my $validate = $et->Options('Validate');
     my $ee = $et->Options('ExtractEmbedded');
+    my $md5 = $$et{ImageDataMD5};
 
     # verify this is a valid RIFF file
     return 0 unless $raf->Read($buff, 12) == 12;
@@ -1996,7 +2004,7 @@ sub ProcessRIFF($$)
     $$raf{NoBuffer} = 1 if $et->Options('FastScan'); # disable buffering in FastScan mode
     $mime = $riffMimeType{$type} if $type;
     $et->SetFileType($type, $mime);
-    $$et{VALUE}{FileType} .= ' (RF64)' if $rf64;
+    $$et{VALUE}{FileType} .= ' (RF64)' if $rf64 and $$et{VALUE}{FileType};
     $$et{RIFFStreamType} = '';      # initialize stream type
     $$et{RIFFStreamCodec} = [];     # initialize codec array
     SetByteOrder('II');
@@ -2059,6 +2067,10 @@ sub ProcessRIFF($$)
         # (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;
+            if ($md5 and $isImageData{$tag}) {
+                $md5->add($buff);
+                $et->VPrint(0, "$$et{INDENT}(ImageDataMD5: '${tag}' chunk, $len2 bytes)\n");
+            }
             my $setGroups;
             if ($tagInfo and ref $tagInfo eq 'HASH' and $$tagInfo{SetGroups}) {
                 $setGroups = $$et{SET_GROUP0} = $$et{SET_GROUP1} = $$tagInfo{SetGroups};
@@ -2085,18 +2097,27 @@ sub ProcessRIFF($$)
             # extract information from remaining file as an embedded file
             $$et{DOC_NUM} = ++$$et{DOC_COUNT};
             next; # (must not increment $pos)
-        } elsif ($tag eq 'LIST_movi' and $ee) {
-            next; # parse into movi chunk
         } else {
-            if ($len > 0x7fffffff and not $et->Options('LargeFileSupport')) {
-                $et->Warn("Stopped parsing at large $tag chunk (LargeFileSupport not set)");
-                last;
+            my $rewind;
+            # do MD5 if required
+            if ($md5 and $isImageData{$tag}) {
+                $rewind = $raf->Tell();
+                $et->ImageDataMD5($raf, $len2, "'${tag}' chunk");
             }
-            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;
-            } else {
-                $raf->Seek($len2, 1) or $err=1, last;
+            if ($tag eq 'LIST_movi' and $ee) {
+                $raf->Seek($rewind, 0) or $err = 1, last if $rewind;
+                next; # parse into movi chunk
+            } elsif (not $rewind) {
+                if ($len > 0x7fffffff and not $et->Options('LargeFileSupport')) {
+                    $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;
+                } else {
+                    $raf->Seek($len2, 1) or $err=1, last;
+                }
             }
         }
         $pos += $len2;

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

@@ -14,7 +14,7 @@ use strict;
 use vars qw($VERSION);
 use Image::ExifTool qw(:DataAccess :Utils);
 
-$VERSION = '1.05';
+$VERSION = '1.06';
 
 # currently support this version Rawzor images
 my $implementedRawzorVersion = 199; # (up to version 1.99)
@@ -138,7 +138,7 @@ sub ProcessRWZ($$)
     }
     # set OriginalFileType from FileType of original file
     # then change FileType and MIMEType to indicate a Rawzor image
-    my $origFileType = $$et{VALUE}{FileType};
+    my $origFileType = $$et{FileType};
     if ($origFileType) {
         $et->HandleTag($tagTablePtr, OriginalFileType => $origFileType);
         $et->OverrideFileType('RWZ');

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

@@ -16,7 +16,7 @@ use vars qw($VERSION);
 use Image::ExifTool qw(:DataAccess :Utils);
 use Image::ExifTool::Canon;
 
-$VERSION = '1.06';
+$VERSION = '1.07';
 
 sub ProcessRealMeta($$$);
 sub ProcessRealProperties($$$);
@@ -608,7 +608,7 @@ sub ProcessReal($$)
         } else {
             last if $tag eq 'DATA'; # stop normal parsing at DATA tag
         }
-        if ($size & 0x80000000) {
+        if ($size & 0x80000000 or $size < 10) {
             $et->Warn('Bad chunk header');
             last;
         }

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

@@ -19,7 +19,7 @@ use vars qw($VERSION);
 use Image::ExifTool qw(:DataAccess :Utils);
 use Image::ExifTool::Exif;
 
-$VERSION = '1.35';
+$VERSION = '1.36';
 
 sub ProcessRicohText($$$);
 sub ProcessRicohRMETA($$$);
@@ -949,6 +949,7 @@ sub ProcessRicohText($$$)
 
     my $data = substr($$dataPt, $dirStart, $dirLen);
     return 1 if $data =~ /^\0/;     # blank Ricoh maker notes
+    $et->VerboseDir('RicohText', undef, $dirLen);
     # validate text maker notes
     unless ($data =~ /^(Rev|Rv)/) {
         $et->Warn('Bad Ricoh maker notes');

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

@@ -19,15 +19,13 @@ use strict;
 use vars qw($VERSION %sigmaLensTypes);
 use Image::ExifTool::Exif;
 
-$VERSION = '1.32';
+$VERSION = '1.34';
 
 # sigma LensType lookup (ref IB)
 %sigmaLensTypes = (
     Notes => q{
         Sigma LensType values are hexadecimal numbers stored as a string (without
-        the leading "0x").  Decimal values have been added to differentiate lenses
-        which would otherwise have the same LensType, and are used by the Composite
-        LensID tag when attempting to identify the specific lens model.
+        the leading "0x").
     },
     # 0x0 => 'Sigma 50mm F2.8 EX Macro', (0x0 used for other lenses too)
     # 0x8 - 18-125mm LENSARANGE@18mm=22-4
@@ -255,6 +253,7 @@ $VERSION = '1.32';
     0x6023 => 'Sigma 20mm F2 DG DN | C', #IB
     0x6025 => 'Sigma 20mm F1.4 DG DN | A', #IB
     0x6026 => 'Sigma 24mm F1.4 DG DN | A', #IB
+    0x602c => "Sigma 50mm F1.4 DG DN | A (2023)", #IB
     0x8005 => 'Sigma 35mm F1.4 DG HSM | A', #PH (012)
     0x8009 => 'Sigma 18-35mm F1.8 DC HSM | A', #PH
     0x8900 => 'Sigma 70-300mm F4-5.6 DG OS', #PH (SD15)
@@ -556,6 +555,7 @@ $VERSION = '1.32';
         SeparateTable => 'LensType',
         PrintHex => 1,
         PrintConv => \%sigmaLensTypes,
+        PrintInt => 1,
     },{ #PH
         Name => 'LensType',
         Condition => '$$self{MakerNoteSigmaVer} >= 3',
@@ -564,6 +564,7 @@ $VERSION = '1.32';
         SeparateTable => 'LensType',
         PrintHex => 1,
         PrintConv => \%sigmaLensTypes,
+        PrintInt => 1,
     }],
     0x002a => { #PH
         Name => 'LensFocalRange',

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

@@ -16,7 +16,7 @@ use vars qw($VERSION);
 use Image::ExifTool qw(:DataAccess :Utils);
 use Image::ExifTool::Sigma;
 
-$VERSION = '1.29';
+$VERSION = '1.30';
 
 sub ProcessX3FHeader($$$);
 sub ProcessX3FDirectory($$$);
@@ -545,10 +545,16 @@ sub ProcessX3FDirectory($$$)
         if  ($$tagInfo{Name} eq 'PreviewImage') {
             # check image header to see if this is a JPEG preview image
             $raf->Read($buff, 28) == 28 or return 'Error reading PreviewImage header';
-            # ignore all image data but JPEG compressed (version 2.0, type 2, format 18)
-            next unless $buff =~ /^SECi\0\0\x02\0\x02\0\0\0\x12\0\0\0/;
             $offset += 28;
             $len -= 28;
+            # ignore all image data but JPEG compressed (version 2.0, type 2, format 18)
+            unless ($buff =~ /^SECi\0\0\x02\0\x02\0\0\0\x12\0\0\0/) {
+                # do MD5 on non-preview data if requested
+                if ($$et{ImageDataMD5} and substr($buff,8,1) ne "\x02") {
+                    $et->ImageDataMD5($raf, $len, 'SigmaRaw IMAG');
+                }
+                next;
+            }
             $raf->Read($buff, $len) == $len or return "Error reading PreviewImage data";
             # check fore EXIF segment, and extract this image as the JpgFromRaw
             if ($buff =~ /^\xff\xd8\xff\xe1/) {