exiftool_vendored 12.97.0 → 12.99.0

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

@@ -39,8 +39,7 @@ sub SerializeStruct($$;$)
 
     if (ref $obj eq 'HASH') {
         # support hashes with ordered keys
-        my @keys = $$obj{_ordered_keys_} ? @{$$obj{_ordered_keys_}} : sort keys %$obj;
-        foreach $key (@keys) {
+        foreach $key (Image::ExifTool::OrderedKeys($obj)) {
             my $hdr = $sfmt ? EscapeJSON($key) . ':' : $key . '=';
             push @vals, $hdr . SerializeStruct($et, $$obj{$key}, '}');
         }
@@ -218,7 +217,7 @@ sub DumpStruct($;$)
     $indent or $indent = '';
     if (ref $obj eq 'HASH') {
         print "{\n";
-        foreach (sort keys %$obj) {
+        foreach (Image::ExifTool::OrderedKeys($obj)) {
             print "$indent  $_ = ";
             DumpStruct($$obj{$_}, "$indent  ");
         }
@@ -253,8 +252,10 @@ sub CheckStruct($$$)
     ref $struct eq 'HASH' or return wantarray ? (undef, "Expecting $strName structure") : undef;
 
     my ($key, $err, $warn, %copy, $rtnVal, $val);
+    # copy the ordered keys if they exist
+    $copy{_ordered_keys_} = [ ] if $$struct{_ordered_keys_};
 Key:
-    foreach $key (keys %$struct) {
+    foreach $key (Image::ExifTool::OrderedKeys($struct)) {
         my $tag = $key;
         # allow trailing '#' to disable print conversion on a per-field basis
         my ($type, $fieldInfo);
@@ -377,6 +378,7 @@ Key:
             $copy{$tag} = \@copy;
         } elsif ($$fieldInfo{Struct}) {
             $warn = "Improperly formed structure in $strName $tag";
+            next;
         } else {
             $et->Sanitize(\$$struct{$key});
             ($val,$err) = $et->ConvInv($$struct{$key},$fieldInfo,$tag,$strName,$type,'');
@@ -387,6 +389,7 @@ Key:
             # turn this into a list if necessary
             $copy{$tag} = $$fieldInfo{List} ? [ $val ] : $val;
         }
+        push @{$copy{_ordered_keys_}}, $tag if $copy{_ordered_keys_}; # save ordered keys
     }
     if (%copy or not $warn) {
         $rtnVal = \%copy;
@@ -562,7 +565,7 @@ sub AddNewStruct($$$$$$)
     # after all valid structure fields, which is necessary when serializing the XMP later)
     %$struct or $$struct{'~dummy~'} = '';
 
-    foreach $tag (sort keys %$struct) {
+    foreach $tag (Image::ExifTool::OrderedKeys($struct)) {
         my $fieldInfo = $$strTable{$tag};
         unless ($fieldInfo) {
             next unless $tag eq '~dummy~'; # check for dummy field
@@ -652,7 +655,8 @@ sub ConvertStruct($$$$;$)
         my (%struct, $key);
         my $table = $$tagInfo{Table};
         $parentID = $$tagInfo{TagID} unless $parentID;
-        foreach $key (keys %$value) {
+        $struct{_ordered_keys_} = [ ] if $$value{_ordered_keys_};
+        foreach $key (Image::ExifTool::OrderedKeys($value)) {
             my $tagID = $parentID . ucfirst($key);
             my $flatInfo = $$table{$tagID};
             unless ($flatInfo) {
@@ -669,7 +673,11 @@ sub ConvertStruct($$$$;$)
             } else {
                 $v = $et->GetValue($flatInfo, $type, $v);
             }
-            $struct{$key} = $v if defined $v;  # save the converted value
+            if (defined $v) {
+                $struct{$key} = $v;  # save the converted value
+                # maintain ordered keys if necessary
+                push @{$struct{_ordered_keys_}}, $key if $struct{_ordered_keys_};
+            }
         }
         return \%struct;
     } elsif (ref $value eq 'ARRAY') {

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);
 
-$VERSION = '12.97';
+$VERSION = '12.99';
 $RELEASE = '';
 @ISA = qw(Exporter);
 %EXPORT_TAGS = (
@@ -37,7 +37,7 @@ $RELEASE = '';
     Public => [qw(
         ImageInfo AvailableOptions GetTagName GetShortcuts GetAllTags
         GetWritableTags GetAllGroups GetDeleteGroups GetFileType CanWrite
-        CanCreate AddUserDefinedTags
+        CanCreate AddUserDefinedTags OrderedKeys
     )],
     # exports not part of the public API, but used by ExifTool modules:
     DataAccess => [qw(
@@ -1466,12 +1466,12 @@ my %systemTagsNotes = (
         PrintConv => sub {
             my ($mask, $val) = (0400, oct(shift));
             my %types = (
-                0010000 => 'p',
-                0020000 => 'c',
-                0040000 => 'd',
-                0060000 => 'b',
-                0120000 => 'l',
-                0140000 => 's',
+                0010000 => 'p', # FIFO
+                0020000 => 'c', # character special file
+                0040000 => 'd', # directory
+                0060000 => 'b', # block special file
+                0120000 => 'l', # sym link
+                0140000 => 's', # socket link
             );
             my $str = $types{$val & 0170000} || '-';
             while ($mask) {
@@ -2292,6 +2292,7 @@ sub new
     $$self{PATH} = [ ];         # (this too)
     $$self{DEL_GROUP} = { };    # lookup for groups to delete when writing
     $$self{SAVE_COUNT} = 0;     # count calls to SaveNewValues()
+    $$self{NV_COUNT} = 0;       # count of NEW_VALUE entries
     $$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
@@ -2517,6 +2518,8 @@ sub Options($$;@)
             # set Compact and XMPShorthand options, preserving backward compatibility
             my ($p, %compact);
             foreach $p ('Compact','XMPShorthand') {
+                # (allow setting from a HASH (undocumented)
+                ref $newVal eq 'HASH' and %compact = %{$newVal}, next;
                 my $val = $param eq $p ? $newVal : $$options{Compact}{$p};
                 if (defined $val) {
                     my @v = ($val =~ /\w+/g);
@@ -4195,6 +4198,16 @@ sub CanCreate($)
     return 0;
 }
 
+#------------------------------------------------------------------------------
+# Return list of ordered keys if available, otherwise just sort alphabetically
+# Inputs: 0) hash ref
+# Returns: List of ordered/sorted keys
+sub OrderedKeys($)
+{
+    my $hash = shift;
+    return $$hash{_ordered_keys_} ? @{$$hash{_ordered_keys_}} : sort keys %$hash;
+}
+
 #==============================================================================
 # Functions below this are not part of the public API
 
@@ -7290,7 +7303,10 @@ sub ProcessJPEG($$;$)
             last;   # all done parsing file
         } elsif (defined $markerLenBytes{$marker}) {
             # handle other stand-alone markers and segments we skipped over
-            $verbose and $marker and print $out "${indent}JPEG $markerName\n";
+            if ($verbose and $marker) {
+                next if $verbose < 4 and ($marker & 0xf8) == 0xd0;
+                print $out "${indent}JPEG $markerName\n";
+            }
             next;
         } elsif ($marker == 0xdb and length($$segDataPt) and    # DQT
             # save the DQT data only if JPEGDigest has been requested
@@ -7901,8 +7917,17 @@ sub ProcessJPEG($$;$)
                 my $seq = Get32u($segDataPt, 4);
                 my $len = Get32u($segDataPt, 8);
                 my $type = substr($$segDataPt, 12, 4);
+                # a Microsoft bug writes $len and $type incorrectly as little-endian
+                if ($type eq 'bmuj') {
+                    $self->WarnOnce('Wrong byte order in C2PA APP11 JUMBF header');
+                    $type = 'jumb';
+                    $len = unpack('x8V', $$segDataPt);
+                    # fix the header
+                    substr($$segDataPt, 8, 8) = Set32u($len) . $type;
+                }
                 my $hdrLen;
                 if ($len == 1 and length($$segDataPt) >= 24) {
+                    # (haven't seen this with the Microsoft bug)
                     $len = Get64u($$segDataPt, 16);
                     $hdrLen = 16;
                 } else {

data/bin/lib/Image/ExifTool.pod

@@ -332,13 +332,14 @@ L</ImageInfo>:
 
 Values of the returned hash are usually simple scalars, but a scalar
 reference is used to indicate binary data and an array reference may be used
-to indicate a list.  Also, a hash reference may be returned if the L</Struct>
-option is used.  Lists of values are joined by commas into a single
-string only if the PrintConv option is enabled and the ListJoin option is
-enabled (which are the defaults).  Note that binary values are not
-necessarily extracted unless specifically requested, or the Binary option is
-enabled and the tag is not specifically excluded.  If not extracted the
-value is a reference to a string of the form "Binary data ##### bytes".
+to indicate a list.  Also, a hash reference may be returned if the
+L</Struct> option is used (see the L</OrderedKeys> option to obtain the hash
+keys).  Lists of values are joined by commas into a single string only if
+the PrintConv option is enabled and the ListJoin option is enabled (which
+are the defaults).  Note that binary values are not necessarily extracted
+unless specifically requested, or the Binary option is enabled and the tag
+is not specifically excluded.  If not extracted the value is a reference to
+a string of the form "Binary data ##### bytes".
 
 The code below gives an example of how to handle these return values, as
 well as illustrating the use of other ExifTool functions:
@@ -1089,7 +1090,9 @@ values in standard format).
 
 Flag to return XMP structures as hash references instead of flattening into
 individual tags.  Has no effect when writing since both flattened and
-structured tags may always be written.  Possible values are:
+structured tags may always be written.  A special "_ordered_keys_" element
+containing a list of ordered keys may exist if the structure elements are
+ordered (see the L<OrderedKeys> method).  Possible values are:
 
   undef - (default) Same as 0 for reading, 2 for copying
     0   - Read/copy flattened tags
@@ -2749,6 +2752,26 @@ details on the elements of the tag information hash.
 
 =back
 
+=head2 OrderedKeys [static]
+
+Return a list of ordered keys from a tag value that is a HASH reference
+when the Struct option is used.
+
+    use Image::ExifTool ':Public';
+    my @keys = OrderedKeys($structRef);
+
+=over 4
+
+=item Inputs:
+
+0) Structure HASH reference
+
+=item Return Value:
+
+List of ordered keys, or sorted alphabetically if not ordered.
+
+=back
+
 =head1 CHARACTER ENCODINGS
 
 Certain meta information formats allow coded character sets other than plain

data/bin/perl-Image-ExifTool.spec

@@ -1,6 +1,6 @@
 Summary: perl module for image data extraction
 Name: perl-Image-ExifTool
-Version: 12.97
+Version: 12.99
 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.97.0')
+  VERSION = Gem::Version.new('12.99.0')
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: exiftool_vendored
 version: !ruby/object:Gem::Version
-  version: 12.97.0
+  version: 12.99.0
 platform: ruby
 authors:
 - Matthew McEachen
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-09-25 00:00:00.000000000 Z
+date: 2024-10-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: exiftool