exiftool_vendored 13.53.0 → 13.57.0

data/bin/exiftool

@@ -11,7 +11,7 @@ use strict;
 use warnings;
 require 5.004;
 
-my $version = '13.53';
+my $version = '13.57';
 
 $^W = 1;    # enable global warnings
 
@@ -309,8 +309,8 @@ my @recommends = qw(
     POSIX::strptime
     Time::Local
     Unicode::LineBreak
-    Compress::Raw::Lzma
     File::StatX
+    Compress::Raw::Lzma
     IO::Compress::RawDeflate
     IO::Uncompress::RawInflate
     IO::Compress::Brotli
@@ -880,6 +880,11 @@ for (;;) {
             $val = undef unless $opt =~ s/\^$// or length $val;
             $mt->Options($opt => $val);
         } else {
+            unless ($pass) {
+                push @nextPass, '-api';
+                push @nextPass, $opt if defined $opt;
+                next;
+            }
             print "Available API Options:\n";
             my $availableOptions = Image::ExifTool::AvailableOptions();
             $$_[3] or printf("  %-17s - %s\n", $$_[0], $$_[2]) foreach @$availableOptions;
@@ -902,7 +907,11 @@ for (;;) {
     if ($a eq 'charset') {
         my $charset = (@ARGV and $ARGV[0] !~ /^(-|\xe2\x88\x92)/) ? shift : undef;
         if (not $charset) {
-            $pass or push(@nextPass, '-charset'), next;
+            unless ($pass) {
+                push @nextPass, '-charset' ;
+                push @nextPass, $charset if defined $charset;
+                next;
+            }
             my %charsets;
             $charsets{$_} = 1 foreach values %Image::ExifTool::charsetName;
             PrintTagList('Available character sets', sort keys %charsets);
@@ -1144,8 +1153,10 @@ for (;;) {
             $langOpt =~ tr/-A-Z/_a-z/;
             $mt->Options(Lang => $langOpt);
             next if $langOpt eq $mt->Options('Lang');
-        } else {
-            $pass or push(@nextPass, '-lang'), next;
+        } elsif (not $pass) {
+            push @nextPass, '-lang';
+            push @nextPass, $langOpt if defined $langOpt;
+            next;
         }
         my $langs = $quiet ? '' : "Available languages:\n";
         $langs .= "  $_ - $Image::ExifTool::langName{$_}\n" foreach @Image::ExifTool::langs;
@@ -4205,8 +4216,8 @@ sub SetWindowTitle($)
     if ($curTitle ne $title) {
         $curTitle = $title;
         if ($^O eq 'MSWin32') {
-            $title =~ tr(-_a-zA-Z0-9%.+/:=?*@~)()dc;  # allow only safe characters
-            $title =~ s/([\/?:%])/^$1/g;   # escape remaing questionable chars
+            # allow only safe characters
+            $title =~ tr(-_a-zA-Z0-9 \(\)[]{}%.+/:;,=?*!@#$~')()dc;
             eval { system qq{title $title} };
         } else {
             # (this only works for XTerm terminals, and STDERR must go to the console)
@@ -5118,52 +5129,52 @@ supported by ExifTool (r = read, w = write, c = create):
 
   File Types
   ------------+-------------+-------------+-------------+------------
-  360   r/w   | DR4   r/w/c | JP2   r/w   | ODS   r     | RW2   r/w
-  3FR   r     | DSF   r     | JPEG  r/w   | ODT   r     | RWL   r/w
-  3G2   r/w   | DSS   r     | JSON  r     | OFR   r     | RWZ   r
-  3GP   r/w   | DV    r     | JXL   r/w   | OGG   r     | RM    r
-  7Z    r     | DVB   r/w   | K25   r     | OGV   r     | SEQ   r
-  A     r     | DVR-MS r    | KDC   r     | ONP   r     | SKETCH r
-  AA    r     | DYLIB r     | KEY   r     | OPUS  r     | SO    r
-  AAC   r     | EIP   r     | KVAR  r     | ORF   r/w   | SR2   r/w
-  AAE   r     | EPS   r/w   | LA    r     | ORI   r/w   | SRF   r
-  AAX   r/w   | EPUB  r     | LFP   r     | OTF   r     | SRW   r/w
-  ACR   r     | ERF   r/w   | LIF   r     | PAC   r     | SVG   r
-  AFM   r     | EXE   r     | LNK   r     | PAGES r     | SWF   r
-  AI    r/w   | EXIF  r/w/c | LRV   r/w   | PBM   r/w   | THM   r/w
-  AIFF  r     | EXR   r     | M2TS  r     | PCAP  r     | TIFF  r/w
-  APE   r     | EXV   r/w/c | M4A/V r/w   | PCAPNG r    | TNEF  r
-  ARQ   r/w   | F4A/V r/w   | MACOS r     | PCD   r     | TORRENT r
-  ARW   r/w   | FFF   r/w   | MAX   r     | PCX   r     | TTC   r
-  ASF   r     | FITS  r     | MEF   r/w   | PDB   r     | TTF   r
-  AVI   r     | FLA   r     | MIE   r/w/c | PDF   r/w   | TXT   r
-  AVIF  r/w   | FLAC  r     | MIFF  r     | PEF   r/w   | URL   r
-  AZW   r     | FLIF  r/w   | MKA   r     | PFA   r     | VCF   r
-  BMP   r     | FLV   r     | MKS   r     | PFB   r     | VNT   r
-  BPG   r     | FPF   r     | MKV   r     | PFM   r     | VRD   r/w/c
-  BTF   r     | FPX   r     | MNG   r/w   | PGF   r     | VSD   r
-  C2PA  r     | GIF   r/w   | MOBI  r     | PGM   r/w   | VSDX  r
-  CHM   r     | GLV   r/w   | MODD  r     | PLIST r     | WAV   r
-  COS   r     | GPR   r/w   | MOI   r     | PICT  r     | WDP   r/w
-  CR2   r/w   | GZ    r     | MOS   r/w   | PMP   r     | WEBP  r/w
-  CR3   r/w   | HDP   r/w   | MOV   r/w   | PNG   r/w   | WEBM  r
-  CRM   r/w   | HDR   r     | MP3   r     | PPM   r/w   | WMA   r
-  CRW   r/w   | HEIC  r/w   | MP4   r/w   | PPT   r     | WMV   r
-  CS1   r/w   | HEIF  r/w   | MPC   r     | PPTX  r     | WOFF  r
-  CSV   r     | HTML  r     | MPG   r     | PS    r/w   | WOFF2 r
-  CUR   r     | ICC   r/w/c | MPO   r/w   | PSB   r/w   | WPG   r
-  CZI   r     | ICO   r     | MQV   r/w   | PSD   r/w   | WTV   r
-  DCM   r     | ICS   r     | MRC   r     | PSP   r     | WV    r
-  DCP   r/w   | IDML  r     | MRW   r/w   | QTIF  r/w   | X3F   r/w
-  DCR   r     | IIQ   r/w   | MXF   r     | R3D   r     | XCF   r
-  DFONT r     | IND   r/w   | NEF   r/w   | RA    r     | XISF  r
-  DIVX  r     | INSP  r/w   | NKA   r     | RAF   r/w   | XLS   r
-  DJVU  r     | INSV  r     | NKSC  r/w   | RAM   r     | XLSX  r
-  DLL   r     | INX   r     | NRW   r/w   | RAR   r     | XMP   r/w/c
-  DNG   r/w   | ISO   r     | NUMBERS r   | RAW   r/w   | ZIP   r
-  DOC   r     | ITC   r     | NXD   r     | RIFF  r     |
-  DOCX  r     | J2C   r     | O     r     | RSRC  r     |
-  DPX   r     | JNG   r/w   | ODP   r     | RTF   r     |
+  360   r/w   | DR4   r/w/c | JNG   r/w   | ODP   r     | RTF   r
+  3FR   r     | DSF   r     | JP2   r/w   | ODS   r     | RW2   r/w
+  3G2   r/w   | DSS   r     | JPEG  r/w   | ODT   r     | RWL   r/w
+  3GP   r/w   | DV    r     | JSON  r     | OFR   r     | RWZ   r
+  7Z    r     | DVB   r/w   | JXL   r/w   | OGG   r     | RM    r
+  A     r     | DVR-MS r    | K25   r     | OGV   r     | SEQ   r
+  AA    r     | DYLIB r     | KDC   r     | ONP   r     | SKETCH r
+  AAC   r     | EIP   r     | KEY   r     | OPUS  r     | SO    r
+  AAE   r     | EPS   r/w   | KVAR  r     | ORF   r/w   | SR2   r/w
+  AAX   r/w   | EPUB  r     | LA    r     | ORI   r/w   | SRF   r
+  ACR   r     | ERF   r/w   | LFP   r     | OTF   r     | SRW   r/w
+  AFM   r     | EXE   r     | LIF   r     | PAC   r     | SVG   r
+  AI    r/w   | EXIF  r/w/c | LNK   r     | PAGES r     | SWF   r
+  AIFF  r     | EXR   r     | LRV   r/w   | PBM   r/w   | THM   r/w
+  APE   r     | EXV   r/w/c | M2TS  r     | PCAP  r     | TIFF  r/w
+  ARQ   r/w   | F4A/V r/w   | M4A/V r/w   | PCAPNG r    | TNEF  r
+  ARW   r/w   | FFF   r/w   | MACOS r     | PCD   r     | TORRENT r
+  ASF   r     | FIT   r     | MAX   r     | PCX   r     | TTC   r
+  AVI   r     | FITS  r     | MEF   r/w   | PDB   r     | TTF   r
+  AVIF  r/w   | FLA   r     | MIE   r/w/c | PDF   r/w   | TXT   r
+  AZW   r     | FLAC  r     | MIFF  r     | PEF   r/w   | URL   r
+  BMP   r     | FLIF  r/w   | MKA   r     | PFA   r     | VCF   r
+  BPG   r     | FLV   r     | MKS   r     | PFB   r     | VNT   r
+  BTF   r     | FPF   r     | MKV   r     | PFM   r     | VRD   r/w/c
+  C2PA  r     | FPX   r     | MNG   r/w   | PGF   r     | VSD   r
+  CHM   r     | GIF   r/w   | MOBI  r     | PGM   r/w   | VSDX  r
+  COS   r     | GLV   r/w   | MODD  r     | PLIST r     | WAV   r
+  CR2   r/w   | GPR   r/w   | MOI   r     | PICT  r     | WDP   r/w
+  CR3   r/w   | GZ    r     | MOS   r/w   | PMP   r     | WEBP  r/w
+  CRM   r/w   | HDP   r/w   | MOV   r/w   | PNG   r/w   | WEBM  r
+  CRW   r/w   | HDR   r     | MP3   r     | PPM   r/w   | WMA   r
+  CS1   r/w   | HEIC  r/w   | MP4   r/w   | PPT   r     | WMV   r
+  CSV   r     | HEIF  r/w   | MPC   r     | PPTX  r     | WOFF  r
+  CUR   r     | HTML  r     | MPG   r     | PS    r/w   | WOFF2 r
+  CZI   r     | ICC   r/w/c | MPO   r/w   | PSB   r/w   | WPG   r
+  DCM   r     | ICO   r     | MQV   r/w   | PSD   r/w   | WTV   r
+  DCP   r/w   | ICS   r     | MRC   r     | PSP   r     | WV    r
+  DCR   r     | IDML  r     | MRW   r/w   | QTIF  r/w   | X3F   r/w
+  DFONT r     | IIQ   r/w   | MXF   r     | R3D   r     | XCF   r
+  DIVX  r     | IND   r/w   | NEF   r/w   | RA    r     | XISF  r
+  DJVU  r     | INSP  r/w   | NKA   r     | RAF   r/w   | XLS   r
+  DLL   r     | INSV  r     | NKSC  r/w   | RAM   r     | XLSX  r
+  DNG   r/w   | INX   r     | NRW   r/w   | RAR   r     | XMP   r/w/c
+  DOC   r     | ISO   r     | NUMBERS r   | RAW   r/w   | ZIP   r
+  DOCX  r     | ITC   r     | NXD   r     | RIFF  r     |
+  DPX   r     | J2C   r     | O     r     | RSRC  r     |
 
   Meta Information
   ----------------------+----------------------+---------------------
@@ -5275,7 +5286,7 @@ L<Other options|/Other options>
 
   -@ ARGFILE                       Read command-line arguments from file
   -k          (-pause)             Pause before terminating
-  -list[w|f|wf|g[NUM]|d|x]         List various exiftool capabilities
+  -list[w|f|r|wf|g[NUM]|d|x|geo]   List various exiftool capabilities
   -ver                             Print exiftool version number
   --                               End of options
 
@@ -5293,7 +5304,7 @@ L<Utilities|/Utilities>
 
 L<Advanced options|/Advanced options>
 
-  -api OPT[[^]=[VAL]]              Set ExifTool API option
+  -api [OPT[[^]=[VAL]]]            Set ExifTool API option
   -common_args                     Define common arguments
   -config CFGFILE                  Specify configuration file name
   -echo[NUM] TEXT                  Echo text to stdout or stderr
@@ -5886,9 +5897,10 @@ Escape characters in output tag values for HTML (B<-E>), XML (B<-ex>) or C
 (B<-ec>).  For HTML, all characters with Unicode code points above U+007F
 are escaped as well as the following 5 characters: & (&amp;) E<39> (&#39;)
 E<quot> (&quot;) E<gt> (&gt;) and E<lt> (&lt;).  For XML, only these 5
-characters are escaped.  The B<-E> option is implied with B<-h>, and B<-ex>
-is implied with B<-X>.  For C, all control characters and the backslash are
-escaped.  The inverse conversion is applied when writing tags.
+characters are escaped.  The B<-E> option is implied with B<-h>, B<-ex> is
+implied with B<-X>, B<-ec> is implied with B<-json>, and none of these
+options apply to the B<-csv> output.  For C, all control characters and the
+backslash are escaped. The inverse conversion is applied when writing tags.
 
 =item B<-f> (B<-forcePrint>)
 
@@ -6147,7 +6159,7 @@ with this command:
 
 produces output like this:
 
-    -- Generated by ExifTool 13.53 --
+    -- Generated by ExifTool 13.57 --
     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
@@ -6297,7 +6309,7 @@ each processed file when writing and the new file name when renaming,
 moving or copying.  Verbose levels above B<-v0> do not flush after each
 line.  Also see the B<-progress> option.
 
-=item B<-w>[+|!] I<EXT> or I<FMT> (B<-textOut>)
+=item B<-w>[+][!] I<EXT> or I<FMT> (B<-textOut>)
 
 Write console output to files with names ending in I<EXT>, one for each
 source file.  The output file name is obtained by replacing the source file
@@ -6433,7 +6445,7 @@ natural numbers starting from 1, instead of 0 (see example F above).
 This same I<FMT> syntax is used with the B<-o> and B<-tagsFromFile> options,
 although %c and %C are only valid for output file names.
 
-=item B<-W>[+|!] I<FMT> (B<-tagOut>)
+=item B<-W>[+][!] I<FMT> (B<-tagOut>)
 
 This enhanced version of the B<-w> option allows a separate output file to
 be created for each extracted tag.  See the B<-w> option documentation above
@@ -7351,16 +7363,18 @@ necessary when using this technique.)
 Set user parameter.  I<PARAM> is an arbitrary user parameter name.  This is
 an interface to the API UserParam option (see the
 L<Image::ExifTool Options|Image::ExifTool/Options> documentation), and
-provides a method to access user-defined parameters in arguments to the
+provides a method to access user-defined parameters in arguments of the
 B<-if>, B<-p> and B<-fileNUM> options as if they were any other tag.
 Appending a hash tag (C<#>) to I<PARAM> (eg. C<-userParam MyTag#=yes>) also
 causes the parameter to be extracted as a normal tag in the UserParam group.
- Similar to the B<-api> option, the parameter value is set to 1 if I<=VAL>
+Similar to the B<-api> option, the parameter value is set to 1 if I<=VAL>
 is omitted, undef if just I<VAL> is omitted with C<=>, or an empty string if
-I<VAL> is omitted with C<^=>.
+I<VAL> is omitted with C<^=>.  Examples:
 
     exiftool -p '$test from $filename' -userparam test=Hello FILE
 
+    exiftool "-description<mytag" -userparam mytag#="test" FILE
+
 =back
 
 =head3 Advanced formatting feature

data/bin/lib/Image/ExifTool/BuildTagLookup.pm

@@ -35,7 +35,7 @@ use Image::ExifTool::Sony;
 use Image::ExifTool::Validate;
 use Image::ExifTool::MacOS;
 
-$VERSION = '3.67';
+$VERSION = '3.68';
 @ISA = qw(Exporter);
 
 sub NumbersFirst($$);
@@ -273,11 +273,11 @@ tags remain.
 
 The table below lists all EXIF tags.  Also listed are TIFF, DNG, HDP and
 other tags which are not part of the EXIF specification, but may co-exist
-with EXIF tags in some images.  Tags which are part of the EXIF 3.0
+with EXIF tags in some images.  Tags which are part of the EXIF 3.1
 specification have an underlined B<Tag Name> in the HTML version of this
 documentation.  See
-L<https://www.cipa.jp/std/documents/download_e.html?CIPA_DC-008-2024-E>
-for the official EXIF 3.0 specification.
+L<https://www.cipa.jp/std/documents/download_e.html?CIPA_DC-008-2026-E>
+for the official EXIF 3.1 specification.
 },
     GPS => q{
 These GPS tags are part of the EXIF standard, and are stored in a separate

data/bin/lib/Image/ExifTool/Canon.pm

@@ -88,7 +88,7 @@ sub ProcessCTMD($$$);
 sub ProcessExifInfo($$$);
 sub SwapWords($);
 
-$VERSION = '5.05';
+$VERSION = '5.06';
 
 # Note: Removed 'USM' from 'L' lenses since it is redundant - PH
 # (or is it?  Ref 32 shows 5 non-USM L-type lenses)
@@ -10267,6 +10267,19 @@ sub PrintLensID(@)
         }
         @matches = @likely unless @matches;
         @matches = @maybe unless @matches;
+        # use LensModel focal length and aperture if necessary and available
+        if (@matches > 1 and $lensModel and 
+            $lensModel =~ /(\d+(?:\.\d+)?(?:-\d+(?:\.\d+)?)?) ?mm ?f\/?(\d+(?:\.\d+)?(?:-\d+(?:\.\d+)?)?)/i)
+        {
+            my ($mm, $fstop) = ($1, $2);
+            my @best;
+            foreach $lens (@matches) {
+                next unless $lens =~ /(\d+(?:\.\d+)?(?:-\d+(?:\.\d+)?)?) ?mm ?f\/?(\d+(?:\.\d+)?(?:-\d+(?:\.\d+)?)?)/i;
+                push @best, $lens if $mm eq $1 and $fstop eq $2;
+            }
+            @matches = @best if @best;
+        }
+        
         Image::ExifTool::Exif::MatchLensModel(\@matches, $lensModel);
         return join(' or ', @matches) if @matches;
     } elsif ($lensModel and $lensModel =~ /\d/) {