exiftool_vendored 12.62.0 → 12.63.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.62';
+$VERSION = '12.63';
 $RELEASE = '';
 @ISA = qw(Exporter);
 %EXPORT_TAGS = (
@@ -114,7 +114,7 @@ sub WriteTIFF($$$);
 sub PackUTF8(@);
 sub UnpackUTF8($);
 sub SetPreferredByteOrder($;$);
-sub ImageDataMD5($$$;$$);
+sub ImageDataHash($$$;$$);
 sub CopyBlock($$$);
 sub CopyFileAttrs($$$);
 sub TimeNow(;$$);
@@ -194,7 +194,7 @@ $defaultLang = 'en';    # default language
                 PSD XMP BMP WPG BPG PPM RIFF AIFF ASF MOV MPEG Real SWF PSP FLV
                 OGG FLAC APE MPC MKV MXF DV PMP IND PGF ICC ITC FLIR FLIF FPF
                 LFP HTML VRD RTF FITS XCF DSS QTIF FPX PICT ZIP GZIP PLIST RAR
-                BZ2 CZI TAR  EXE EXR HDR CHM LNK WMF AVC DEX DPX RAW Font RSRC
+                7Z BZ2 CZI TAR EXE EXR HDR CHM LNK WMF AVC DEX DPX RAW Font RSRC
                 M2TS MacOS PHP PCX DCX DWF DWG DXF WTV Torrent VCard LRI R3D AA
                 PDB PFM2 MRC LIF JXL MOI ISO ALIAS JSON MP3 DICOM PCD ICO TXT);
 
@@ -228,6 +228,7 @@ my %createTypes = map { $_ => 1 } qw(XMP ICC MIE VRD DR4 EXIF EXV);
    '3GP' => ['MOV',  '3rd Gen. Partnership Project audio/video'],
    '3GP2'=>  '3G2',
    '3GPP'=>  '3GP',
+   '7Z'  => ['7Z', '7z archive'],
     A    => ['EXE',  'Static library'],
     AA   => ['AA',   'Audible Audiobook'],
     AAE  => ['PLIST','Apple edit information'],
@@ -590,6 +591,7 @@ my %fileDescription = (
 #  types may be specified by some modules, eg. QuickTime.pm and RIFF.pm)
 %mimeType = (
    '3FR' => 'image/x-hasselblad-3fr',
+   '7Z'  => 'application/x-7z-compressed',
     AA   => 'audio/audible',
     AAE  => 'application/vnd.apple.photos',
     AI   => 'application/vnd.adobe.illustrator',
@@ -1827,15 +1829,16 @@ my %systemTagsNotes = (
             if specifically requested
         },
     },
-    ImageDataMD5 => {
+    ImageDataHash => {
         Notes => q{
-            MD5 of image data. Generated only if specifically requested for JPEG, TIFF,
+            Hash of image data. Generated only if specifically requested for JPEG, TIFF,
             PNG, CRW, CR3, MRW, RAF, X3F, IIQ, JP2, JXL, HEIC and AVIF images, MOV/MP4
-            videos, and some RIFF-based files such as AVI, WAV and WEBP.  The MD5
+            videos, and some RIFF-based files such as AVI, WAV and WEBP.  The hash
             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.
+            audio data for MOV/MP4.  The L<XMP-et:OriginalImageHash and
+            XMP-et:OriginalImageHashType tags|XMP.html#ExifTool> provide a way to store the this hash value
+            and the hash type in the file.
         },
     },
 );
@@ -2314,6 +2317,12 @@ sub Options($$;@)
                 $newVal = defined $newVal ? "$oldVal|$newVal" : $oldVal;
             }
             $$options{$param} = $newVal;
+        } elsif ($param eq 'ImageHashType') {
+            if (defined $newVal and $newVal =~ /^(MD5|SHA256|SHA512)$/i) {
+                $$options{$param} = uc($newVal);
+            } else {
+                warn("Invalid $param setting '${newVal}'\n"), return $oldVal;
+            }
         } else {
             if ($param eq 'Escape') {
                 # set ESCAPE_PROC
@@ -2396,6 +2405,7 @@ sub ClearOptions($)
         HtmlDumpBase => undef,  # base address for HTML dump
         IgnoreMinorErrors => undef, # ignore minor errors when reading/writing
         IgnoreTags  => undef,   # list of tags to ignore when extracting
+        ImageHashType => 'MD5', # image hash algorithm
         Lang        => $defaultLang,# localized language for descriptions etc
         LargeFileSupport => undef,  # flag indicating support of 64-bit file offsets
         List        => undef,   # extract lists of PrintConv values into arrays [no longer documented]
@@ -2518,10 +2528,17 @@ sub ExtractInfo($;@)
             }
         }
         
-        # create MD5 object if ImageDataMD5 is requested
-        if ($$req{imagedatamd5} and not $$self{ImageDataMD5}) {
-            if (require Digest::MD5) {
-                $$self{ImageDataMD5} = Digest::MD5->new;
+        # create Hash object if ImageDataHash is requested
+        if ($$req{imagedatahash} and not $$self{ImageDataHash}) {
+            my $imageHashType = $self->Options('ImageHashType');
+            if ($imageHashType =~ /^SHA(256|512)$/i) {
+                if (require Digest::SHA) {
+                    $$self{ImageDataHash} = Digest::SHA->new($1);
+                } else {
+                    $self->WarnOnce("Install Digest::SHA to calculate image data SHA$1");
+                }
+            } elsif (require Digest::MD5) {
+                $$self{ImageDataHash} = Digest::MD5->new;
             } else {
                 $self->WarnOnce('Install Digest::MD5 to calculate image data MD5');
             }
@@ -2915,10 +2932,13 @@ sub ExtractInfo($;@)
         # restore necessary members when exiting re-entrant code
         $$self{$_} = $$reEntry{$_} foreach keys %$reEntry;
         SetByteOrder($saveOrder);
-    } elsif ($$self{ImageDataMD5}) {
-        my $digest = $$self{ImageDataMD5}->hexdigest;
+    } elsif ($$self{ImageDataHash}) {
+        my $digest = $$self{ImageDataHash}->hexdigest;
         # (don't store empty digest)
-        $self->FoundTag(ImageDataMD5 => $digest) unless $digest eq 'd41d8cd98f00b204e9800998ecf8427e';
+        $self->FoundTag(ImageDataHash => $digest) unless
+            $digest eq 'd41d8cd98f00b204e9800998ecf8427e' or
+            $digest eq 'e3b0c44298fc1c149afbf4c8996fb92427ae41e4649b934ca495991b7852b855' or
+            $digest eq 'cf83e1357eefb8bdf1542850d66d8007d620e4050b5715dc83f4a921d36ce9ce47d0d13c5d85f2b0ff8318d2877eec2f63b931bd47417a81a538327af927da3e';
     }
 
     # ($type may be undef without an Error when processing sub-documents)
@@ -5582,6 +5602,7 @@ my %formatSize = (
     ifd => 4,
     ifd64 => 8,
     ue7 => 1,
+    utf8 => 1, # (Exif 3.0)
 );
 my %readValueProc = (
     int8s => \&Get8s,
@@ -6487,15 +6508,15 @@ sub ProcessJPEG($$)
     my $req = $$self{REQ_TAG_LOOKUP};
     my $htmlDump = $$self{HTML_DUMP};
     my %dumpParms = ( Out => $out );
-    my ($ch, $s, $length, $md5, $md5size);
+    my ($ch, $s, $length, $hash, $hashsize);
     my ($success, $wantTrailer, $trailInfo, $foundSOS, $gotSize, %jumbfChunk);
     my (@iccChunk, $iccChunkCount, $iccChunksTotal, @flirChunk, $flirCount, $flirTotal);
     my ($preview, $scalado, @dqt, $subSampling, $dumpEnd, %extendedXMP);
 
-    # get pointer to MD5 object if it exists and we are the top-level JPEG or JP2
+    # get pointer to hash object if it exists and we are the top-level JPEG or JP2
     if ($$self{FILE_TYPE} =~ /^(JPEG|JP2)$/ and not $$self{DOC_NUM}) {
-        $md5 = $$self{ImageDataMD5};
-        $md5size = 0;
+        $hash = $$self{ImageDataHash};
+        $hashsize = 0;
     }
 
     # check to be sure this is a valid JPG (or J2C, or EXV) file
@@ -6544,7 +6565,7 @@ sub ProcessJPEG($$)
 #
 # read ahead to the next segment unless we have reached EOI, SOS or SOD
 #
-        unless ($marker and ($marker==0xd9 or ($marker==0xda and not $wantTrailer and not $md5) or
+        unless ($marker and ($marker==0xd9 or ($marker==0xda and not $wantTrailer and not $hash) or
             $marker==0x93))
         {
             # read up to next marker (JPEG markers begin with 0xff)
@@ -6576,19 +6597,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 or
+            } elsif ($hash 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));
+                # calculate hash for image data (includes leading ff d9 but not trailing ff da)
+                $hash->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;
+                $hash->add($buff);
+                $hashsize += $skipped + 2;
             }
             # read second segment too if this was the first
             next unless defined $marker;
@@ -6800,7 +6821,7 @@ sub ProcessJPEG($$)
                 next if $trailInfo or $wantTrailer or $verbose > 2 or $htmlDump;
             }
             # must scan to EOI if Validate or JpegCompressionFactor used
-            next if $$options{Validate} or $calcImageLen or $$req{trailer} or $md5;
+            next if $$options{Validate} or $calcImageLen or $$req{trailer} or $hash;
             # nothing interesting to parse after start of scan (SOS)
             $success = 1;
             last;   # all done parsing file
@@ -6808,9 +6829,9 @@ sub ProcessJPEG($$)
             pop @$path;
             $verbose and print $out "JPEG SOD\n";
             $success = 1;
-            if ($md5 and $$self{FILE_TYPE} eq 'JP2') {
+            if ($hash and $$self{FILE_TYPE} eq 'JP2') {
                 my $pos = $raf->Tell();
-                $self->ImageDataMD5($raf, undef, 'SOD');
+                $self->ImageDataHash($raf, undef, 'SOD');
                 $raf->Seek($pos, 0);
             }
             next if $verbose > 2 or $htmlDump;
@@ -6829,7 +6850,7 @@ sub ProcessJPEG($$)
             or ($$options{RequestAll} and $$options{RequestAll} > 2)))
         {
             my $num = unpack('C',$$segDataPt) & 0x0f;   # get table index
-            $dqt[$num] = $$segDataPt if $num < 4;       # save for MD5 calculation
+            $dqt[$num] = $$segDataPt if $num < 4;       # save for hash calculation
         }
         # handle all other markers
         my $dumpType = '';
@@ -7612,8 +7633,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;
+    # print verbose hash message if necessary
+    print $out "$$self{INDENT}(ImageDataHash: $hashsize bytes of JPEG image data)\n" if $hashsize and $verbose;
     # calculate JPEGDigest if requested
     if (@dqt) {
         require Image::ExifTool::JPEGDigest;
@@ -7889,8 +7910,8 @@ sub DoProcessTIFF($$;$)
         if ($$self{TIFF_TYPE} eq 'TIFF') {
             $self->FoundTag(PageCount => $$self{PageCount}) if $$self{MultiPage};
         }
-        if ($$self{ImageDataMD5} and $$self{A100DataOffset} and $raf->Seek($$self{A100DataOffset},0)) {
-            $self->ImageDataMD5($raf, undef, 'A100');
+        if ($$self{ImageDataHash} and $$self{A100DataOffset} and $raf->Seek($$self{A100DataOffset},0)) {
+            $self->ImageDataHash($raf, undef, 'A100');
         }
         return 1;
     }

data/bin/lib/Image/ExifTool.pod

@@ -65,10 +65,11 @@ supported by ExifTool (r = read, w = write, c = create):
 
   File Types
   ------------+-------------+-------------+-------------+------------
-  360   r/w   | DR4   r/w/c | JNG   r/w   | ODP   r     | RSRC  r
-  3FR   r     | DSS   r     | JP2   r/w   | ODS   r     | RTF   r
-  3G2   r/w   | DV    r     | JPEG  r/w   | ODT   r     | RW2   r/w
-  3GP   r/w   | DVB   r/w   | JSON  r     | OFR   r     | RWL   r/w
+  360   r/w   | DPX   r     | J2C   r     | O     r     | RIFF  r
+  3FR   r     | DR4   r/w/c | JNG   r/w   | ODP   r     | RSRC  r
+  3G2   r/w   | DSS   r     | JP2   r/w   | ODS   r     | RTF   r
+  3GP   r/w   | DV    r     | JPEG  r/w   | ODT   r     | RW2   r/w
+  7Z    r     | DVB   r/w   | JSON  r     | OFR   r     | RWL   r/w
   A     r     | DVR-MS r    | JXL   r     | OGG   r     | RWZ   r
   AA    r     | DYLIB r     | K25   r     | OGV   r     | RM    r
   AAE   r     | EIP   r     | KDC   r     | ONP   r     | SEQ   r
@@ -107,7 +108,6 @@ supported by ExifTool (r = read, w = write, c = create):
   DNG   r/w   | INX   r     | NKSC  r/w   | RAM   r     |
   DOC   r     | ISO   r     | NRW   r/w   | RAR   r     |
   DOCX  r     | ITC   r     | NUMBERS r   | RAW   r/w   |
-  DPX   r     | J2C   r     | O     r     | RIFF  r     |
 
   Meta Information
   ----------------------+----------------------+---------------------
@@ -301,6 +301,10 @@ of tag keys, and with other L</Sort> settings the entries may not be in the
 same order as requested.)  If a requested tag doesn't exist, a tag key is
 still generated, but the tag value is undefined.
 
+B<Note:> Do not reuse this list in subsequent calls to L</ImageInfo> because
+it returns tag keys, not names, and the list will grow for each call
+resulting in increasingly slower performance.
+
 =item HASH ref
 
 Reference to a hash containing the options settings valid for this call
@@ -569,7 +573,9 @@ Flag to generate Composite tags when extracting information.  Default is 1.
 =item Compress
 
 Flag to write new values in compressed format if possible.  Has no effect
-unless Compress::Zlib is installed.  Default is undef.
+unless the relevant compression library is available.  Valid when writing
+metadata to PNG, JXL or MIE images.  Setting this to zero causes JXL
+metadata to be rewritten as uncompressed when edited.  Default is undef.
 
 =item CoordFormat
 
@@ -791,6 +797,11 @@ allowed.  A special tag name of "All" may be used to ignore all tags except
 those specified by the L</RequestTags> option.  Set to undef to clear the
 previous IgnoreTags list.  Default is undef.
 
+=item ImageHashType
+
+Sets type of hash algorithem used for the ImageDataHash tag calculation. 
+Supported options are 'MD5', 'SHA256', and 'SHA512'.  Default is 'MD5'.
+
 =item Lang
 
 Localized language for exiftool tag descriptions, etc.  Available languages

data/bin/perl-Image-ExifTool.spec

@@ -1,6 +1,6 @@
 Summary: perl module for image data extraction
 Name: perl-Image-ExifTool
-Version: 12.62
+Version: 12.63
 Release: 1
 License: Artistic/GPL
 Group: Development/Libraries/Perl
@@ -22,10 +22,11 @@ supported by ExifTool (r = read, w = write, c = create):
 
   File Types
   ------------+-------------+-------------+-------------+------------
-  360   r/w   | DR4   r/w/c | JNG   r/w   | ODP   r     | RSRC  r
-  3FR   r     | DSS   r     | JP2   r/w   | ODS   r     | RTF   r
-  3G2   r/w   | DV    r     | JPEG  r/w   | ODT   r     | RW2   r/w
-  3GP   r/w   | DVB   r/w   | JSON  r     | OFR   r     | RWL   r/w
+  360   r/w   | DPX   r     | J2C   r     | O     r     | RIFF  r
+  3FR   r     | DR4   r/w/c | JNG   r/w   | ODP   r     | RSRC  r
+  3G2   r/w   | DSS   r     | JP2   r/w   | ODS   r     | RTF   r
+  3GP   r/w   | DV    r     | JPEG  r/w   | ODT   r     | RW2   r/w
+  7Z    r     | DVB   r/w   | JSON  r     | OFR   r     | RWL   r/w
   A     r     | DVR-MS r    | JXL   r     | OGG   r     | RWZ   r
   AA    r     | DYLIB r     | K25   r     | OGV   r     | RM    r
   AAE   r     | EIP   r     | KDC   r     | ONP   r     | SEQ   r
@@ -64,7 +65,6 @@ supported by ExifTool (r = read, w = write, c = create):
   DNG   r/w   | INX   r     | NKSC  r/w   | RAM   r     |
   DOC   r     | ISO   r     | NRW   r/w   | RAR   r     |
   DOCX  r     | ITC   r     | NUMBERS r   | RAW   r/w   |
-  DPX   r     | J2C   r     | O     r     | RIFF  r     |
 
   Meta Information
   ----------------------+----------------------+---------------------

data/lib/exiftool_vendored/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: exiftool_vendored
 version: !ruby/object:Gem::Version
-  version: 12.62.0
+  version: 12.63.0
 platform: ruby
 authors:
 - Matthew McEachen
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-05-03 00:00:00.000000000 Z
+date: 2023-06-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: exiftool
@@ -258,6 +258,7 @@ files:
 - bin/lib/File/RandomAccess.pod
 - bin/lib/Image/ExifTool.pm
 - bin/lib/Image/ExifTool.pod
+- bin/lib/Image/ExifTool/7Z.pm
 - bin/lib/Image/ExifTool/AES.pm
 - bin/lib/Image/ExifTool/AFCP.pm
 - bin/lib/Image/ExifTool/AIFF.pm