exiftool_vendored 13.30.0 → 13.33.0

data/bin/lib/Image/ExifTool/Writer.pl

@@ -1907,7 +1907,7 @@ sub RestoreNewValues($)
 #------------------------------------------------------------------------------
 # Set alternate file for extracting information
 # Inputs: 0) ExifTool ref, 1) family 8 group name (of the form "File#" where # is any number)
-#         2) alternate file name, or undef to reset
+#         2) alternate file name (may contain tag names with leading "$"), or undef to reset
 # Returns: 1 on success, or 0 on invalid group name
 sub SetAlternateFile($$$)
 {
@@ -1917,7 +1917,9 @@ sub SetAlternateFile($$$)
     # keep the same file if already initialized (possibly has metadata extracted)
     if (not defined $file) {
         delete $$self{ALT_EXIFTOOL}{$g8};
-    } elsif (not ($$self{ALT_EXIFTOOL}{$g8} and $$self{ALT_EXIFTOOL}{$g8}{ALT_FILE} eq $file)) {
+    } elsif (not ($$self{ALT_EXIFTOOL}{$g8} and $file !~ /\$/ and
+        $$self{ALT_EXIFTOOL}{$g8}{ALT_FILE} eq $file))
+    {
         my $altExifTool = Image::ExifTool->new;
         $$altExifTool{ALT_FILE} = $file;
         $$self{ALT_EXIFTOOL}{$g8} = $altExifTool;
@@ -3201,7 +3203,7 @@ sub InsertTagValues($$;$$$$)
     my ($docNum, $tag);
 
     if ($docGrp) {
-        $docNum = $docGrp =~ /(\d+)$/ ? $1 : 0;
+        $docNum = $docGrp =~ /(\d+(-\d+)*)$/ ? $1 : 0;
     } else {
         undef $cache;   # no cache if no document groups
     }
@@ -3269,25 +3271,25 @@ sub InsertTagValues($$;$$$$)
                 # (similar to code in BuildCompositeTags(), but this is case-insensitive)
                 my $cacheTag = $$cache{$lcTag};
                 unless ($cacheTag) {
-                    $cacheTag = $$cache{$lcTag} = [ ];
+                    $cacheTag = $$cache{$lcTag} = { };
                     # find all matching keys, organize into groups, and store in cache
                     my $ex = $$self{TAG_EXTRA};
                     my @matches = grep /^$tag(\s|$)/i, @$foundTags;
                     @matches = $self->GroupMatches($group, \@matches) if defined $group;
                     foreach (@matches) {
                         my $doc = $$ex{$_}{G3} || 0;
-                        if (defined $$cacheTag[$doc]) {
-                            next unless $$cacheTag[$doc] =~ / \((\d+)\)$/;
+                        if (defined $$cacheTag{$doc}) {
+                            next unless $$cacheTag{$doc} =~ / \((\d+)\)$/;
                             my $cur = $1;
                             # keep the most recently extracted tag
                             next if / \((\d+)\)$/ and $1 < $cur;
                         }
-                        $$cacheTag[$doc] = $_;
+                        $$cacheTag{$doc} = $_;
                     }
                 }
-                my $doc = $lcTag =~ /\b(main|doc(\d+)):/ ? ($2 || 0) : $docNum;
-                if ($$cacheTag[$doc]) {
-                    $tag = $$cacheTag[$doc];
+                my $doc = $lcTag =~ /\b(main|doc(\d+(-\d+)*)):/ ? ($2 || 0) : $docNum;
+                if ($$cacheTag{$doc}) {
+                    $tag = $$cacheTag{$doc};
                     $val = $self->GetValue($tag, $type);
                 }
             } else {
@@ -4741,10 +4743,11 @@ sub DumpUnknownTrailer($$)
     my $pos = $$dirInfo{DataPos};
     my $endPos = $pos + $$dirInfo{DirLen};
     # account for preview/MPF image trailer
-    my $prePos = $$self{VALUE}{PreviewImageStart} || $$self{PreviewImageStart};
-    my $preLen = $$self{VALUE}{PreviewImageLength} || $$self{PreviewImageLength};
-    my $hidPos = $$self{VALUE}{HiddenDataOffset};
-    my $hidLen = $$self{VALUE}{HiddenDataLength};
+    my $value = $$self{VALUE};
+    my $prePos = $$value{PreviewImageStart} || $$self{PreviewImageStart};
+    my $preLen = $$value{PreviewImageLength} || $$self{PreviewImageLength};
+    my $hidPos = $$value{HiddenDataOffset};
+    my $hidLen = $$value{HiddenDataLength};
     my $tag = 'PreviewImage';
     my $mpImageNum = 0;
     my (%image, $lastOne);
@@ -4761,12 +4764,12 @@ sub DumpUnknownTrailer($$)
         last if $lastOne;   # checked all images
         # look for MPF images (in the proper order)
         ++$mpImageNum;
-        $prePos = $$self{VALUE}{"MPImageStart ($mpImageNum)"};
+        $prePos = $$value{"MPImageStart ($mpImageNum)"};
         if (defined $prePos) {
-            $preLen = $$self{VALUE}{"MPImageLength ($mpImageNum)"};
+            $preLen = $$value{"MPImageLength ($mpImageNum)"};
         } else {
-            $prePos = $$self{VALUE}{'MPImageStart'};
-            $preLen = $$self{VALUE}{'MPImageLength'};
+            $prePos = $$value{MPImageStart};
+            $preLen = $$value{MPImageLength};
             $lastOne = 1;
         }
         $tag = "MPImage$mpImageNum";
@@ -5887,10 +5890,10 @@ sub WriteJPEG($$)
                         $writeBuffer = '';
                         $oldOutfile = $outfile;
                         $outfile = \$writeBuffer;
-                        # account for segment, EXIF and TIFF headers
-                        $$self{PREVIEW_INFO}{Fixup}{Start} += 18 if $$self{PREVIEW_INFO};
-                        $$self{LeicaTrailer}{Fixup}{Start} += 18 if $$self{LeicaTrailer};
-                        $$self{HiddenData}{Fixup}{Start} += 18 if $$self{HiddenData};
+                        # must account for segment, EXIF and TIFF headers
+                        foreach (qw(PREVIEW_INFO LeicaTrailer HiddenData)) {
+                            $$self{$_}{Fixup}{Start} += 18 if $$self{$_};
+                        }
                     }
                     # write as multi-segment
                     my $n = WriteMultiSegment($outfile, 0xe1, $exifAPP1hdr, \$buff, 'EXIF');
@@ -6036,8 +6039,8 @@ sub WriteJPEG($$)
             my $delPreview = $$self{DEL_PREVIEW};
             $trailInfo = $self->IdentifyTrailer($raf) unless $$delGroup{Trailer};
             my $nvTrail = $self->GetNewValueHash($Image::ExifTool::Extra{Trailer});
-            unless ($oldOutfile or $delPreview or $trailInfo or $$delGroup{Trailer} or $nvTrail or
-                $$self{HiddenData})
+            unless ($oldOutfile or $delPreview or $trailInfo or $$delGroup{Trailer} or
+                $nvTrail or $$self{HiddenData})
             {
                 # blindly copy the rest of the file
                 while ($raf->Read($buff, 65536)) {
@@ -6082,35 +6085,7 @@ sub WriteJPEG($$)
                 }
                 last;   # all done
             }
-            # copy HiddenData if necessary
-            if ($$self{HiddenData}) {
-                my $pad;
-                my $hd = $$self{HiddenData};
-                my $hdOff = $$hd{Offset} + $$hd{Base};
-                require Image::ExifTool::Sony;
-                # read HiddenData, updating $hdOff with actual offset if necessary
-                my $dataPt = Image::ExifTool::Sony::ReadHiddenData($self, $hdOff, $$hd{Size});
-                if ($dataPt) {
-                    # preserve padding to avoid invalidating MPF pointers (yuk!)
-                    my $padLen = $hdOff - $endPos;
-                    unless ($padLen >= 0 and $raf->Seek($endPos,0) and $raf->Read($pad,$padLen)==$padLen) {
-                        $self->Error('Error reading HiddenData padding',1);
-                        $pad = '';
-                    }
-                    $endPos += length($pad) + length($$dataPt); # update end position
-                } else {
-                    $$dataPt = $pad = '';
-                }
-                my $fixup = $$self{HiddenData}{Fixup};
-                # set MakerNote pointer and size (subtract 10 for segment and EXIF headers)
-                $fixup->SetMarkerPointers($outfile, 'HiddenData', length($$outfile) + length($pad) - 10);
-                # clean up and write the buffered data
-                $outfile = $oldOutfile;
-                undef $oldOutfile;
-                Write($outfile, $writeBuffer, $pad, $$dataPt) or $err = 1;
-                undef $writeBuffer;
-            }
-            # rewrite existing trailers
+            # rewrite existing trailers into buffer
             if ($trailInfo) {
                 my $tbuf = '';
                 $raf->Seek(-length($buff), 1);  # seek back to just after EOI
@@ -6118,100 +6093,126 @@ sub WriteJPEG($$)
                 $$trailInfo{ScanForTrailer} = 1;# scan if necessary
                 $self->ProcessTrailers($trailInfo) or undef $trailInfo;
             }
-            if (not $oldOutfile) {
-                # do nothing special
-            } elsif ($$self{LeicaTrailer}) {
-                my $trailLen;
-                if ($trailInfo) {
-                    $trailLen = $$trailInfo{DataPos} - $endPos;
-                } else {
-                    $raf->Seek(0, 2) or $err = 1;
-                    $trailLen = $raf->Tell() - $endPos;
-                }
-                my $fixup = $$self{LeicaTrailer}{Fixup};
-                $$self{LeicaTrailer}{TrailPos} = $endPos;
-                $$self{LeicaTrailer}{TrailLen} = $trailLen;
-                # get _absolute_ position of new Leica trailer
-                my $absPos = Tell($oldOutfile) + length($$outfile);
-                require Image::ExifTool::Panasonic;
-                my $dat = Image::ExifTool::Panasonic::ProcessLeicaTrailer($self, $absPos);
-                # allow some junk before Leica trailer (just in case)
-                my $junk = $$self{LeicaTrailerPos} - $endPos;
-                # set MakerNote pointer and size (subtract 10 for segment and EXIF headers)
-                $fixup->SetMarkerPointers($outfile, 'LeicaTrailer', length($$outfile) - 10 + $junk);
-                # use this fixup to set the size too (sneaky)
-                my $trailSize = defined($dat) ? length($dat) - $junk : $$self{LeicaTrailer}{Size};
-                $$fixup{Start} -= 4;  $$fixup{Shift} += 4;
-                $fixup->SetMarkerPointers($outfile, 'LeicaTrailer', $trailSize) if defined $trailSize;
-                $$fixup{Start} += 4;  $$fixup{Shift} -= 4;
-                # clean up and write the buffered data
-                $outfile = $oldOutfile;
-                undef $oldOutfile;
-                Write($outfile, $writeBuffer) or $err = 1;
-                undef $writeBuffer;
-                if (defined $dat) {
-                    Write($outfile, $dat) or $err = 1;  # write new Leica trailer
-                    $delPreview = 1;                    # delete existing Leica trailer
+            if ($oldOutfile) {
+                my $previewInfo;
+                # copy HiddenData if necessary
+                if ($$self{HiddenData}) {
+                    my $pad;
+                    my $hd = $$self{HiddenData};
+                    my $hdOff = $$hd{Offset} + $$hd{Base};
+                    require Image::ExifTool::Sony;
+                    # read HiddenData, updating $hdOff with actual offset if necessary
+                    my $dataPt = Image::ExifTool::Sony::ReadHiddenData($self, $hdOff, $$hd{Size});
+                    if ($dataPt) {
+                        # preserve padding to avoid invalidating MPF pointers (yuk!)
+                        my $padLen = $hdOff - $endPos;
+                        unless ($padLen >= 0 and $raf->Seek($endPos,0) and $raf->Read($pad,$padLen)==$padLen) {
+                            $self->Error('Error reading HiddenData padding',1);
+                            $pad = '';
+                        }
+                        $endPos += length($pad) + length($$dataPt); # update end position
+                    } else {
+                        $$dataPt = $pad = '';
+                    }
+                    my $fixup = $$self{HiddenData}{Fixup};
+                    # set MakerNote pointer and size (subtract 10 for segment and EXIF headers)
+                    $fixup->SetMarkerPointers($outfile, 'HiddenData', length($$outfile) + length($pad) - 10);
+                    $writeBuffer .= $pad . $$dataPt;    # keep padding for now
                 }
-            } else {
-                # locate preview image and fix up preview offsets
-                my $scanLen = $$self{Make} =~ /^SONY/i ? 65536 : 1024;
-                if (length($buff) < $scanLen) { # make sure we have enough trailer to scan
-                    my $buf2;
-                    $buff .= $buf2 if $raf->Read($buf2, $scanLen - length($buff));
+                if ($$self{LeicaTrailer}) {
+                    my $trailLen;
+                    if ($trailInfo) {
+                        $trailLen = $$trailInfo{DataPos} - $endPos;
+                    } else {
+                        $raf->Seek(0, 2) or $err = 1;
+                        $trailLen = $raf->Tell() - $endPos;
+                    }
+                    my $fixup = $$self{LeicaTrailer}{Fixup};
+                    $$self{LeicaTrailer}{TrailPos} = $endPos;
+                    $$self{LeicaTrailer}{TrailLen} = $trailLen;
+                    # get _absolute_ position of new Leica trailer
+                    my $absPos = Tell($oldOutfile) + length($$outfile);
+                    require Image::ExifTool::Panasonic;
+                    my $dat = Image::ExifTool::Panasonic::ProcessLeicaTrailer($self, $absPos);
+                    # allow some junk before Leica trailer (just in case)
+                    my $junk = $$self{LeicaTrailerPos} - $endPos;
+                    # set MakerNote pointer and size (subtract 10 for segment and EXIF headers)
+                    $fixup->SetMarkerPointers($outfile, 'LeicaTrailer', length($$outfile) - 10 + $junk);
+                    # use this fixup to set the size too (sneaky)
+                    my $trailSize = defined($dat) ? length($dat) - $junk : $$self{LeicaTrailer}{Size};
+                    $$fixup{Start} -= 4;  $$fixup{Shift} += 4;
+                    $fixup->SetMarkerPointers($outfile, 'LeicaTrailer', $trailSize) if defined $trailSize;
+                    $$fixup{Start} += 4;  $$fixup{Shift} -= 4;
+                    if (defined $dat) {
+                        Write($outfile, $dat) or $err = 1;  # write new Leica trailer
+                        $delPreview = 1;                    # delete existing Leica trailer
+                    }
                 }
-                # get new preview image position, relative to EXIF base
-                my $newPos = length($$outfile) - 10; # (subtract 10 for segment and EXIF headers)
-                my $junkLen;
-                # adjust position if image isn't at the start (eg. Olympus E-1/E-300)
-                if ($buff =~ /(\xff\xd8\xff.|.\xd8\xff\xdb)(..)/sg) {
-                    my ($jpegHdr, $segLen) = ($1, $2);
-                    $junkLen = pos($buff) - 6;
-                    # Sony previewimage trailer has a 32 byte header
-                    if ($$self{Make} =~ /^SONY/i and $junkLen > 32) {
-                        # with some newer Sony models, the makernotes preview pointer
-                        # points to JPEG at end of EXIF inside MPImage preview (what a pain!)
-                        if ($jpegHdr eq "\xff\xd8\xff\xe1") {   # is the first segment EXIF?
-                            $segLen = unpack('n', $segLen);     # the EXIF segment length
-                            # Sony PreviewImage starts with last 2 bytes of EXIF segment
-                            # (and first byte is usually "\0", not "\xff", so don't check this)
-                            if (length($buff) > $junkLen + $segLen + 6 and
-                                substr($buff, $junkLen + $segLen + 3, 3) eq "\xd8\xff\xdb")
-                            {
-                                $junkLen += $segLen + 2;
-                                # (note: this will not copy the trailer after PreviewImage,
-                                #  which is a 14kB block full of zeros for the A77)
+                # handle preview image last
+                if ($$self{PREVIEW_INFO}) {
+                    # locate preview image and fix up preview offsets
+                    my $scanLen = $$self{Make} =~ /^SONY/i ? 65536 : 1024;
+                    if (length($buff) < $scanLen) { # make sure we have enough trailer to scan
+                        my $buf2;
+                        $buff .= $buf2 if $raf->Read($buf2, $scanLen - length($buff));
+                    }
+                    # get new preview image position, relative to EXIF base
+                    my $newPos = length($$outfile) - 10; # (subtract 10 for segment and EXIF headers)
+                    my $junkLen;
+                    # adjust position if image isn't at the start (eg. Olympus E-1/E-300)
+                    if ($buff =~ /(\xff\xd8\xff.|.\xd8\xff\xdb)(..)/sg) {
+                        my ($jpegHdr, $segLen) = ($1, $2);
+                        $junkLen = pos($buff) - 6;
+                        # Sony previewimage trailer has a 32 byte header
+                        if ($$self{Make} =~ /^SONY/i and $junkLen > 32) {
+                            # with some newer Sony models, the makernotes preview pointer
+                            # points to JPEG at end of EXIF inside MPImage preview (what a pain!)
+                            if ($jpegHdr eq "\xff\xd8\xff\xe1") {   # is the first segment EXIF?
+                                $segLen = unpack('n', $segLen);     # the EXIF segment length
+                                # Sony PreviewImage starts with last 2 bytes of EXIF segment
+                                # (and first byte is usually "\0", not "\xff", so don't check this)
+                                if (length($buff) > $junkLen + $segLen + 6 and
+                                    substr($buff, $junkLen + $segLen + 3, 3) eq "\xd8\xff\xdb")
+                                {
+                                    $junkLen += $segLen + 2;
+                                    # (note: this will not copy the trailer after PreviewImage,
+                                    #  which is a 14kB block full of zeros for the A77)
+                                }
                             }
+                            $junkLen -= 32;
                         }
-                        $junkLen -= 32;
+                        $newPos += $junkLen;
+                    }
+                    # fix up the preview offsets to point to the start of the new image
+                    $previewInfo = $$self{PREVIEW_INFO};
+                    delete $$self{PREVIEW_INFO};
+                    my $fixup = $$previewInfo{Fixup};
+                    $newPos += ($$previewInfo{BaseShift} || 0);
+                    # adjust to absolute file offset if necessary (Samsung STMN)
+                    $newPos += Tell($oldOutfile) + 10 if $$previewInfo{Absolute};
+                    if ($$previewInfo{Relative}) {
+                        # adjust for our base by looking at how far the pointer got shifted
+                        $newPos -= ($fixup->GetMarkerPointers($outfile, 'PreviewImage') || 0);
+                    } elsif ($$previewInfo{ChangeBase}) {
+                        # Leica S2 uses relative offsets for the preview only (leica sucks)
+                        my $makerOffset = $fixup->GetMarkerPointers($outfile, 'LeicaTrailer');
+                        $newPos -= $makerOffset if $makerOffset;
+                    }
+                    $fixup->SetMarkerPointers($outfile, 'PreviewImage', $newPos);
+                    if ($$previewInfo{Data} ne 'LOAD_PREVIEW') {
+                        # write any junk that existed before the preview image
+                        $$previewInfo{Junk} = substr($buff,0,$junkLen) if $junkLen;
                     }
-                    $newPos += $junkLen;
-                }
-                # fix up the preview offsets to point to the start of the new image
-                my $previewInfo = $$self{PREVIEW_INFO};
-                delete $$self{PREVIEW_INFO};
-                my $fixup = $$previewInfo{Fixup};
-                $newPos += ($$previewInfo{BaseShift} || 0);
-                # adjust to absolute file offset if necessary (Samsung STMN)
-                $newPos += Tell($oldOutfile) + 10 if $$previewInfo{Absolute};
-                if ($$previewInfo{Relative}) {
-                    # adjust for our base by looking at how far the pointer got shifted
-                    $newPos -= ($fixup->GetMarkerPointers($outfile, 'PreviewImage') || 0);
-                } elsif ($$previewInfo{ChangeBase}) {
-                    # Leica S2 uses relative offsets for the preview only (leica sucks)
-                    my $makerOffset = $fixup->GetMarkerPointers($outfile, 'LeicaTrailer');
-                    $newPos -= $makerOffset if $makerOffset;
                 }
-                $fixup->SetMarkerPointers($outfile, 'PreviewImage', $newPos);
                 # clean up and write the buffered data
                 $outfile = $oldOutfile;
                 undef $oldOutfile;
                 Write($outfile, $writeBuffer) or $err = 1;
                 undef $writeBuffer;
                 # write preview image
-                if ($$previewInfo{Data} ne 'LOAD_PREVIEW') {
+                if ($previewInfo and $$previewInfo{Data} ne 'LOAD_PREVIEW') {
                     # write any junk that existed before the preview image
-                    Write($outfile, substr($buff,0,$junkLen)) or $err = 1 if $junkLen;
+                    Write($outfile, $$previewInfo{Junk}) or $err = 1 if defined $$previewInfo{Junk};
                     # write the saved preview image
                     Write($outfile, $$previewInfo{Data}) or $err = 1;
                     delete $$previewInfo{Data};
@@ -6224,7 +6225,7 @@ sub WriteJPEG($$)
                 my $extra;
                 if ($trailInfo) {
                     # copy everything up to start of first processed trailer
-                    $extra = $$trailInfo{DataPos} - $endPos;
+                    $extra = defined $$trailInfo{DataPos} ? ($$trailInfo{DataPos} - $endPos) : 0;
                 } else {
                     # copy everything up to end of file
                     $raf->Seek(0, 2) or $err = 1;
@@ -6393,9 +6394,9 @@ sub WriteJPEG($$)
                         $oldOutfile = $outfile;
                         $outfile = \$writeBuffer;
                         # must account for segment, EXIF and TIFF headers
-                        $$self{PREVIEW_INFO}{Fixup}{Start} += 18 if $$self{PREVIEW_INFO};
-                        $$self{LeicaTrailer}{Fixup}{Start} += 18 if $$self{LeicaTrailer};
-                        $$self{HiddenData}{Fixup}{Start} += 18 if $$self{HiddenData};
+                        foreach (qw(PREVIEW_INFO LeicaTrailer HiddenData)) {
+                            $$self{$_}{Fixup}{Start} += 18 if $$self{$_};
+                        }
                     }
                     # write as multi-segment
                     my $n = WriteMultiSegment($outfile, $marker, $exifAPP1hdr, $segDataPt, 'EXIF');
@@ -6922,7 +6923,7 @@ sub CheckBinaryData($$$)
         $format = $1;
         $count = $2;
         # can't evaluate $count now because we don't know $size yet
-        undef $count if $count =~ /\$size/;
+        $count = -1 if $count =~ /\$size/;  # (-1 = any count allowed)
     }
     return CheckValue($valPtr, $format, $count);
 }
@@ -7248,6 +7249,8 @@ sub WriteBinaryData($$$)
             $self->VerboseValue("- $dirName:$$tagInfo{Name}", $val);
             $self->VerboseValue("+ $dirName:$$tagInfo{Name}", $newVal);
             ++$$self{CHANGED};
+        } else {
+            $self->Warn("Error packing $$tagInfo{Name} value");
         }
     }
     # add necessary fixups for any offsets

data/bin/lib/Image/ExifTool/XMPStruct.pl

@@ -86,7 +86,7 @@ sub InflateStruct($$;$)
         my %struct;
         for (;;) {
             last unless $sfmt ? $$obj =~ s/^\s*"(.*?)"\s*://s :
-                                $$obj =~ s/^\s*([-\w:]+#?)\s*=//s;
+                                $$obj =~ s/^\s*([-\w:.]+#?)\s*=//s;
             my $tag = $1;
             my ($v, $w) = InflateStruct($et, $obj, '}');
             $warn = $w if $w and not $warn;

data/bin/lib/Image/ExifTool.pm

@@ -29,7 +29,7 @@ use vars qw($VERSION $RELEASE @ISA @EXPORT_OK %EXPORT_TAGS $AUTOLOAD @fileTypes
             %jpegMarker %specialTags %fileTypeLookup $testLen $exeDir
             %static_vars $advFmtSelf $configFile @configFiles $noConfig);
 
-$VERSION = '13.30';
+$VERSION = '13.33';
 $RELEASE = '';
 @ISA = qw(Exporter);
 %EXPORT_TAGS = (
@@ -42,7 +42,7 @@ $RELEASE = '';
     # exports not part of the public API, but used by ExifTool modules:
     DataAccess => [qw(
         ReadValue GetByteOrder SetByteOrder ToggleByteOrder Get8u Get8s Get16u
-        Get16s Get32u Get32s Get64u GetFloat GetDouble GetFixed32s Write
+        Get16s Get32u Get32s Get64u Get64s GetFloat GetDouble GetFixed32s Write
         WriteValue Tell Set8u Set8s Set16u Set32u Set64u Set64s
     )],
     Utils => [qw(GetTagTable TagTableKeys GetTagInfoList AddTagToTable HexDump)],
@@ -152,8 +152,8 @@ sub ReadValue($$$;$$$);
     APE::OldHeader Audible MPC MPEG::Audio MPEG::Video MPEG::Xing M2TS QuickTime
     QuickTime::ImageFile QuickTime::Stream QuickTime::Tags360Fly Matroska
     Matroska::StdTag MOI MXF DV Flash Flash::FLV Real::Media Real::Audio
-    Real::Metafile Red RIFF AIFF ASF WTV DICOM FITS XISF MIE JSON HTML XMP::SVG
-    Palm Palm::MOBI Palm::EXTH Torrent EXE EXE::PEVersion EXE::PEString
+    Real::Metafile Red RIFF AIFF ASF TNEF WTV DICOM FITS XISF MIE JSON HTML
+    XMP::SVG Palm Palm::MOBI Palm::EXTH Torrent EXE EXE::PEVersion EXE::PEString
     EXE::DebugRSDS EXE::DebugNB10 EXE::Misc EXE::MachO EXE::PEF EXE::ELF EXE::AR
     EXE::CHM LNK PCAP Font VCard Text VCard::VCalendar VCard::VNote RSRC Rawzor
     ZIP ZIP::GZIP ZIP::RAR ZIP::RAR5 RTF OOXML iWork ISO FLIR::AFF FLIR::FPF
@@ -200,7 +200,7 @@ $defaultLang = 'en';    # default language
                 RAR 7Z BZ2 CZI TAR EXE EXR HDR CHM LNK WMF AVC DEX DPX RAW Font
                 JUMBF RSRC M2TS MacOS PHP PCX DCX DWF DWG DXF WTV Torrent VCard
                 LRI R3D AA PDB PFM2 MRC LIF JXL MOI ISO ALIAS PCAP JSON MP3
-                DICOM PCD NKA ICO TXT AAC);
+                TNEF DICOM PCD NKA ICO TXT AAC);
 
 # file types that we can write (edit)
 my @writeTypes = qw(JPEG TIFF GIF CRW MRW ORF RAF RAW PNG MIE PSD XMP PPM EPS
@@ -536,6 +536,7 @@ my %createTypes = map { $_ => 1 } qw(XMP ICC MIE VRD DR4 EXIF EXV);
     THMX => [['ZIP','FPX'], 'Office Open XML Theme'],
     TIF  =>  'TIFF',
     TIFF => ['TIFF', 'Tagged Image File Format'],
+    TNEF => ['TNEF', 'Transport Neural Encapsulation Format'], # (actual extension is .DAT)
     TORRENT => ['Torrent', 'BitTorrent description file'],
     TS   =>  'M2TS',
     TTC  => ['Font', 'True Type Font Collection'],
@@ -802,6 +803,7 @@ my %fileDescription = (
     TAR  => 'application/x-tar',
     THMX => 'application/vnd.ms-officetheme',
     TIFF => 'image/tiff',
+    TNEF => 'application/vnd.ms-tnef',
     Torrent => 'application/x-bittorrent',
     TTC  => 'application/font-ttf',
     TTF  => 'application/font-ttf',
@@ -1012,6 +1014,7 @@ $testLen = 1024;    # number of bytes to read when testing for magic number
     RWZ  => 'rawzor',
     SWF  => '[FC]WS[^\0]',
     TAR  => '.{257}ustar(  )?\0', # (this doesn't catch old-style tar files)
+    TNEF => '\x78\x9f\x3e\x22..\x01\x06\x90\x08\0',
     TXT  => '(\xff\xfe|(\0\0)?\xfe\xff|(\xef\xbb\xbf)?[\x07-\x0d\x20-\x7e\x80-\xfe]*$)',
     TIFF => '(II|MM)', # don't test magic number (some raw formats are different)
     VCard=> '(?i)BEGIN:(VCARD|VCALENDAR|VNOTE)\r\n',
@@ -4292,6 +4295,7 @@ sub Init($)
     $$self{LOW_PRIORITY_DIR} = { PreviewIFD => 1 }; # names of priority 0 directories
     $$self{TIFF_TYPE}  = '';        # type of TIFF data (APP1, TIFF, NEF, etc...)
     $$self{FMT_EXPR}   = undef;     # current advanced formatting expression
+    $$self{HAS_DOC}    = { };       # lookup for all document numbers in this file
     $$self{Make}       = '';        # camera make
     $$self{Model}      = '';        # camera model
     $$self{CameraType} = '';        # Olympus camera type
@@ -6582,6 +6586,8 @@ sub ConvertDateTime($$)
             }
             $a[5] -= 1900;  # strftime year starts from 1900
             $date = POSIX::strftime($fmt, @a);  # generate the formatted date/time
+            # apparently strftime can set the UTF-8 flag (argh!), so reset this if necessary
+            $self->Sanitize(\$date) if $fmt =~ /[\x80-\xff]/;
         } elsif ($$self{OPTIONS}{StrictDate}) {
             undef $date;
         }
@@ -9480,6 +9486,7 @@ sub FoundTag($$$;@)
     $$self{TAG_EXTRA}{$tag}{G1} = $grps[1] if $grps[1];
     if ($$self{DOC_NUM}) {
         $$self{TAG_EXTRA}{$tag}{G3} = $$self{DOC_NUM};
+        $$self{HAS_DOC}{$$self{DOC_NUM}} = 1;
         if ($$self{DOC_NUM} =~ /^(\d+)/) {
             # keep track of maximum 1st-level sub-document number
             $$self{DOC_COUNT} = $1 unless $$self{DOC_COUNT} >= $1;
@@ -9719,8 +9726,10 @@ sub ExtractBinary($$$;$)
             $isPreview = 1;
         }
         my $lcTag = lc $tag;
-        if ((not $$self{OPTIONS}{Binary} or $$self{EXCL_TAG_LOOKUP}{$lcTag}) and
-             not $$self{OPTIONS}{Verbose} and not $$self{REQ_TAG_LOOKUP}{$lcTag})
+        my $options = $$self{OPTIONS};
+        if ((not $$options{Binary} or $$self{EXCL_TAG_LOOKUP}{$lcTag}) and
+             not $$options{Verbose} and not $$options{Validate} and
+             not $$self{REQ_TAG_LOOKUP}{$lcTag})
         {
             return "Binary data $length bytes";
         }

data/bin/lib/Image/ExifTool.pod

@@ -65,50 +65,51 @@ supported by ExifTool (r = read, w = write, c = create):
 
   File Types
   ------------+-------------+-------------+-------------+------------
-  360   r/w   | DOCX  r     | ITC   r     | NUMBERS r   | RAM   r
-  3FR   r     | DPX   r     | J2C   r     | NXD   r     | RAR   r
-  3G2   r/w   | DR4   r/w/c | JNG   r/w   | O     r     | RAW   r/w
-  3GP   r/w   | DSS   r     | JP2   r/w   | ODP   r     | RIFF  r
-  7Z    r     | DV    r     | JPEG  r/w   | ODS   r     | RSRC  r
-  A     r     | DVB   r/w   | JSON  r     | ODT   r     | RTF   r
-  AA    r     | DVR-MS r    | JXL   r/w   | OFR   r     | RW2   r/w
-  AAC   r     | DYLIB r     | K25   r     | OGG   r     | RWL   r/w
-  AAE   r     | EIP   r     | KDC   r     | OGV   r     | RWZ   r
-  AAX   r/w   | EPS   r/w   | KEY   r     | ONP   r     | RM    r
-  ACR   r     | EPUB  r     | LA    r     | OPUS  r     | SEQ   r
-  AFM   r     | ERF   r/w   | LFP   r     | ORF   r/w   | SKETCH r
-  AI    r/w   | EXE   r     | LIF   r     | ORI   r/w   | SO    r
-  AIFF  r     | EXIF  r/w/c | LNK   r     | OTF   r     | SR2   r/w
-  APE   r     | EXR   r     | LRV   r/w   | PAC   r     | SRF   r
-  ARQ   r/w   | EXV   r/w/c | M2TS  r     | PAGES r     | SRW   r/w
-  ARW   r/w   | F4A/V r/w   | M4A/V r/w   | PBM   r/w   | SVG   r
-  ASF   r     | FFF   r/w   | MACOS r     | PCAP  r     | SWF   r
-  AVI   r     | FITS  r     | MAX   r     | PCAPNG r    | THM   r/w
-  AVIF  r/w   | FLA   r     | MEF   r/w   | PCD   r     | TIFF  r/w
-  AZW   r     | FLAC  r     | MIE   r/w/c | PCX   r     | TORRENT r
-  BMP   r     | FLIF  r/w   | MIFF  r     | PDB   r     | TTC   r
-  BPG   r     | FLV   r     | MKA   r     | PDF   r/w   | TTF   r
-  BTF   r     | FPF   r     | MKS   r     | PEF   r/w   | TXT   r
-  C2PA  r     | FPX   r     | MKV   r     | PFA   r     | VCF   r
-  CHM   r     | GIF   r/w   | MNG   r/w   | PFB   r     | VNT   r
-  COS   r     | GLV   r/w   | MOBI  r     | PFM   r     | VRD   r/w/c
-  CR2   r/w   | GPR   r/w   | MODD  r     | PGF   r     | VSD   r
-  CR3   r/w   | GZ    r     | MOI   r     | PGM   r/w   | WAV   r
-  CRM   r/w   | HDP   r/w   | MOS   r/w   | PLIST r     | WDP   r/w
-  CRW   r/w   | HDR   r     | MOV   r/w   | PICT  r     | WEBP  r/w
-  CS1   r/w   | HEIC  r/w   | MP3   r     | PMP   r     | WEBM  r
-  CSV   r     | HEIF  r/w   | MP4   r/w   | PNG   r/w   | WMA   r
-  CUR   r     | HTML  r     | MPC   r     | PPM   r/w   | WMV   r
-  CZI   r     | ICC   r/w/c | MPG   r     | PPT   r     | WPG   r
-  DCM   r     | ICO   r     | MPO   r/w   | PPTX  r     | WTV   r
-  DCP   r/w   | ICS   r     | MQV   r/w   | PS    r/w   | WV    r
-  DCR   r     | IDML  r     | MRC   r     | PSB   r/w   | X3F   r/w
-  DFONT r     | IIQ   r/w   | MRW   r/w   | PSD   r/w   | XCF   r
-  DIVX  r     | IND   r/w   | MXF   r     | PSP   r     | XISF  r
-  DJVU  r     | INSP  r/w   | NEF   r/w   | QTIF  r/w   | XLS   r
-  DLL   r     | INSV  r     | NKA   r     | R3D   r     | XLSX  r
-  DNG   r/w   | INX   r     | NKSC  r/w   | RA    r     | XMP   r/w/c
-  DOC   r     | ISO   r     | NRW   r/w   | RAF   r/w   | ZIP   r
+  360   r/w   | DPX   r     | JNG   r/w   | ODP   r     | RSRC  r
+  3FR   r     | DR4   r/w/c | JP2   r/w   | ODS   r     | RTF   r
+  3G2   r/w   | DSS   r     | JPEG  r/w   | ODT   r     | RW2   r/w
+  3GP   r/w   | DV    r     | JSON  r     | OFR   r     | RWL   r/w
+  7Z    r     | DVB   r/w   | JXL   r/w   | OGG   r     | RWZ   r
+  A     r     | DVR-MS r    | K25   r     | OGV   r     | RM    r
+  AA    r     | DYLIB r     | KDC   r     | ONP   r     | SEQ   r
+  AAC   r     | EIP   r     | KEY   r     | OPUS  r     | SKETCH r
+  AAE   r     | EPS   r/w   | LA    r     | ORF   r/w   | SO    r
+  AAX   r/w   | EPUB  r     | LFP   r     | ORI   r/w   | SR2   r/w
+  ACR   r     | ERF   r/w   | LIF   r     | OTF   r     | SRF   r
+  AFM   r     | EXE   r     | LNK   r     | PAC   r     | SRW   r/w
+  AI    r/w   | EXIF  r/w/c | LRV   r/w   | PAGES r     | SVG   r
+  AIFF  r     | EXR   r     | M2TS  r     | PBM   r/w   | SWF   r
+  APE   r     | EXV   r/w/c | M4A/V r/w   | PCAP  r     | THM   r/w
+  ARQ   r/w   | F4A/V r/w   | MACOS r     | PCAPNG r    | TIFF  r/w
+  ARW   r/w   | FFF   r/w   | MAX   r     | PCD   r     | TNEF  r
+  ASF   r     | FITS  r     | MEF   r/w   | PCX   r     | TORRENT r
+  AVI   r     | FLA   r     | MIE   r/w/c | PDB   r     | TTC   r
+  AVIF  r/w   | FLAC  r     | MIFF  r     | PDF   r/w   | TTF   r
+  AZW   r     | FLIF  r/w   | MKA   r     | PEF   r/w   | TXT   r
+  BMP   r     | FLV   r     | MKS   r     | PFA   r     | VCF   r
+  BPG   r     | FPF   r     | MKV   r     | PFB   r     | VNT   r
+  BTF   r     | FPX   r     | MNG   r/w   | PFM   r     | VRD   r/w/c
+  C2PA  r     | GIF   r/w   | MOBI  r     | PGF   r     | VSD   r
+  CHM   r     | GLV   r/w   | MODD  r     | PGM   r/w   | WAV   r
+  COS   r     | GPR   r/w   | MOI   r     | PLIST r     | WDP   r/w
+  CR2   r/w   | GZ    r     | MOS   r/w   | PICT  r     | WEBP  r/w
+  CR3   r/w   | HDP   r/w   | MOV   r/w   | PMP   r     | WEBM  r
+  CRM   r/w   | HDR   r     | MP3   r     | PNG   r/w   | WMA   r
+  CRW   r/w   | HEIC  r/w   | MP4   r/w   | PPM   r/w   | WMV   r
+  CS1   r/w   | HEIF  r/w   | MPC   r     | PPT   r     | WPG   r
+  CSV   r     | HTML  r     | MPG   r     | PPTX  r     | WTV   r
+  CUR   r     | ICC   r/w/c | MPO   r/w   | PS    r/w   | WV    r
+  CZI   r     | ICO   r     | MQV   r/w   | PSB   r/w   | X3F   r/w
+  DCM   r     | ICS   r     | MRC   r     | PSD   r/w   | XCF   r
+  DCP   r/w   | IDML  r     | MRW   r/w   | PSP   r     | XISF  r
+  DCR   r     | IIQ   r/w   | MXF   r     | QTIF  r/w   | XLS   r
+  DFONT r     | IND   r/w   | NEF   r/w   | R3D   r     | XLSX  r
+  DIVX  r     | INSP  r/w   | NKA   r     | RA    r     | XMP   r/w/c
+  DJVU  r     | INSV  r     | NKSC  r/w   | RAF   r/w   | ZIP   r
+  DLL   r     | INX   r     | NRW   r/w   | RAM   r     |
+  DNG   r/w   | ISO   r     | NUMBERS r   | RAR   r     |
+  DOC   r     | ITC   r     | NXD   r     | RAW   r/w   |
+  DOCX  r     | J2C   r     | O     r     | RIFF  r     |
 
   Meta Information
   ----------------------+----------------------+---------------------