exiftool-vendored.exe 12.96.0 → 12.97.0

package/README.md

@@ -3,8 +3,7 @@
 Provides the win32 distribution of [ExifTool](http://www.sno.phy.queensu.ca/~phil/exiftool/) to [node](https://nodejs.org/en/).
 
 [![npm version](https://img.shields.io/npm/v/exiftool-vendored.exe.svg)](https://www.npmjs.com/package/exiftool-vendored.exe)
-[![CI](https://github.com/photostructure/exiftool-vendored.exe/workflows/Node.js%20CI/badge.svg?branch=main)](https://github.com/photostructure/exiftool-vendored.exe/actions?query=workflow%3A%22Node.js+CI%22)
-
+[![Node.js CI](https://github.com/photostructure/exiftool-vendored.exe/actions/workflows/node.js.yml/badge.svg?branch=main)](https://github.com/photostructure/exiftool-vendored.exe/actions/workflows/node.js.yml)
 
 ## Usage
 

package/bin/exiftool_files/exiftool.pl

@@ -11,7 +11,7 @@ use strict;
 use warnings;
 require 5.004;
 
-my $version = '12.96';
+my $version = '12.97';
 
 # add our 'lib' directory to the include list BEFORE 'use Image::ExifTool'
 my $exePath;
@@ -4298,17 +4298,20 @@ sub Num2Alpha($)
 sub NextUnusedFilename($;$)
 {
     my ($fmt, $okfile) = @_;
-    return $fmt unless $fmt =~ /%[-+]?\d*\.?\d*[lun]?[cC]/;
+    return $fmt unless $fmt =~ /%[-+]?\d*[.:]?\d*[lun]?[cC]/;
     my %sep = ( '-' => '-', '+' => '_' );
     my ($copy, $alpha) = (0, 'a');
+    my $lastFile;
     for (;;) {
         my ($filename, $pos) = ('', 0);
-        while ($fmt =~ /(%([-+]?)(\d*)(\.?)(\d*)([lun]?)([cC]))/g) {
+        while ($fmt =~ /(%([-+]?)(\d*)([.:]?)(\d*)([lun]?)([cC]))/g) {
             $filename .= substr($fmt, $pos, pos($fmt) - $pos - length($1));
             $pos = pos($fmt);
             my ($sign, $wid, $dec, $wid2, $mod, $tok) = ($2, $3 || 0, $4, $5 || 0, $6, $7);
             my $seq;
             if ($tok eq 'C') {
+                # increment sequence number for %C on collision if ':' is used
+                $sign eq '-' ? ++$seqFileDir : ++$seqFileNum if $copy and $dec eq ':';
                 $seq = $wid + ($sign eq '-' ? $seqFileDir : $seqFileNum) - 1;
                 $wid = $wid2;
             } else {
@@ -4337,6 +4340,8 @@ sub NextUnusedFilename($;$)
             my ($fn, $ok) = (AbsPath($filename), AbsPath($okfile));
             return $okfile if defined $fn and defined $ok and $fn eq $ok;
         }
+        return $filename if defined $lastFile and $lastFile eq $filename;
+        $lastFile = $filename;
         ++$copy;
         ++$alpha;
     }

package/bin/exiftool_files/lib/Image/ExifTool/Canon.pm

@@ -6999,6 +6999,7 @@ my %ciMaxFocal = (
             314 => 'Canon RF 24-105mm F2.8 L IS USM Z', #42
             315 => 'Canon RF-S 10-18mm F4.5-6.3 IS STM', #42
             316 => 'Canon RF 35mm F1.4 L VCM', #42
+            318 => 'Canon RF 28-70mm F2.8 IS STM', #42
             # Note: add new RF lenses to %canonLensTypes with ID 61182
         },
     },

package/bin/exiftool_files/lib/Image/ExifTool/FujiFilm.pm

@@ -31,7 +31,7 @@ use vars qw($VERSION);
 use Image::ExifTool qw(:DataAccess :Utils);
 use Image::ExifTool::Exif;
 
-$VERSION = '1.95';
+$VERSION = '1.96';
 
 sub ProcessFujiDir($$$);
 sub ProcessFaceRec($$$);
@@ -1252,6 +1252,28 @@ my %faceCategories = (
         ValueConv => 'my @v=reverse split(" ",$val);"@v"', # reverse to show width first
         PrintConv => '$val=~tr/ /:/; $val',
     },
+    0x117 => {
+        Name => 'RawZoomActive',
+        Format => 'int32u',
+        Count => 1,
+        PrintConv => { 0 => 'No', 1 => 'Yes' },
+    },
+    0x118 => {
+        Name => 'RawZoomTopLeft',
+        Format => 'int16u',
+        Count => 2,
+        Notes => 'relative to RawCroppedImageSize',
+        ValueConv => 'my @v=reverse split(" ",$val);"@v"', # reverse to show width first
+        PrintConv => '$val=~tr/ /x/; $val',
+    },
+    0x119 => {
+        Name => 'RawZoomSize',
+        Format => 'int16u',
+        Count => 2,
+        Notes => 'relative to RawCroppedImageSize',
+        ValueConv => 'my @v=reverse split(" ",$val);"@v"', # reverse to show width first
+        PrintConv => '$val=~tr/ /x/; $val',
+    },
     0x121 => [
         {
             Name => 'RawImageSize',

package/bin/exiftool_files/lib/Image/ExifTool/InDesign.pm

@@ -14,7 +14,7 @@ use strict;
 use vars qw($VERSION);
 use Image::ExifTool qw(:DataAccess :Utils);
 
-$VERSION = '1.07';
+$VERSION = '1.08';
 
 # map for writing metadata to InDesign files (currently only write XMP)
 my %indMap = (
@@ -101,8 +101,22 @@ sub ProcessIND($$)
     for (;;) {
         $raf->Read($hdr, 32) or last;
         unless (length($hdr) == 32 and $hdr =~ /^\Q$objectHeaderGUID/) {
-            # this must be null padding or we have an error
-            $hdr =~ /^\0+$/ or $err = 'Corrupt file or unsupported InDesign version';
+            # this must be null padding or we have a possible error
+            last if $hdr =~ /^\0+$/;
+            # (could be up to 4095 bytes of non-null garbage plus 4095 null bytes from ExifTool)
+            $raf->Read($buff, 8196) and $hdr .= $buff;
+            $hdr =~ s/\0+$//;   # remove trailing nulls
+            if (length($hdr) > 4095) {
+                $err = 'Corrupt file or unsupported InDesign version';
+                last;
+            }
+            my $non = 'Non-null padding at end of file';
+            if (not $outfile) {
+                $et->Warn($non, 1);
+            } elsif (not $et->Error($non, 1)) {
+                Write($outfile, $hdr) or $err = 1;
+                $writeLen += length $hdr;
+            }
             last;
         }
         my $len = Get32u(\$hdr, 24);

package/bin/exiftool_files/lib/Image/ExifTool/Jpeg2000.pm

@@ -1543,7 +1543,7 @@ sub ProcessJP2($$)
 
     # check to be sure this is a valid JPG2000 file
     return 0 unless $raf->Read($hdr,12) == 12;
-    unless ($hdr eq "\0\0\0\x0cjP  \x0d\x0a\x87\x0a" or     # (ref 1)
+    unless ($hdr eq "\0\0\0\x0cjP  \x0d\x0a\x87\x0a" or       # (ref 1)
             $hdr eq "\0\0\0\x0cjP\x1a\x1a\x0d\x0a\x87\x0a" or # (ref 2)
             $$et{IsJXL})
     {