exiftool_vendored 12.58.0 → 12.60.0

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);
 
-$VERSION = '12.58';
+$VERSION = '12.60';
 $RELEASE = '';
 @ISA = qw(Exporter);
 %EXPORT_TAGS = (
@@ -75,6 +75,7 @@ sub GetAllGroups($;$);
 sub GetNewGroups($);
 sub GetDeleteGroups();
 sub AddUserDefinedTags($%);
+sub SetAlternateFile($$$);
 # non-public routines below
 sub InsertTagValues($$$;$$$);
 sub IsWritable($);
@@ -113,6 +114,7 @@ sub WriteTIFF($$$);
 sub PackUTF8(@);
 sub UnpackUTF8($);
 sub SetPreferredByteOrder($;$);
+sub ImageDataMD5($$$;$$);
 sub CopyBlock($$$);
 sub CopyFileAttrs($$$);
 sub TimeNow(;$$);
@@ -1824,8 +1826,12 @@ my %systemTagsNotes = (
     ImageDataMD5 => {
         Notes => q{
             MD5 of image data. Generated only if specifically requested for JPEG and
-            TIFF-based images, except Panasonic raw for now. Includes image data,
-            OtherImage and JpgFromRaw in the MD5, but not ThumbnailImage or PreviewImage
+            TIFF-based images, PNG, CRW, CR3, MRW, RAF, X3F and AVIF images, MOV/MP4
+            videos, and some RIFF-based files.  The MD5 includes the main image data,
+            plus JpgFromRaw/OtherImage for some formats, but does not include
+            ThumbnailImage or PreviewImage.  Includes video and audio data for MOV/MP4. 
+            The L<XMP-et:OriginalImageMD5 tag|XMP.html#ExifTool> provides a place to
+            store these values in the file.
         },
     },
 );
@@ -2052,6 +2058,7 @@ sub new
     $$self{FILE_SEQUENCE} = 0;  # sequence number for files when reading
     $$self{FILES_WRITTEN} = 0;  # count of files successfully written
     $$self{INDENT2} = '';       # indentation of verbose messages from SetNewValue
+    $$self{ALT_EXIFTOOL} = { }; # alternate exiftool objects
 
     # initialize our new groups for writing
     $self->SetNewGroups(@defaultWriteGroups);
@@ -2496,6 +2503,23 @@ sub ExtractInfo($;@)
             }
         }
         ++$$self{FILE_SEQUENCE};        # count files read
+        # extract information from alternate files if necessary
+        my ($g8, $altExifTool);
+        foreach $g8 (keys %{$$self{ALT_EXIFTOOL}}) {
+            $altExifTool = $$self{ALT_EXIFTOOL}{$g8};
+            next if $$altExifTool{DID_EXTRACT}; # avoid extracting twice
+            $$altExifTool{OPTIONS} = $$self{OPTIONS};
+            $$altExifTool{GLOBAL_TIME_OFFSET} = $$self{GLOBAL_TIME_OFFSET};
+            $$altExifTool{REQ_TAG_LOOKUP} = $$self{REQ_TAG_LOOKUP};
+            $altExifTool->ExtractInfo($$altExifTool{ALT_FILE});
+            # set family 8 group name for all tags
+            foreach (keys %{$$altExifTool{VALUE}}) {
+                my $ex = $$altExifTool{TAG_EXTRA}{$_};
+                $ex or $ex = $$altExifTool{TAG_EXTRA}{$_} = { };
+                $$ex{G8} = $g8;
+            }
+            $$altExifTool{DID_EXTRACT} = 1;
+        }
     }
 
     my $filename = $$self{FILENAME};    # image file name ('' if already open)
@@ -3520,6 +3544,10 @@ sub GetGroup($$;$)
                 $groups[6] = $$ex{G6};
             }
         }
+        if ($$ex{G8}) {
+            $groups[7] = '';
+            $groups[8] = $$ex{G8};
+        }
         # generate tag ID group names unless obviously not needed
         unless ($noID) {
             my $id = $$tagInfo{KeysID} || $$tagInfo{TagID};
@@ -3705,13 +3733,21 @@ COMPOSITE_TAG:
                                 next COMPOSITE_TAG;
                             }
                         }
+                        my ($i, $key, @keys, $altFile);
+                        my $et = $self;
+                        # get tags from alternate file if a family 8 group was specified
+                        if ($reqTag =~ /\b(File\d+):/i and $$self{ALT_EXIFTOOL}{$1}) {
+                            $et = $$self{ALT_EXIFTOOL}{$1};
+                            $altFile = $1;
+                        }
                         # (CAREFUL! keys may not be sequential if one was deleted)
-                        my ($i, $key, @keys);
-                        for ($key=$name, $i=$$self{DUPL_TAG}{$name} || 0; ; --$i) {
-                            push @keys, $key if defined $$rawValue{$key};
+                        for ($key=$name, $i=$$et{DUPL_TAG}{$name} || 0; ; --$i) {
+                            push @keys, $key if defined $$et{VALUE}{$key};
                             last if $i <= 0;
                             $key = "$name ($i)";
                         }
+                        # make sure the necessary information is available from the alternate file
+                        $self->CopyAltInfo($altFile, \@keys) if $altFile;
                         # find first matching tag
                         $key = $self->GroupMatches($reqGroup, \@keys);
                         $reqTag = $key || "$name (0)";
@@ -4153,7 +4189,11 @@ sub SplitFileName($)
     } else {
         ($name = $file) =~ tr/\\/\//;
         # remove path
-        $dir = length($1) ? $1 : '/' if $name =~ s/(.*)\///;
+        if ($name =~ s/(.*)\///) {
+            $dir = length($1) ? $1 : '/';
+        } else {
+            $dir = '.';
+        }
     }
     return ($dir, $name);
 }
@@ -4568,6 +4608,29 @@ sub RemoveTagsFromList($$$$;$)
     $_[0] = \@filteredTags;     # update tag list
 }
 
+#------------------------------------------------------------------------------
+# Copy tags from alternate input file
+# Inputs: 0) ExifTool ref, 1) family 8 group, 2) list ref for tag keys to copy
+# - updates tag key list to match keys newly added to $self
+sub CopyAltInfo($$$)
+{
+    my ($self, $g8, $tags) = @_;
+    my ($tag, $vtag);
+    return unless $g8 =~ /(\d+)/;
+    my $et = $$self{ALT_EXIFTOOL}{$g8} or return;
+    my $altOrder = ($1 + 1) * 100000;   # increment file order
+    foreach $tag (@$tags) {
+        ($vtag = $tag) =~ s/( |$)/ #[$g8]/;
+        unless (defined $$self{VALUE}{$vtag}) {
+            $$self{VALUE}{$vtag} = $$et{VALUE}{$tag};
+            $$self{TAG_INFO}{$vtag} = $$et{TAG_INFO}{$tag};
+            $$self{TAG_EXTRA}{$vtag} = $$et{TAG_EXTRA}{$tag} || { };
+            $$self{FILE_ORDER}{$vtag} = ($$et{FILE_ORDER}{$tag} || 0) + $altOrder;
+        }
+        $tag = $vtag;
+    }
+}
+
 #------------------------------------------------------------------------------
 # Set list of found tags from previously requested tags
 # Inputs: 0) ExifTool object reference
@@ -4594,11 +4657,17 @@ sub SetFoundTags($)
         my $tagHash = $$self{VALUE};
         my $reqTag;
         foreach $reqTag (@$reqTags) {
-            my (@matches, $group, $allGrp, $allTag, $byValue);
+            my (@matches, $group, $allGrp, $allTag, $byValue, $g8);
+            my $et = $self;
             if ($reqTag =~ /^(.*):(.+)/) {
                 ($group, $tag) = ($1, $2);
                 if ($group =~ /^(\*|all)$/i) {
                     $allGrp = 1;
+                } elsif ($reqTag =~ /\bfile(\d+):/i) {
+                    $g8 = "File$1";
+                    $et = $$self{ALT_EXIFTOOL}{$g8} || $self;
+                    $fileOrder = $$et{FILE_ORDER};
+                    $tagHash = $$et{VALUE};
                 } elsif ($group !~ /^[-\w:]*$/) {
                     $self->Warn("Invalid group name '${group}'");
                     $group = 'invalid';
@@ -4640,7 +4709,7 @@ sub SetFoundTags($)
             }
             if (defined $group and not $allGrp) {
                 # keep only specified group
-                @matches = $self->GroupMatches($group, \@matches);
+                @matches = $et->GroupMatches($group, \@matches);
                 next unless @matches or not $allTag;
             }
             if (@matches > 1) {
@@ -4649,9 +4718,9 @@ sub SetFoundTags($)
                 # return only the highest priority tag unless duplicates wanted
                 unless ($doDups or $allTag or $allGrp) {
                     $tag = shift @matches;
-                    my $oldPriority = $$self{PRIORITY}{$tag} || 1;
+                    my $oldPriority = $$et{PRIORITY}{$tag} || 1;
                     foreach (@matches) {
-                        my $priority = $$self{PRIORITY}{$_};
+                        my $priority = $$et{PRIORITY}{$_};
                         $priority = 1 unless defined $priority;
                         next unless $priority >= $oldPriority;
                         $tag = $_;
@@ -4665,6 +4734,13 @@ sub SetFoundTags($)
                 # bogus file order entry to avoid warning if sorting in file order
                 $$self{FILE_ORDER}{$matches[0]} = 9999;
             }
+            # copy over necessary information for tags from alternate files
+            if ($g8) {
+                $self->CopyAltInfo($g8, \@matches);
+                # restore variables to original values for main file
+                $fileOrder = $$self{FILE_ORDER};
+                $tagHash = $$self{VALUE};
+            }
             # save indices of tags extracted by value
             push @byValue, scalar(@$rtnTags) .. (scalar(@$rtnTags)+scalar(@matches)-1) if $byValue;
             # save indices of wildcard tags
@@ -6347,7 +6423,6 @@ sub ProcessJPEG($$)
 {
     local $_;
     my ($self, $dirInfo) = @_;
-    my ($ch, $s, $length);
     my $options = $$self{OPTIONS};
     my $verbose = $$options{Verbose};
     my $out = $$options{TextOut};
@@ -6356,12 +6431,16 @@ sub ProcessJPEG($$)
     my $req = $$self{REQ_TAG_LOOKUP};
     my $htmlDump = $$self{HTML_DUMP};
     my %dumpParms = ( Out => $out );
+    my ($ch, $s, $length, $md5, $md5size);
     my ($success, $wantTrailer, $trailInfo, $foundSOS, %jumbfChunk);
     my (@iccChunk, $iccChunkCount, $iccChunksTotal, @flirChunk, $flirCount, $flirTotal);
-    my ($preview, $scalado, @dqt, $subSampling, $dumpEnd, %extendedXMP, $md5);
+    my ($preview, $scalado, @dqt, $subSampling, $dumpEnd, %extendedXMP);
 
     # get pointer to MD5 object if it exists and we are the top-level JPEG
-    $md5 = $$self{ImageDataMD5} if $$self{FILE_TYPE} eq 'JPEG' and not $$self{DOC_NUM};
+    if ($$self{FILE_TYPE} eq 'JPEG' and not $$self{DOC_NUM}) {
+        $md5 = $$self{ImageDataMD5};
+        $md5size = 0;
+    }
 
     # check to be sure this is a valid JPG (or J2C, or EXV) file
     return 0 unless $raf->Read($s, 2) == 2 and $s =~ /^\xff[\xd8\x4f\x01]/;
@@ -6441,8 +6520,19 @@ sub ProcessJPEG($$)
                 $nextSegPos = $raf->Tell();
                 $len -= 4;  # subtract size of length word
                 last unless $raf->Seek($len, 1);
-            } elsif ($md5 and defined $marker and ($marker == 0x00 or $marker == 0xda)) {
-                $md5->add($buff);   # (note: this includes the terminating 0xff's)
+            } elsif ($md5 and defined $marker and ($marker == 0x00 or $marker == 0xda or
+                ($marker >= 0xd0 and $marker <= 0xd7)))
+            {
+                # calculate MD5 for image data (includes leading ff d9 but not trailing ff da)
+                $md5->add("\xff" . chr($marker));
+                my $n = $skipped - (length($buff) - 1); # number of extra 0xff's
+                if (not $n) {
+                    $buff = substr($buff, 0, -1);       # remove trailing 0xff
+                } elsif ($n > 1) {
+                    $buff .= "\xff" x ($n - 1);         # add back extra 0xff's
+                }
+                $md5->add($buff);
+                $md5size += $skipped + 2;
             }
             # read second segment too if this was the first
             next unless defined $marker;
@@ -6735,7 +6825,7 @@ sub ProcessJPEG($$)
         } elsif ($marker == 0xe1) {         # APP1 (EXIF, XMP, QVCI, PARROT)
             # (some Kodak cameras don't put a second "\0", and I have seen an
             #  example where there was a second 4-byte APP1 segment header)
-            if ($$segDataPt =~ /^(.{0,4})Exif\0/is) {
+            if ($$segDataPt =~ /^(.{0,4})Exif\0./is) {
                 undef $dumpType;    # (will be dumped here)
                 # this is EXIF data --
                 # get the data block (into a common variable)
@@ -7457,6 +7547,8 @@ sub ProcessJPEG($$)
             delete $extendedXMP{$guid};
         }
     }
+    # print verbose MD5 message if necessary
+    print $out "$$self{INDENT}(ImageDataMD5: $md5size bytes of JPEG image data)\n" if $md5size and $verbose;
     # calculate JPEGDigest if requested
     if (@dqt) {
         require Image::ExifTool::JPEGDigest;

data/bin/lib/Image/ExifTool.pod

@@ -1727,10 +1727,11 @@ sensitive, and may be prefixed by one or more family 0, 1, 2 or 7 group
 names with optional leading family numbers, separated by colons (eg.
 'exif:iso'). A leading '-' indicates tags to be excluded (eg. '-comment'),
 or a trailing '#' causes the ValueConv value to be copied (same as setting
-the Type option to 'ValueConv' for this tag only).  Wildcards ('*' and '?')
-may be used in the tag name.  A tag name of '*' is commonly used when a
-group is specified to copy all tags in the group (eg. 'XMP:*').  A special
-feature allows tag names of the form 'DSTTAGE<lt>SRCTAG' (or
+the Type option to 'ValueConv' for this tag only).  A leading '+' sets the
+Replace option to 0 on a per-tag basis (see Options below).  Wildcards ('*'
+and '?') may be used in the tag name.  A tag name of '*' is commonly used
+when a group is specified to copy all tags in the group (eg. 'XMP:*').  A
+special feature allows tag names of the form 'DSTTAGE<lt>SRCTAG' (or
 'SRCTAGE<gt>DSTTAG') to be specified to copy information to a tag with a
 different name or a specified group.  Both 'SRCTAG' and 'DSTTAG' may contain
 wildcards and/or be prefixed by a group name (eg.
@@ -1769,7 +1770,9 @@ copies all information while preserving the original family 1 groups, while
 The options are the same was for L</SetNewValue>, and are passed directly
 to L</SetNewValue> internally, with a few exceptions:
 
-- The Replace option defaults to 1 instead of 0 as with L</SetNewValue>.
+- The Replace option defaults to 1 instead of 0 as with L</SetNewValue>,
+however the tag name argument may be prefixed with '+' to set the Replace
+option to 0 for this argument only.
 
 - The AddValue or DelValue option is set for individual tags if '+>' or '->'
 (or '+E<lt>' or '-E<lt>') are used.
@@ -1870,6 +1873,31 @@ None.
 
 =back
 
+=head2 SetAlternateFile
+
+Specify alternate file from which to read metadata.  Tags from the alternate
+file are available after L</ExtractInfo> is called or during a call to
+L</SetNewValuesFromFile> by using a family 8 group name (eg. 'File1' in the
+example below).
+
+    $exifTool->SetAlternateFile(File1 => 'images/test1.jpg');
+
+=over 4
+
+=item Inputs:
+
+0) ExifTool object reference
+
+1) Family 8 group name, case insensitive (eg. 'File1', 'File2'...)
+
+2) Name of alternate input file, or undef to reset
+
+=item Return Values:
+
+1 on success, or 0 if the group name is invalid.
+
+=back
+
 =head2 SetFileModifyDate
 
 Write the filesystem modification or creation time from the new value of the
@@ -2088,6 +2116,7 @@ The group family numbers are currently available:
     5) Metadata Path            (eg. JPEG-APP1-IFD0-ExifIFD)
     6) EXIF/TIFF Format         (eg. int8u, int32u, undef, string)
     7) Tag ID                   (eg. ID-271, ID-rights, ID-a9aut)
+    8) Alternate File Number    (eg. File1, File2, File3...)
 
 Families 0 and 1 are based on the file structure, and are similar except
 that family 1 is more specific and sub-divides some groups to give more
@@ -2140,6 +2169,8 @@ non-numerical ID's may or may not have characters other than [-_A-Za-z0-9]
 converted to hex.  Note that unlike other group names, the tag ID's of
 family 7 group names are case sensitive (but the leading "ID-" is not).
 
+Family 8 specifies the alternate file set from a call to L</SetAlternateFile>.
+
 See L</GetAllGroups [static]> for complete lists of group names.
 
 =back
@@ -2392,6 +2423,10 @@ leading "0x" if the HexTagIDs option is set, or decimal otherwise.
 Characters in non-numerical ID's which are not valid in a group name are
 returned as 2 hex digits.)
 
+=item Family 8 (Alternate File):
+
+File#
+
 =back
 
 Note:  This function may also be called as an ExifTool member function to

data/bin/perl-Image-ExifTool.spec

@@ -1,6 +1,6 @@
 Summary: perl module for image data extraction
 Name: perl-Image-ExifTool
-Version: 12.58
+Version: 12.60
 Release: 1
 License: Artistic/GPL
 Group: Development/Libraries/Perl

data/lib/exiftool_vendored/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ExiftoolVendored
-  VERSION = Gem::Version.new('12.58.0')
+  VERSION = Gem::Version.new('12.60.0')
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: exiftool_vendored
 version: !ruby/object:Gem::Version
-  version: 12.58.0
+  version: 12.60.0
 platform: ruby
 authors:
 - Matthew McEachen
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-03-15 00:00:00.000000000 Z
+date: 2023-04-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: exiftool