exiftool_vendored 13.31.0 → 13.34.0

data/bin/exiftool

@@ -11,7 +11,7 @@ use strict;
 use warnings;
 require 5.004;
 
-my $version = '13.31';
+my $version = '13.34';
 
 $^W = 1;    # enable global warnings
 
@@ -101,9 +101,9 @@ my @csvFiles;       # list of files when reading with CSV option (in ExifTool Ch
 my @csvTags;        # order of tags for first file with CSV option (lower case)
 my @delFiles;       # list of files to delete
 my @dynamicFiles;   # list of -tagsFromFile files with dynamic names and -TAG<=FMT pairs
+my (@echo3, @echo4);# stdout and stderr echo after processing is complete
 my @efile;          # files for writing list of error/fail/same file names
 my @exclude;        # list of excluded tags
-my (@echo3, @echo4);# stdout and stderr echo after processing is complete
 my @files;          # list of files and directories to scan
 my @moreArgs;       # more arguments to process after -stay_open -@
 my @newValues;      # list of new tag values to set
@@ -118,7 +118,6 @@ my %csvTags;        # lookup for all found tags with CSV option (lower case keys
 my %database;       # lookup for database information based on file name (in ExifTool Charset)
 my %filterExt;      # lookup for filtered extensions
 my %ignore;         # directory names to ignore
-my $ignoreHidden;   # flag to ignore hidden files
 my %outComma;       # flag that output text file needs a comma
 my %outTrailer;     # trailer for output text file
 my %preserveTime;   # preserved timestamps for files
@@ -130,6 +129,7 @@ my %usedFileName;   # lookup for file names we already used in TestName feature
 my %utf8FileName;   # lookup for file names that are UTF-8 encoded
 my %warnedOnce;     # lookup for once-only warnings
 my %wext;           # -W extensions to write
+my %wroteHEAD;      # list of output txt files to which we wrote HEAD
 my $allGroup;       # show group name for all tags
 my $altEnc;         # alternate character encoding if not UTF-8
 my $argFormat;      # use exiftool argument-format output
@@ -175,6 +175,7 @@ my $forcePrint;     # string to use for missing tag values (undef to not print t
 my $geoOnly;        # flag to extract Geolocation tags only
 my $helped;         # flag to avoid printing help if no tags specified
 my $html;           # flag for html-formatted output (2=html dump)
+my $ignoreHidden;   # flag to ignore hidden files
 my $interrupted;    # flag set if CTRL-C is pressed during a critical process
 my $isBinary;       # true if value is a SCALAR ref
 my $isWriting;      # flag set if we are writing tags
@@ -227,7 +228,6 @@ my $validFile;      # flag indicating we processed a valid file
 my $verbose;        # verbose setting
 my $vout;           # verbose output file reference (\*STDOUT or \*STDERR by default)
 my $windowTitle;    # title for console window
-my %wroteHEAD;      # list of output txt files to which we wrote HEAD
 my $xml;            # flag for XML-formatted output
 
 # flag to keep the input -@ argfile open:
@@ -451,8 +451,10 @@ undef @efile;
 undef @exclude;
 undef @files;
 undef @newValues;
+undef @requestTags;
 undef @srcFmt;
 undef @tags;
+undef %altFile;
 undef %appended;
 undef %countLink;
 undef %created;
@@ -472,6 +474,7 @@ undef %usedFileName;
 undef %utf8FileName;
 undef %warnedOnce;
 undef %wext;
+undef %wroteHEAD;
 undef $allGroup;
 undef $altEnc;
 undef $argFormat;
@@ -488,8 +491,8 @@ undef $doSetFileName;
 undef $doUnzip;
 undef $end;
 undef $endDir;
-undef $escapeHTML;
 undef $escapeC;
+undef $escapeHTML;
 undef $evalWarning;
 undef $executeID;
 undef $failCondition;
@@ -500,18 +503,22 @@ undef $fixLen;
 undef $forcePrint;
 undef $geoOnly;
 undef $ignoreHidden;
+undef $isBinary;
 undef $joinLists;
 undef $langOpt;
+undef $listDir;
 undef $listItem;
 undef $multiFile;
 undef $noBinary;
 undef $outOpt;
+undef $plot;
 undef $preserveTime;
 undef $progress;
 undef $progressCount;
 undef $progressIncr;
 undef $progressMax;
 undef $progressNext;
+undef $rafStdin;
 undef $recurse;
 undef $scanWritable;
 undef $sectHeader;
@@ -521,6 +528,7 @@ undef $showTagID;
 undef $structOpt;
 undef $tagOut;
 undef $textOut;
+undef $textOut2;
 undef $textOverwrite;
 undef $tmpFile;
 undef $tmpText;
@@ -2529,7 +2537,7 @@ T2:         foreach $t2 (@tags2) {
     # print the results for this file
     if (%printFmt) {
         # output using print format file (-p) option
-        my ($type, $doc, $grp, $lastDoc, $cache);
+        my ($type, @doc, $grp, $lastDoc, $cache);
         $fileTrailer = '';
         # repeat for each embedded document if necessary (only if -ee used)
         if ($et->Options('ExtractEmbedded')) {
@@ -2538,7 +2546,8 @@ T2:         foreach $t2 (@tags2) {
         } else {
             $lastDoc = 0;
         }
-        for ($doc=0; $doc<=$lastDoc; ++$doc) {
+        for ($doc[0]=0; $doc[0]<=$lastDoc; ) {
+            my $doc = join '-', @doc;
             my ($skipBody, $opt);
             foreach $type (qw(HEAD SECT IF BODY ENDS TAIL)) {
                 my $prf = $printFmt{$type} or next;
@@ -2548,7 +2557,7 @@ T2:         foreach $t2 (@tags2) {
                 }
                 next if $type eq 'BODY' and $skipBody;
                 # silence "IF" warnings and warnings for subdocuments > 1
-                if ($type eq 'IF' or ($doc > 1 and not $$et{OPTIONS}{IgnoreMinorErrors})) {
+                if ($type eq 'IF' or (($doc[0] > 1 or @doc > 1) and not $$et{OPTIONS}{IgnoreMinorErrors})) {
                     $opt = 'Silent';
                 } else {
                     $opt = 'Warn';
@@ -2587,6 +2596,14 @@ T2:         foreach $t2 (@tags2) {
                     print $fp @lines;
                 }
             }
+            # find next available doc-subdoc
+            push @doc, 1;
+            while (@doc > 1) {
+                my $nextDoc = join '-', @doc;
+                last if $$et{HAS_DOC}{$nextDoc};
+                pop @doc;
+                ++$doc[-1];
+            }
         }
         delete $printFmt{HEAD} unless defined $outfile; # print header only once per output file
         my $errs = $et->GetInfo('Warning', 'Error');
@@ -4518,6 +4535,10 @@ sub SuggestedExtension($$$)
     } elsif ($$valPt =~ /^.{4}ftyp(3gp|mp4|f4v|qt  )/s) {
         my %movType = ( 'qt  ' => 'mov' );
         $ext = $movType{$1} || $1;
+    } elsif ($$valPt =~ /^<(!DOCTYPE )?html/i) {
+        $ext = 'html';
+    } elsif ($$valPt =~ /^[\n\r]*\{[\n\r]*\\rtf/) {
+        $ext = 'rtf';
     } elsif ($$valPt !~ /^.{0,4096}\0/s) {
         $ext = 'txt';
     } elsif ($$valPt =~ /^BM.{15}\0/s) {
@@ -5054,50 +5075,51 @@ supported by ExifTool (r = read, w = write, c = create):
 
   File Types
   ------------+-------------+-------------+-------------+------------
-  360   r/w   | DOCX  r     | ITC   r     | NUMBERS r   | RAM   r
-  3FR   r     | DPX   r     | J2C   r     | NXD   r     | RAR   r
-  3G2   r/w   | DR4   r/w/c | JNG   r/w   | O     r     | RAW   r/w
-  3GP   r/w   | DSS   r     | JP2   r/w   | ODP   r     | RIFF  r
-  7Z    r     | DV    r     | JPEG  r/w   | ODS   r     | RSRC  r
-  A     r     | DVB   r/w   | JSON  r     | ODT   r     | RTF   r
-  AA    r     | DVR-MS r    | JXL   r/w   | OFR   r     | RW2   r/w
-  AAC   r     | DYLIB r     | K25   r     | OGG   r     | RWL   r/w
-  AAE   r     | EIP   r     | KDC   r     | OGV   r     | RWZ   r
-  AAX   r/w   | EPS   r/w   | KEY   r     | ONP   r     | RM    r
-  ACR   r     | EPUB  r     | LA    r     | OPUS  r     | SEQ   r
-  AFM   r     | ERF   r/w   | LFP   r     | ORF   r/w   | SKETCH r
-  AI    r/w   | EXE   r     | LIF   r     | ORI   r/w   | SO    r
-  AIFF  r     | EXIF  r/w/c | LNK   r     | OTF   r     | SR2   r/w
-  APE   r     | EXR   r     | LRV   r/w   | PAC   r     | SRF   r
-  ARQ   r/w   | EXV   r/w/c | M2TS  r     | PAGES r     | SRW   r/w
-  ARW   r/w   | F4A/V r/w   | M4A/V r/w   | PBM   r/w   | SVG   r
-  ASF   r     | FFF   r/w   | MACOS r     | PCAP  r     | SWF   r
-  AVI   r     | FITS  r     | MAX   r     | PCAPNG r    | THM   r/w
-  AVIF  r/w   | FLA   r     | MEF   r/w   | PCD   r     | TIFF  r/w
-  AZW   r     | FLAC  r     | MIE   r/w/c | PCX   r     | TORRENT r
-  BMP   r     | FLIF  r/w   | MIFF  r     | PDB   r     | TTC   r
-  BPG   r     | FLV   r     | MKA   r     | PDF   r/w   | TTF   r
-  BTF   r     | FPF   r     | MKS   r     | PEF   r/w   | TXT   r
-  C2PA  r     | FPX   r     | MKV   r     | PFA   r     | VCF   r
-  CHM   r     | GIF   r/w   | MNG   r/w   | PFB   r     | VNT   r
-  COS   r     | GLV   r/w   | MOBI  r     | PFM   r     | VRD   r/w/c
-  CR2   r/w   | GPR   r/w   | MODD  r     | PGF   r     | VSD   r
-  CR3   r/w   | GZ    r     | MOI   r     | PGM   r/w   | WAV   r
-  CRM   r/w   | HDP   r/w   | MOS   r/w   | PLIST r     | WDP   r/w
-  CRW   r/w   | HDR   r     | MOV   r/w   | PICT  r     | WEBP  r/w
-  CS1   r/w   | HEIC  r/w   | MP3   r     | PMP   r     | WEBM  r
-  CSV   r     | HEIF  r/w   | MP4   r/w   | PNG   r/w   | WMA   r
-  CUR   r     | HTML  r     | MPC   r     | PPM   r/w   | WMV   r
-  CZI   r     | ICC   r/w/c | MPG   r     | PPT   r     | WPG   r
-  DCM   r     | ICO   r     | MPO   r/w   | PPTX  r     | WTV   r
-  DCP   r/w   | ICS   r     | MQV   r/w   | PS    r/w   | WV    r
-  DCR   r     | IDML  r     | MRC   r     | PSB   r/w   | X3F   r/w
-  DFONT r     | IIQ   r/w   | MRW   r/w   | PSD   r/w   | XCF   r
-  DIVX  r     | IND   r/w   | MXF   r     | PSP   r     | XISF  r
-  DJVU  r     | INSP  r/w   | NEF   r/w   | QTIF  r/w   | XLS   r
-  DLL   r     | INSV  r     | NKA   r     | R3D   r     | XLSX  r
-  DNG   r/w   | INX   r     | NKSC  r/w   | RA    r     | XMP   r/w/c
-  DOC   r     | ISO   r     | NRW   r/w   | RAF   r/w   | ZIP   r
+  360   r/w   | DPX   r     | JNG   r/w   | ODP   r     | RSRC  r
+  3FR   r     | DR4   r/w/c | JP2   r/w   | ODS   r     | RTF   r
+  3G2   r/w   | DSS   r     | JPEG  r/w   | ODT   r     | RW2   r/w
+  3GP   r/w   | DV    r     | JSON  r     | OFR   r     | RWL   r/w
+  7Z    r     | DVB   r/w   | JXL   r/w   | OGG   r     | RWZ   r
+  A     r     | DVR-MS r    | K25   r     | OGV   r     | RM    r
+  AA    r     | DYLIB r     | KDC   r     | ONP   r     | SEQ   r
+  AAC   r     | EIP   r     | KEY   r     | OPUS  r     | SKETCH r
+  AAE   r     | EPS   r/w   | LA    r     | ORF   r/w   | SO    r
+  AAX   r/w   | EPUB  r     | LFP   r     | ORI   r/w   | SR2   r/w
+  ACR   r     | ERF   r/w   | LIF   r     | OTF   r     | SRF   r
+  AFM   r     | EXE   r     | LNK   r     | PAC   r     | SRW   r/w
+  AI    r/w   | EXIF  r/w/c | LRV   r/w   | PAGES r     | SVG   r
+  AIFF  r     | EXR   r     | M2TS  r     | PBM   r/w   | SWF   r
+  APE   r     | EXV   r/w/c | M4A/V r/w   | PCAP  r     | THM   r/w
+  ARQ   r/w   | F4A/V r/w   | MACOS r     | PCAPNG r    | TIFF  r/w
+  ARW   r/w   | FFF   r/w   | MAX   r     | PCD   r     | TNEF  r
+  ASF   r     | FITS  r     | MEF   r/w   | PCX   r     | TORRENT r
+  AVI   r     | FLA   r     | MIE   r/w/c | PDB   r     | TTC   r
+  AVIF  r/w   | FLAC  r     | MIFF  r     | PDF   r/w   | TTF   r
+  AZW   r     | FLIF  r/w   | MKA   r     | PEF   r/w   | TXT   r
+  BMP   r     | FLV   r     | MKS   r     | PFA   r     | VCF   r
+  BPG   r     | FPF   r     | MKV   r     | PFB   r     | VNT   r
+  BTF   r     | FPX   r     | MNG   r/w   | PFM   r     | VRD   r/w/c
+  C2PA  r     | GIF   r/w   | MOBI  r     | PGF   r     | VSD   r
+  CHM   r     | GLV   r/w   | MODD  r     | PGM   r/w   | WAV   r
+  COS   r     | GPR   r/w   | MOI   r     | PLIST r     | WDP   r/w
+  CR2   r/w   | GZ    r     | MOS   r/w   | PICT  r     | WEBP  r/w
+  CR3   r/w   | HDP   r/w   | MOV   r/w   | PMP   r     | WEBM  r
+  CRM   r/w   | HDR   r     | MP3   r     | PNG   r/w   | WMA   r
+  CRW   r/w   | HEIC  r/w   | MP4   r/w   | PPM   r/w   | WMV   r
+  CS1   r/w   | HEIF  r/w   | MPC   r     | PPT   r     | WPG   r
+  CSV   r     | HTML  r     | MPG   r     | PPTX  r     | WTV   r
+  CUR   r     | ICC   r/w/c | MPO   r/w   | PS    r/w   | WV    r
+  CZI   r     | ICO   r     | MQV   r/w   | PSB   r/w   | X3F   r/w
+  DCM   r     | ICS   r     | MRC   r     | PSD   r/w   | XCF   r
+  DCP   r/w   | IDML  r     | MRW   r/w   | PSP   r     | XISF  r
+  DCR   r     | IIQ   r/w   | MXF   r     | QTIF  r/w   | XLS   r
+  DFONT r     | IND   r/w   | NEF   r/w   | R3D   r     | XLSX  r
+  DIVX  r     | INSP  r/w   | NKA   r     | RA    r     | XMP   r/w/c
+  DJVU  r     | INSV  r     | NKSC  r/w   | RAF   r/w   | ZIP   r
+  DLL   r     | INX   r     | NRW   r/w   | RAM   r     |
+  DNG   r/w   | ISO   r     | NUMBERS r   | RAR   r     |
+  DOC   r     | ITC   r     | NXD   r     | RAW   r/w   |
+  DOCX  r     | J2C   r     | O     r     | RIFF  r     |
 
   Meta Information
   ----------------------+----------------------+---------------------
@@ -5809,12 +5831,12 @@ escaped.  The inverse conversion is applied when writing tags.
 =item B<-f> (B<-forcePrint>)
 
 Force printing of tags even if they don't exist.  This option applies to
-tags specified on the command line, or with the B<-p>, B<-if> or
-B<-tagsFromFile> options.  When B<-f> is used, the value of any missing tag
-is set to a dash (C<->) by default, but this may be configured via the API
-MissingTagValue option.  B<-f> is also used to add a 'flags' attribute to
-the B<-listx> output, or to allow tags to be deleted when writing with the
-B<-csv>=I<CSVFILE> feature.
+tags specified on the command line, or with the B<-p>, B<-if> (unless the
+API UndefTags option is set), B<-fileNUM> or B<-tagsFromFile> options.  When
+B<-f> is used, the value of any missing tag is set to a dash (C<->) by
+default, but this may be configured via the API MissingTagValue option. 
+B<-f> is also used to add a 'flags' attribute to the B<-listx> output, or to
+allow tags to be deleted when writing with the B<-csv>=I<CSVFILE> feature.
 
 =item B<-g>[I<NUM>][:I<NUM>...] (B<-groupHeadings>)
 
@@ -5979,7 +6001,7 @@ translation, follow these steps (you must have Perl installed for this):
 6. Edit the generated language module lib/Image/ExifTool/Lang/ru.pm, and
 search and replace all 'MISSING' strings in the file with your translations.
 
-7. Email the module ('ru.pm' in this example) to philharvey66 at gmail.com
+7. Email the module ('ru.pm' in this example) to exiftool@gmail.com
 
 8. Thank you!!
 
@@ -5989,7 +6011,7 @@ For list-type tags, this causes only the item with the specified index to be
 extracted.  I<INDEX> is 0 for the first item in the list.  Negative indices
 may also be used to reference items from the end of the list.  Has no effect
 on single-valued tags.  Also applies to tag values when copying from a tag,
-and in B<-if> conditions.
+and in B<-if>, B<-p> and B<-fileNUM> arguments.
 
 =item B<-n> (B<--printConv>)
 
@@ -6054,7 +6076,7 @@ with this command:
 
 produces output like this:
 
-    -- Generated by ExifTool 13.31 --
+    -- Generated by ExifTool 13.34 --
     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
@@ -6602,11 +6624,8 @@ Notes:
 
 1) The B<-n> and B<-b> options also apply to tags used in I<EXPR>.
 
-2) Some binary data blocks are not extracted unless specified explicitly.
-These tags are not available for use in the B<-if> condition unless they are
-also specified on the command line.  The alternative is to use the
-C<$GROUP:all> syntax. (eg. Use C<$exif:all> instead of C<$exif> in I<EXPR>
-to test for the existence of EXIF tags.)
+2) The API RequestTags option is automatically set for all tags used in the
+B<-if> condition.
 
 3) Tags in the string are interpolated in a similar way to B<-p> before the
 expression is evaluated.  In this interpolation, C<$/> is converted to a
@@ -6628,8 +6647,11 @@ C<$Copy1:TAG>, C<$Copy2:TAG>, etc).
 command when B<-execute> was used, and may be used like any other tag in the
 condition (ie. "$OK").
 
-7) The API RequestTags option is automatically set for all tags used in the
-B<-if> condition.
+7) The values of undefined tags in the expression are affected by the B<-f>
+and B<-m> options unless the API UndefTags option is also set.
+
+8) The condition fails if a Perl error occurs.  This could happen for
+instance if an undefined value (eg. a missing tag) is used improperly.
 
 =item B<-m> (B<-ignoreMinorErrors>)
 
@@ -6641,8 +6663,9 @@ so ExifTool leaves it up to you to make the final decision.  Minor errors
 and warnings are indicated by "[minor]" at the start of the message.
 Warnings which affect processing when ignored are indicated by "[Minor]"
 (with a capital "M").  Note that this causes missing values in
-B<-tagsFromFile>, B<-p> and B<-if> strings to be set to an empty string
-rather than an undefined value.
+B<-tagsFromFile>, B<-p>, B<-if> and B<-fileNUM> strings to be set to an
+empty string rather than an undefined value (but this may be avoided for
+B<-if> using the API UndefTags option).
 
 =item B<-o> I<OUTFILE> or I<FMT> (B<-out>)
 
@@ -7254,11 +7277,11 @@ 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
-B<-if> and B<-p> 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> is
-omitted, undef if just I<VAL> is omitted with C<=>, or an empty string if
+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>
+is omitted, undef if just I<VAL> is omitted with C<=>, or an empty string if
 I<VAL> is omitted with C<^=>.
 
     exiftool -p '$test from $filename' -userparam test=Hello FILE
@@ -7268,18 +7291,20 @@ I<VAL> is omitted with C<^=>.
 =head3 Advanced formatting feature
 
 An advanced formatting feature allows modification of the value of any tag
-interpolated within a B<-if> or B<-p> option argument, or a B<-tagsFromFile>
-redirection string.  Tag names within these strings are prefixed by a C<$>
-symbol, and an arbitrary Perl expression may be applied to the tag value by
-placing braces around the tag name and inserting the expression after the
-name, separated by a semicolon (ie. C<${TAG;EXPR}>).  The expression acts on
-the value of the tag through the default input variable (C<$_>), and has
-access to the full ExifTool API through the current ExifTool object
-(C<$self>) and the tag key (C<$tag>).  It may contain any valid Perl code,
-including translation (C<tr///>) and substitution (C<s///>) operations, but
-note that braces within the expression must be balanced.  The example below
-prints the camera Make with spaces translated to underlines, and multiple
-consecutive underlines replaced by a single underline:
+interpolated within a B<-if>, B<-p> or B<-fileNUM> argument, or a
+B<-tagsFromFile> redirection string.  Tag names within these strings are
+prefixed by a C<$> symbol, and an arbitrary Perl expression may be applied
+to the tag value by placing braces around the tag name and inserting the
+expression after the name, separated by a semicolon (ie. C<${TAG;EXPR}>). 
+The expression acts on the value of the tag through the default input
+variable (C<$_>), and has access to the full ExifTool API through the
+current ExifTool object (C<$self>) and the tag key (C<$tag>).  It may
+contain any valid Perl code, including translation (C<tr///>) and
+substitution (C<s///>) operations, but note that braces within the
+expression must be balanced.  If the expression does not modify C<$_> the
+original tag value is returned.  The example below prints the camera Make
+with spaces translated to underlines, and multiple consecutive underlines
+replaced by a single underline:
 
     exiftool -p '${make;tr/ /_/;s/__+/_/g}' image.jpg
 
@@ -7298,6 +7323,8 @@ used in file names.)
 
 =head4 Helper functions
 
+Note that function names are case sensitive.
+
 C<DateFmt>
 
 Simplifies reformatting of individual date/time values.  This function acts
@@ -7335,8 +7362,6 @@ rewritten unnecessarily:
 
     exiftool -sep '##' '-keywords<${keywords;NoDups(1)}' a.jpg
 
-Note that function names are case sensitive.
-
 ExifTool 12.64 adds an API NoDups option which makes the NoDups helper
 function largely redundant, with all the functionality except the ability to
 avoid rewriting the file if there are no duplicates, but with the advantage

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

@@ -271,11 +271,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 2.32
+with EXIF tags in some images.  Tags which are part of the EXIF 3.0
 specification have an underlined B<Tag Name> in the HTML version of this
 documentation.  See
-L<https://web.archive.org/web/20190624045241if_/http://www.cipa.jp:80/std/documents/e/DC-008-Translation-2019-E.pdf>
-for the official EXIF 2.32 specification.
+L<https://www.cipa.jp/std/documents/download_e.html?CIPA_DC-008-2024-E>
+for the official EXIF 3.0 specification.
 },
     GPS => q{
 These GPS tags are part of the EXIF standard, and are stored in a separate
@@ -2338,7 +2338,8 @@ sub WriteTagNames($$)
         my ($hid, $showGrp);
         # widths of the different columns in the POD documentation
         my ($wID,$wTag,$wReq,$wGrp) = (8,36,24,10);
-        my ($composite, $derived, $notes, $longTags, $wasLong, $prefix);
+        my ($composite, $derived, $notes, $longTags, $prefix);
+        my $wasLong = 0;
         if ($short eq 'Shortcuts') {
             $derived = '<th>Refers To</th>';
             $composite = 2;
@@ -2396,7 +2397,7 @@ sub WriteTagNames($$)
                     $wID -= $longTag - $wTag;
                     $wTag = $longTag;
                 }
-                $wasLong = 1 if $wID <= $self->{LONG_ID}->{$tableName};
+                ++$wasLong if $wID <= $self->{LONG_ID}->{$tableName};
             }
         } elsif ($composite) {
             $wTag += $wID - $wReq;
@@ -2471,6 +2472,7 @@ sub WriteTagNames($$)
                     if ($over <= $wTag - length($$tagNames[0])) {
                         $wTag2 -= $over;
                         $w += $over;
+                        --$wasLong;
                     } else {
                         # put tag name on next line if ID is too long
                         $idStr = "  $tagIDstr\n   " . (' ' x $w);

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

@@ -88,7 +88,7 @@ sub ProcessCTMD($$$);
 sub ProcessExifInfo($$$);
 sub SwapWords($);
 
-$VERSION = '4.92';
+$VERSION = '4.95';
 
 # Note: Removed 'USM' from 'L' lenses since it is redundant - PH
 # (or is it?  Ref 32 shows 5 non-USM L-type lenses)
@@ -2151,6 +2151,7 @@ my %offOn = ( 0 => 'Off', 1 => 'On' );
             TagTable => 'Image::ExifTool::Canon::RawBurstInfo',
         }
     },
+  # 0x4049 - related to croping (forum13491) - "8 0 0 0" = no crop, "8 1 0 1" = crop enabled
     0x4059 => { #forum16111
         Name => 'LevelInfo',
         SubDirectory => {
@@ -2621,6 +2622,10 @@ my %offOn = ( 0 => 'Off', 1 => 'On' );
     # 47 - related to aspect ratio: 100=4:3,70=1:1/16:9,90=3:2,60=4:5 (PH G12)
     #      (roughly image area in percent - 4:3=100%,1:1/16:9=75%,3:2=89%,4:5=60%)
     # 48 - 3 for CR2/CR3, 4 or 7 for JPG, -1 for edited JPG (see forum16127)
+    50 => { #github340
+        Name => 'FocusBracketing',
+        PrintConv => { 0 => 'Disable', 1 => 'Enable' },
+    },
     51 => { #forum16036 (EOS R models)
         Name => 'Clarity',
         PrintConv => {
@@ -2628,6 +2633,10 @@ my %offOn = ( 0 => 'Off', 1 => 'On' );
             0x7fff => 'n/a',
         },
     },
+    52 => { #github336
+        Name  => 'HDR-PQ',
+        PrintConv => { %offOn, -1 => 'n/a' },
+    },
 );
 
 # focal length information (MakerNotes tag 0x02)
@@ -8931,7 +8940,7 @@ my %ciMaxFocal = (
     },
     3 => {
         Name => 'HighlightTonePriority',
-        PrintConv => \%offOn,
+        PrintConv => { %offOn, 2 => 'Enhanced' }, #github339 (Enhanced)
     },
     4 => {
         Name => 'LongExposureNoiseReduction',
@@ -9323,6 +9332,14 @@ my %filterConv = (
             3 => 'Vehicles',
         },
     },
+    21 => { #github344 (R6)
+        Name => 'SubjectSwitching',
+        PrintConv => {
+            0 => 'Initial Priority',
+            1 => 'On Subject',
+            2 => 'Switch Subject',
+        },
+    },
     24 => { #forum16068
         Name => 'EyeDetection',
         PrintConv => \%offOn,

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

@@ -57,7 +57,7 @@ use vars qw($VERSION $AUTOLOAD @formatSize @formatName %formatNumber %intFormat
 use Image::ExifTool qw(:DataAccess :Utils);
 use Image::ExifTool::MakerNotes;
 
-$VERSION = '4.58';
+$VERSION = '4.60';
 
 sub ProcessExif($$$);
 sub WriteExif($$$);
@@ -402,7 +402,7 @@ my %opcodeInfo = (
             THM => 'THM - DCF thumbnail file',
         },
     },
-    0x2 => { #5
+    0x2 => { #5 (not in the EXIF spec)
         Name => 'InteropVersion',
         Description => 'Interoperability Version',
         Protected => 1,
@@ -2029,7 +2029,7 @@ my %opcodeInfo = (
         OffsetPair => -1,
     },
     0x8782 => 'T88Options', #20
-    0x87ac => 'ImageLayer',
+    0x87ac => 'ImageLayer', # Defined in the Mixed Raster Content part of RFC 2301
     0x87af => { #30
         Name => 'GeoTiffDirectory',
         Format => 'undef',
@@ -4209,6 +4209,8 @@ my %opcodeInfo = (
         },
     },
     # 0xc7d6 - int8u: 1 (SubIFD1 of Nikon Z6/Z7 NEF)
+    0xc7d7 => { Name => 'ZIFMetadata',    Binary => 1 },
+    0xc7d8 => { Name => 'ZIFAnnotations', Binary => 1 },
     0xc7e9 => { # DNG 1.5
         Name => 'DepthFormat',
         Writable => 'int16u',
@@ -6360,9 +6362,10 @@ sub ProcessExif($$$)
                     $et->Warn("Bad format ($format) for $dir entry $index", $inMakerNotes);
                     ++$warnCount;
                 }
-                # assume corrupted IFD if this is our first entry (except Sony ILCE-7M2 firmware 1.21)
-                return 0 unless $index or $$et{Model} eq 'ILCE-7M2';
-                next;
+                # assume corrupted IFD if this is our first entry (except Sony ILCE which have an empty first entry)
+                next if $index or $$et{Model} =~ /^ILCE/;
+                # $et->Warn(sprintf('Format code 0x%x encountered -- Possibly corrupted IFD'));
+                return 0;
             }
         }
         my $formatStr = $formatName[$format];   # get name of this format