exiftool-vendored.pl 12.97.0 → 13.0.0

package/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 = '13.00';
 $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(
@@ -740,7 +740,7 @@ my %fileDescription = (
     OGV  => 'video/ogg',
     ONP  => 'application/on1',
     ORF  => 'image/x-olympus-orf',
-    OTF  => 'application/x-font-otf',
+    OTF  => 'application/font-otf',
     PAGES=> 'application/x-iwork-pages-sffpages',
     PBM  => 'image/x-portable-bitmap',
     PCD  => 'image/x-photo-cd',
@@ -798,8 +798,8 @@ my %fileDescription = (
     THMX => 'application/vnd.ms-officetheme',
     TIFF => 'image/tiff',
     Torrent => 'application/x-bittorrent',
-    TTC  => 'application/x-font-ttf',
-    TTF  => 'application/x-font-ttf',
+    TTC  => 'application/font-ttf',
+    TTF  => 'application/font-ttf',
     TXT  => 'text/plain',
     VCard=> 'text/vcard',
     VRD  => 'application/octet-stream', #PH (NC)
@@ -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 {

package/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

package/bin/perl-Image-ExifTool.spec

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

package/bin/pp_build_exe.args

@@ -21,10 +21,10 @@
 #           10) Copy zip archive to web servers.
 #           11) Update zip file version in link and text of html/index.html.
 #------------------------------------------------------------------------------
--T exiftool-12.87
-#--info=FileVersion=12.8.7.0
-#--info=ProductVersion=12.8.7.0
-##"--info=Build Date=2024:06:13 09:46:51-04:00"
+-T exiftool-12.99p
+#--info=FileVersion=12.9.9.0
+#--info=ProductVersion=12.9.9.0
+##"--info=Build Date=2024:10:10 16:54:18-04:00"
 ##"--info=Bundled Perl Version=ActivePerl 5.24.0"
 ##"--info=LegalCopyright=Copyright (c) 2003-2024, Phil Harvey"
 ##"--info=ProductName=ExifTool"

package/bin/windows_exiftool.txt

@@ -222,6 +222,7 @@ OPTIONS
 
     Special features
 
+      -diff FILE2                      Compare metadata with another file
       -geotag TRKFILE                  Geotag images from specified GPS log
       -globalTimeShift SHIFT           Shift all formatted date/time values
       -use MODULE                      Add features from plug-in module
@@ -311,8 +312,8 @@ OPTIONS
          Write a new value for the specified tag (eg. "-comment=wow"), or
          delete the tag if no *VALUE* is given (eg. "-comment="). "+=" and
          "-=" are used to add or remove existing entries from a list, or to
-         shift date/time values (see Image::ExifTool::Shift.pl and note 6
-         below for more details). "+=" may also be used to increment
+         shift date/time values (see Image::ExifTool::Shift.pl and notes 6
+         and 7 below for more details). "+=" may also be used to increment
          numerical values (or decrement if *VALUE* is negative), and "-="
          may be used to conditionally delete or replace a tag (see "WRITING
          EXAMPLES" for examples). "^=" is used to write an empty string
@@ -398,6 +399,10 @@ OPTIONS
          copy it to another tag in the same operation, use the
          -globalTimeShift option.
 
+         7) The "+=" operator may not be used to shift a List-type date/time
+         tag (eg. XMP-dc:Date) because "+=" is used to add elements to the
+         list. Instead, the -globalTimeShift option should be used.
+
          Special feature: Integer values may be specified in hexadecimal
          with a leading "0x", and simple rational values may be specified as
          fractions.
@@ -1034,7 +1039,7 @@ OPTIONS
 
          produces output like this:
 
-             -- Generated by ExifTool 12.98 --
+             -- Generated by ExifTool 13.00 --
              File: a.jpg - 2003:10:31 15:44:19
              (f/5.6, 1/60s, ISO 100)
              File: b.jpg - 2006:05:23 11:57:38
@@ -1584,10 +1589,10 @@ OPTIONS
          the corresponding family 8 group name is specified for the tag. See
          the -fileNUM option details for more information.
 
-         5) The -a option has no effect on the evaluation of the expression,
-         and the values of duplicate tags are accessible only by specifying
-         a group name (such as a family 4 instance number, eg. $Copy1:TAG,
-         $Copy2:TAG, etc).
+         5) The -a (Duplicates) option is implied when -if is used without a
+         fast *NUM*, and the values of duplicate tags are accessible by
+         specifying a group name in the expression (such as a family 4
+         instance number, eg. $Copy1:TAG, $Copy2:TAG, etc).
 
          6) A special "OK" UserParam is available to test the success of the
          previous command when -execute was used, and may be used like any
@@ -1849,9 +1854,9 @@ OPTIONS
          The flags are formatted as a comma-separated list of the following
          possible values: Avoid, Binary, List, Mandatory, Permanent,
          Protected, Unknown and Unsafe (see the Tag Name documentation). For
-         XMP List tags, the list type (Alt, Bag or Seq) is added to the
-         flags, and flattened structure tags are indicated by a Flattened
-         flag with 'struct' giving the ID of the parent structure.
+         XMP List tags, the list type (Alt, Bag or Seq) is also given, and
+         flattened structure tags are indicated by a Flattened flag with
+         'struct' giving the ID of the parent structure.
 
          Note that none of the -list options require an input *FILE*.
 
@@ -1864,6 +1869,23 @@ OPTIONS
          as file names, even if they begin with a dash ("-").
 
    Special features
+    -diff *FILE2*
+         Compare metadata in *FILE* with *FILE2*. The *FILE2* name may
+         include filename formatting codes (see the -w option). All
+         extracted tags from the files are compared, but the extracted tags
+         may be controlled by adding -TAG or --TAG options. For example,
+         below is a command to compare all the same-named files in two
+         different directories, ignoring the System tags:
+
+             exiftool DIR1 -diff DIR2/%f.%e --system:all
+
+         The -g and -G options may be used to organize the output by the
+         specified family of groups, with -G1 being the default. The -a
+         option is implied. Adding -v includes a count of the number of tags
+         that are the same in each group. The following text formatting
+         options are valid when -diff is used: -c, -charset, -d, -E, -ec,
+         -ex, -L, -lang, -n, -s, -sep, -struct and -w.
+
     -geotag *TRKFILE*
          Geotag images from the specified GPS track log file. Using the
          -geotag option is equivalent to writing a value to the "Geotag"

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "exiftool-vendored.pl",
-  "version": "12.97.0",
+  "version": "13.0.0",
   "description": "Vendored perl ExifTool for Node.js",
   "main": "./index.js",
   "homepage": "https://github.com/mceachen/exiftool-vendored.pl#readme",
@@ -41,8 +41,8 @@
     }
   },
   "devDependencies": {
-    "mocha": "^10.7.3",
-    "npm-check-updates": "^17.1.3",
+    "mocha": "^10.8.0",
+    "npm-check-updates": "^17.1.9",
     "prettier": "^3.3.3"
   }
 }