exiftool_vendored 12.42.0 → 12.52.0

data/bin/exiftool

@@ -11,7 +11,7 @@ use strict;
 use warnings;
 require 5.004;
 
-my $version = '12.42';
+my $version = '12.52';
 
 # add our 'lib' directory to the include list BEFORE 'use Image::ExifTool'
 BEGIN {
@@ -663,7 +663,7 @@ for (;;) {
                 }
                 $group = $2;
                 shift;
-                $group =~ /IFD/i and Warn("Can't list tags for specific IFD\n"), next;
+                $group =~ /IFD/i and Warn("Can't list tags for specific IFD\n"), $helped=1, next;
                 $group =~ /^(all|\*)$/ and undef $group;
             } else {
                 $pass or next;
@@ -1009,8 +1009,12 @@ for (;;) {
     }
     if (/^if(\d*)$/i) {
         my $cond = shift;
-        $fastCondition = $1 if length $1;
+        my $fast = length($1) ? $1 : undef;
         defined $cond or Error("Expecting expression for -if option\n"), $badCmd=1, next;
+        # use lowest -fast setting if multiple conditions
+        if (not @condition or not defined $fast or (defined $fastCondition and $fastCondition > $fast)) {
+            $fastCondition = $fast;
+        }
         # prevent processing file unnecessarily for simple case of failed '$ok' or 'not $ok'
         $cond =~ /^\s*(not\s*)\$ok\s*$/i and ($1 xor $rtnValPrev) and $failCondition=1;
         # add to list of requested tags
@@ -2307,7 +2311,7 @@ TAG:    foreach $tag (@foundTags) {
             if (ref $val) {
                 # happens with -X, -j or -php when combined with -b:
                 if (defined $binaryOutput and not $binaryOutput and $$et{TAG_INFO}{$tag}{Protected}) {
-                    # avoid extracting Protected binary tags (eg. data blocks) [insider information]
+                    # avoid extracting Unsafe binary tags (eg. data blocks) [insider information]
                     my $lcTag = lc $tag;
                     $lcTag =~ s/ .*//;
                     next unless $$et{REQ_TAG_LOOKUP}{$lcTag} or ($$et{OPTIONS}{RequestAll} || 0) > 2;
@@ -2347,7 +2351,8 @@ TAG:    foreach $tag (@foundTags) {
                 $group = $et->GetGroup($tag, $showGroup);
                 # look ahead to see if this tag may suppress a priority tag in
                 # the same group, and if so suppress this tag instead
-                next if $noDups and $tag =~ /^(.*?) \(/ and defined $$info{$1} and
+                # (note that the tag key may look like "TAG #(1)" when the "#" feature is used)
+                next if $noDups and $tag =~ /^(.*?) ?\(/ and defined $$info{$1} and
                         $group eq $et->GetGroup($1, $showGroup);
                 $group = 'Unknown' if not $group and ($xml or $json or $csv);
                 if ($fp and not ($allGroup or $csv)) {
@@ -2372,7 +2377,7 @@ TAG:    foreach $tag (@foundTags) {
                 }
             } elsif ($noDups) {
                 # don't allow duplicates, but avoid suppressing the priority tag
-                next if $tag =~ /^(.*?) \(/ and defined $$info{$1};
+                next if $tag =~ /^(.*?) ?\(/ and defined $$info{$1};
             }
 
             ++$lineCount;           # we are printing something meaningful
@@ -3254,7 +3259,7 @@ sub EncodeXML($)
 {
     my $strPt = shift;
     if ($$strPt =~ /[\0-\x08\x0b\x0c\x0e-\x1f]/ or
-        (not $altEnc and Image::ExifTool::XMP::IsUTF8($strPt) < 0))
+        (not $altEnc and Image::ExifTool::IsUTF8($strPt) < 0))
     {
         # encode binary data and non-UTF8 with special characters as base64
         $$strPt = Image::ExifTool::XMP::EncodeBase64($$strPt);
@@ -3318,7 +3323,7 @@ sub EscapeJSON($;$)
         return $str if $str =~ /^-?(\d|[1-9]\d{1,14})(\.\d{1,16})?(e[-+]?\d{1,3})?$/i;
     }
     # encode JSON string in base64 if necessary
-    if ($json < 2 and defined $binaryOutput and Image::ExifTool::XMP::IsUTF8(\$str) < 0) {
+    if ($json < 2 and defined $binaryOutput and Image::ExifTool::IsUTF8(\$str) < 0) {
         return '"base64:' . Image::ExifTool::XMP::EncodeBase64($str, 1) . '"';
     }
     # escape special characters
@@ -3394,7 +3399,7 @@ sub FormatCSV($)
     my $val = shift;
     # check for valid encoding if the Charset option was used
     if ($setCharset and ($val =~ /[^\x09\x0a\x0d\x20-\x7e\x80-\xff]/ or
-        ($setCharset eq 'UTF8' and Image::ExifTool::XMP::IsUTF8(\$val) < 0)))
+        ($setCharset eq 'UTF8' and Image::ExifTool::IsUTF8(\$val) < 0)))
     {
         $val = 'base64:' . Image::ExifTool::XMP::EncodeBase64($val, 1);
     }
@@ -3481,7 +3486,7 @@ sub ConvertBinary($)
             $obj = $$obj;
             # encode in base64 if necessary (0xf7 allows for up to 21-bit UTF-8 code space)
             if ($json == 1 and ($obj =~ /[^\x09\x0a\x0d\x20-\x7e\x80-\xf7]/ or
-                                Image::ExifTool::XMP::IsUTF8(\$obj) < 0))
+                                Image::ExifTool::IsUTF8(\$obj) < 0))
             {
                 $obj = 'base64:' . Image::ExifTool::XMP::EncodeBase64($obj, 1);
             }
@@ -3615,8 +3620,7 @@ sub CheckUTF8($$)
     my ($file, $enc) = @_;
     my $isUTF8 = 0;
     if ($file =~ /[\x80-\xff]/) {
-        require Image::ExifTool::XMP;
-        $isUTF8 = Image::ExifTool::XMP::IsUTF8(\$file);
+        $isUTF8 = Image::ExifTool::IsUTF8(\$file);
         if ($isUTF8 < 0) {
             if ($enc) {
                 Warn("Invalid filename encoding for $file\n");
@@ -4529,48 +4533,48 @@ supported by ExifTool (r = read, w = write, c = create):
 
   File Types
   ------------+-------------+-------------+-------------+------------
-  360   r/w   | DR4   r/w/c | JNG   r/w   | O     r     | RAW   r/w
-  3FR   r     | DSS   r     | JP2   r/w   | ODP   r     | RIFF  r
-  3G2   r/w   | DV    r     | JPEG  r/w   | ODS   r     | RSRC  r
-  3GP   r/w   | DVB   r/w   | JSON  r     | ODT   r     | RTF   r
-  A     r     | DVR-MS r    | JXL   r     | OFR   r     | RW2   r/w
-  AA    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     | PCD   r     | SWF   r
-  AVI   r     | FITS  r     | MAX   r     | PCX   r     | THM   r/w
-  AVIF  r/w   | FLA   r     | MEF   r/w   | PDB   r     | TIFF  r/w
-  AZW   r     | FLAC  r     | MIE   r/w/  | PDF   r/w   | TORRENT r
-  BMP   r     | FLIF  r/w   | MIFF  r   c | PEF   r/w   | TTC   r
-  BPG   r     | FLV   r     | MKA   r     | PFA   r     | TTF   r
-  BTF   r     | FPF   r     | MKS   r     | PFB   r     | TXT   r
-  CHM   r     | FPX   r     | MKV   r     | PFM   r     | VCF   r
-  COS   r     | GIF   r/w   | MNG   r/w   | PGF   r     | VRD   r/w/c
-  CR2   r/w   | GPR   r/w   | MOBI  r     | PGM   r/w   | VSD   r
-  CR3   r/w   | GZ    r     | MODD  r     | PLIST r     | WAV   r
-  CRM   r/w   | HDP   r/w   | MOI   r     | PICT  r     | WDP   r/w
-  CRW   r/w   | HDR   r     | MOS   r/w   | PMP   r     | WEBP  r
-  CS1   r/w   | HEIC  r/w   | MOV   r/w   | PNG   r/w   | WEBM  r
-  CSV   r     | HEIF  r/w   | MP3   r     | PPM   r/w   | WMA   r
-  CZI   r     | HTML  r     | MP4   r/w   | PPT   r     | WMV   r
-  DCM   r     | ICC   r/w/c | MPC   r     | PPTX  r     | WTV   r
-  DCP   r/w   | ICS   r     | MPG   r     | PS    r/w   | WV    r
-  DCR   r     | IDML  r     | MPO   r/w   | PSB   r/w   | X3F   r/w
-  DFONT r     | IIQ   r/w   | MQV   r/w   | PSD   r/w   | XCF   r
-  DIVX  r     | IND   r/w   | MRC   r     | PSP   r     | XLS   r
-  DJVU  r     | INSP  r/w   | MRW   r/w   | QTIF  r/w   | XLSX  r
-  DLL   r     | INSV  r     | MXF   r     | R3D   r     | XMP   r/w/c
-  DNG   r/w   | INX   r     | NEF   r/w   | RA    r     | ZIP   r
-  DOC   r     | ISO   r     | NKSC  r/w   | RAF   r/w   |
-  DOCX  r     | ITC   r     | NRW   r/w   | RAM   r     |
-  DPX   r     | J2C   r     | NUMBERS r   | RAR   r     |
+  360   r/w   | DPX   r     | ITC   r     | NRW   r/w   | RAM   r
+  3FR   r     | DR4   r/w/c | J2C   r     | NUMBERS r   | RAR   r
+  3G2   r/w   | DSS   r     | JNG   r/w   | O     r     | RAW   r/w
+  3GP   r/w   | DV    r     | JP2   r/w   | ODP   r     | RIFF  r
+  A     r     | DVB   r/w   | JPEG  r/w   | ODS   r     | RSRC  r
+  AA    r     | DVR-MS r    | JSON  r     | ODT   r     | RTF   r
+  AAE   r     | DYLIB r     | JXL   r     | OFR   r     | RW2   r/w
+  AAX   r/w   | EIP   r     | K25   r     | OGG   r     | RWL   r/w
+  ACR   r     | EPS   r/w   | KDC   r     | OGV   r     | RWZ   r
+  AFM   r     | EPUB  r     | KEY   r     | ONP   r     | RM    r
+  AI    r/w   | ERF   r/w   | LA    r     | OPUS  r     | SEQ   r
+  AIFF  r     | EXE   r     | LFP   r     | ORF   r/w   | SKETCH r
+  APE   r     | EXIF  r/w/c | LIF   r     | ORI   r/w   | SO    r
+  ARQ   r/w   | EXR   r     | LNK   r     | OTF   r     | SR2   r/w
+  ARW   r/w   | EXV   r/w/c | LRV   r/w   | PAC   r     | SRF   r
+  ASF   r     | F4A/V r/w   | M2TS  r     | PAGES r     | SRW   r/w
+  AVI   r     | FFF   r/w   | M4A/V r/w   | PBM   r/w   | SVG   r
+  AVIF  r/w   | FITS  r     | MACOS r     | PCD   r     | SWF   r
+  AZW   r     | FLA   r     | MAX   r     | PCX   r     | THM   r/w
+  BMP   r     | FLAC  r     | MEF   r/w   | PDB   r     | TIFF  r/w
+  BPG   r     | FLIF  r/w   | MIE   r/w/c | PDF   r/w   | TORRENT r
+  BTF   r     | FLV   r     | MIFF  r     | PEF   r/w   | TTC   r
+  CHM   r     | FPF   r     | MKA   r     | PFA   r     | TTF   r
+  COS   r     | FPX   r     | MKS   r     | PFB   r     | TXT   r
+  CR2   r/w   | GIF   r/w   | MKV   r     | PFM   r     | VCF   r
+  CR3   r/w   | GPR   r/w   | MNG   r/w   | PGF   r     | VRD   r/w/c
+  CRM   r/w   | GZ    r     | MOBI  r     | PGM   r/w   | VSD   r
+  CRW   r/w   | HDP   r/w   | MODD  r     | PLIST r     | WAV   r
+  CS1   r/w   | HDR   r     | MOI   r     | PICT  r     | WDP   r/w
+  CSV   r     | HEIC  r/w   | MOS   r/w   | PMP   r     | WEBP  r/w
+  CUR   r     | HEIF  r/w   | MOV   r/w   | PNG   r/w   | WEBM  r
+  CZI   r     | HTML  r     | MP3   r     | PPM   r/w   | WMA   r
+  DCM   r     | ICC   r/w/c | MP4   r/w   | PPT   r     | WMV   r
+  DCP   r/w   | ICO   r     | MPC   r     | PPTX  r     | WTV   r
+  DCR   r     | ICS   r     | MPG   r     | PS    r/w   | WV    r
+  DFONT r     | IDML  r     | MPO   r/w   | PSB   r/w   | X3F   r/w
+  DIVX  r     | IIQ   r/w   | MQV   r/w   | PSD   r/w   | XCF   r
+  DJVU  r     | IND   r/w   | MRC   r     | PSP   r     | XLS   r
+  DLL   r     | INSP  r/w   | MRW   r/w   | QTIF  r/w   | XLSX  r
+  DNG   r/w   | INSV  r     | MXF   r     | R3D   r     | XMP   r/w/c
+  DOC   r     | INX   r     | NEF   r/w   | RA    r     | ZIP   r
+  DOCX  r     | ISO   r     | NKSC  r/w   | RAF   r/w   |
 
   Meta Information
   ----------------------+----------------------+---------------------
@@ -4990,16 +4994,17 @@ B<-struct> option for details.
 8) With the redirection feature, copying a tag directly (ie.
 E<quot>'-I<DSTTAG>E<lt>I<SRCTAG>'E<quot>) is not the same as interpolating
 its value inside a string (ie. E<quot>'-I<DSTTAG>E<lt>$I<SRCTAG>'E<quot>)
-for list-type tags, L<shortcut tags|Image::ExifTool::Shortcuts>, tag names
-containing wildcards, or UserParam variables.  When copying directly, the
-values of each matching source tag are copied individually to the
-destination tag (as if they were separate assignments).  However, when
-interpolated inside a string, list items and the values of shortcut tags are
-concatenated (with a separator set by the B<-sep> option), and wildcards are
-not allowed.  Also, UserParam variables are available only when interpolated
-in a string.  Another difference is that a minor warning is generated if a
-tag doesn't exist when interpolating its value in a string (with C<$>), but
-isn't when copying the tag directly.
+for source tags which are list-type tags,
+L<shortcut tags|Image::ExifTool::Shortcuts>, tag names containing wildcards,
+or UserParam variables.  When copying directly, the values of each matching
+source tag are copied individually to the destination tag (as if they were
+separate assignments).  However, when interpolated inside a string, list
+items and the values of shortcut tags are concatenated (with a separator set
+by the B<-sep> option), and wildcards are not allowed.  Also, UserParam
+variables are available only when interpolated in a string.  Another
+difference is that a minor warning is generated if a tag doesn't exist when
+interpolating its value in a string (with C<$>), but isn't when copying the
+tag directly.
 
 Finally, the behaviour is different when a destination tag or group of
 C<All> is used.  When copying directly, a destination group and/or tag name
@@ -5058,8 +5063,8 @@ are in the default output.  By default, list items are separated by a
 newline when extracted with the B<-b> option, but this may be changed (see
 the B<-sep> option for details).  May be combined with B<-j>, B<-php> or
 B<-X> to extract binary data in JSON, PHP or XML format, but note that
-"Unsafe" tags are not extracted as binary unless they are specified explicitly or
-the API RequestAll option is set to 3 or higher.
+"Unsafe" tags are not extracted as binary unless they are specified
+explicitly or the API RequestAll option is set to 3 or higher.
 
 With a leading double dash (B<--b> or B<--binary>), tags which contain
 binary data are suppressed in the output when reading.
@@ -5224,7 +5229,8 @@ option has no effect on date-only or time-only tags and ignores timezone
 information if present.  ExifTool adds a C<%f> format code to represent
 fractional seconds, and supports an optional width to specify the number of
 digits after the decimal point (eg. C<%3f> would give something like
-C<.437>).  Only one B<-d> option may be used per command.  Requires
+C<.437>), and a minus sign to drop the decimal point (eg. C<%-3f> would give
+C<437>).  Only one B<-d> option may be used per command.  Requires
 POSIX::strptime or Time::Piece for the inversion conversion when writing.
 
 =item B<-D> (B<-decimal>)
@@ -5317,7 +5323,9 @@ ASCII "base64:" as the first 7 bytes of the value), and B<-t> may be added
 to include tag table information (see B<-t> for details).  The JSON output
 is UTF-8 regardless of any B<-L> or B<-charset> option setting, but the
 UTF-8 validation is disabled if a character set other than UTF-8 is
-specified.
+specified.  Note that ExifTool quotes JSON values only if they don't look
+like numbers (regardless of the original storage format or the relevant
+metadata specification).
 
 If I<JSONFILE> is specified, the file is imported and the tag definitions
 from the file are used to set tag values on a per-file basis.  The special
@@ -5361,7 +5369,7 @@ been implemented.  May also be combined with B<-listx> to output
 descriptions in one language only.
 
 By default, ExifTool uses UTF-8 encoding for special characters, but the
-the B<-L> or B<-charset> option may be used to invoke other encodings.  Note
+B<-L> or B<-charset> option may be used to invoke other encodings.  Note
 that ExifTool uses Unicode::LineBreak if available to help preserve the
 column alignment of the plain text output for languages with a
 variable-width character set.
@@ -5467,7 +5475,7 @@ with this command:
 
 produces output like this:
 
-    -- Generated by ExifTool 12.42 --
+    -- Generated by ExifTool 12.52 --
     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
@@ -5475,8 +5483,8 @@ produces output like this:
     -- end --
 
 The values of List-type tags with multiple items and Shortcut tags
-representing multiple tags are joined according the the B<-sep> option
-setting when interpolated in the string.
+representing multiple tags are joined according the B<-sep> option setting
+when interpolated in the string.
 
 When B<-ee> (B<-extractEmbedded>) is combined with B<-p>, embedded documents
 are effectively processed as separate input files.
@@ -5489,7 +5497,12 @@ warnings and leave the missing values empty.  Alternatively, B<-q -q> may be
 used to simply suppress the warning messages.
 
 The L</Advanced formatting feature> may be used to modify the values of
-individual tags with the B<-p> option.
+individual tags within the B<-p> option string.
+
+Note that the API RequestTags option is automatically set for all tags used
+in the I<FMTFILE> or I<STR>.  This allows all other tags to be ignored using
+B<-API IgnoreTags=all>, resulting in reduced memory usage and increased
+speed.
 
 =item B<-php>
 
@@ -5881,12 +5894,14 @@ audio/video data in WAV/AVI files to search for additional metadata.  These
 speed benefits are small when reading images directly from disk, but can be
 substantial if piping images through a network connection.  For more
 substantial speed benefits, B<-fast2> also causes exiftool to avoid
-extracting any EXIF MakerNote information.  B<-fast3> avoids extracting
-metadata from the file, and returns only pseudo System tags, but still reads
-the file header to obtain an educated guess at FileType.  B<-fast4> doesn't
-even read the file header, and returns only System tags and a FileType based
-on the file extension.  B<-fast5> also disables generation of the Composite
-tags (like B<-e>).  Has no effect when writing.
+extracting any EXIF MakerNote information, and to stop processing at the
+IDAT chunk of PNG images and the mdat atom of QuickTime-format files (but
+note that some files may store metadata after this).  B<-fast3> avoids
+extracting metadata from the file, and returns only pseudo System tags, but
+still reads the file header to obtain an educated guess at FileType.
+B<-fast4> doesn't even read the file header, and returns only System tags
+and a FileType based on the file extension.  B<-fast5> also disables
+generation of the Composite tags (like B<-e>).  Has no effect when writing.
 
 Note that a separate B<-fast> setting may be used for evaluation of a B<-if>
 condition, or when ordering files with the B<-fileOrder> option.  See the
@@ -5906,14 +5921,13 @@ order may be reversed by prefixing the tag name with a C<-> (eg.
 C<-fileOrder -createdate>).  Print conversion of the sorted values is
 disabled with the B<-n> option, or a C<#> appended to the tag name.  Other
 formatting options (eg. B<-d>) have no effect on the sorted values.  Note
-that the B<-fileOrder> option can have a large performance impact since it
-involves an additional processing pass of each file, but this impact may be
-reduced by specifying a I<NUM> for the B<-fast> level used during the
-metadata-extraction phase.  For example, B<-fileOrder4> may be used if
-I<TAG> is a pseudo System tag.  If multiple B<-fileOrder> options are used,
-the extraction is done at the lowest B<-fast> level.  Note that files are
-sorted across directory boundaries if multiple input directories are
-specified.
+that the B<-fileOrder> option can incur large performance penalty since it
+involves an additional initial processing pass of all files, but this impact
+may be reduced by specifying a I<NUM> to effectively set the B<-fast> level
+for the initial pass.  For example, B<-fileOrder4> may be used if I<TAG> is
+a pseudo System tag.  If multiple B<-fileOrder> options are used, the
+extraction is done at the lowest B<-fast> level.  Note that files are sorted
+across directory boundaries if multiple input directories are specified.
 
 =item B<-i> I<DIR> (B<-ignore>)
 
@@ -5978,10 +5992,11 @@ 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.)
 
-3) Tags in the string are interpolated the same way as with B<-p> before the
+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
-newline and C<$$> represents a single C<$> symbol (so Perl variables, if
-used, require a double C<$>).
+newline and C<$$> represents a single C<$> symbol.  So Perl variables, if
+used, require a double C<$>, and regular expressions ending in C<$/> must
+use C<$$/> instead.
 
 4) The condition may only test tags from the file being processed.  To
 process one file based on tags from another, two steps are required.  For
@@ -5999,6 +6014,9 @@ the values of duplicate tags are accessible only by specifying a group name
 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.
+
 =item B<-m> (B<-ignoreMinorErrors>)
 
 Ignore minor errors and warnings.  This enables writing to files with minor
@@ -6244,12 +6262,13 @@ are some examples:
 
 When combined with B<-listx>, the B<-s> option shortens the output by
 omitting the descriptions and values (as in the last example above), and
-B<-f> adds a 'flags' attribute if applicable.  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 L<Tag Name
-documentation|Image::ExifTool::TagNames>).  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.
+B<-f> adds 'flags' and 'struct' attributes if applicable.  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 L<Tag Name documentation|Image::ExifTool::TagNames>).  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.
 
 Note that none of the B<-list> options require an input I<FILE>.
 
@@ -7228,7 +7247,7 @@ Combine multiple track logs and geotag an entire directory tree of images.
 
 Read all track logs from the C<tracks> directory.
 
-=item exiftool -p gpx.fmt -d %Y-%m-%dT%H:%M:%SZ dir > out.gpx
+=item exiftool -p gpx.fmt dir > out.gpx
 
 Generate a GPX track log from all images in directory C<dir>.  This example
 uses the C<gpx.fmt> file included in the full ExifTool distribution package

data/bin/fmt_files/gpx.fmt

@@ -16,6 +16,9 @@
 #            2) The -ee3 option is to extract the full track from video files.
 #            3) The -fileOrder option may be used to control the order of the
 #               generated track points when processing multiple files.
+#            4) Coordinates are written at full resolution.  To change this,
+#               remove the "#" from the GPSLatitude/Longitude tag names below
+#               and use the -c option to set the desired precision.
 #------------------------------------------------------------------------------
 #[HEAD]<?xml version="1.0" encoding="utf-8"?>
 #[HEAD]<gpx version="1.0"

data/bin/fmt_files/gpx_wpt.fmt

@@ -17,6 +17,9 @@
 #            2) The -ee3 option is to extract the full track from video files.
 #            3) The -fileOrder option may be used to control the order of the
 #               generated track points when processing multiple files.
+#            4) Coordinates are written at full resolution.  To change this,
+#               remove the "#" from the GPSLatitude/Longitude tag names below
+#               and use the -c option to set the desired precision.
 #------------------------------------------------------------------------------
 #[HEAD]<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
 #[HEAD]<gpx version="1.1"

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

@@ -15,7 +15,7 @@ use vars qw($VERSION);
 use Image::ExifTool::Exif;
 use Image::ExifTool::PLIST;
 
-$VERSION = '1.05';
+$VERSION = '1.07';
 
 # Apple iPhone metadata (ref PH)
 %Image::ExifTool::Apple::Main = (
@@ -66,12 +66,21 @@ $VERSION = '1.05';
         Writable => 'string',
         Notes => 'unique ID for all images in a burst',
     },
-    # 0x000c - rational64s[2]: eg) "0.1640625 0.19921875"
+    0x000c => { # ref forum13710 (Neal Krawetz)
+        Name => 'FocusDistanceRange',
+        Writable => 'rational64s',
+        Count => 2,
+        PrintConv => q{
+            my @a = split ' ', $val;
+            sprintf('%.2f - %.2f m', $a[0] <= $a[1] ? @a : reverse @a);
+        },
+        PrintConvInv => '$val =~ s/ - //; $val =~ s/ ?m$//; $val',
+    },
     # 0x000d - int32s: 0,1,6,20,24,32,40
     # 0x000e - int32s: 0,1,4,12 (Orientation? 0=landscape? 4=portrait? ref 1)
     # 0x000f - int32s: 2,3
     # 0x0010 - int32s: 1
-    0x0011 => {
+    0x0011 => { # (if defined, there is a live photo associated with the video, #forum13565)
         Name => 'MediaGroupUUID', #NealKrawetz private communication
         # (changed in 12.19 from Name => 'ContentIdentifier', #forum8750)
         Writable => 'string',
@@ -82,6 +91,10 @@ $VERSION = '1.05';
         Writable => 'string',
     },
     # 0x0016 - string[29]: "AXZ6pMTOh2L+acSh4Kg630XCScoO\0"
+    0x0017 => { #forum13565 (only valid if MediaGroupUUID exists)
+        Name => 'LivePhotoVideoIndex',
+        Notes => 'divide by RunTimeScale to get time in seconds',
+    },
     # 0x0017 - int32s: 0,8192
     # 0x0019 - int32s: 0,2,128
     # 0x001a - string[6]: "q825s\0"

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.47';
+$VERSION = '3.50';
 @ISA = qw(Exporter);
 
 sub NumbersFirst($$);
@@ -501,11 +501,13 @@ been decoded.  Use the L<Unknown|../ExifTool.html#Unknown> (-u) option to extrac
 },
     GeoTiff => q{
 ExifTool extracts the following tags from GeoTIFF images.  See
-L<http://www.remotesensing.org/geotiff/spec/geotiffhome.html> for the
-complete GeoTIFF specification.  Also included in the table below are
-ChartTIFF tags (see L<http://www.charttiff.com/whitepapers.shtml>). GeoTIFF
-tags are not writable individually, but they may be copied en mass via the
-block tags GeoTiffDirectory, GeoTiffDoubleParams and GeoTiffAsciiParams.
+L<https://web.archive.org/web/20070820121549/http://www.remotesensing.org/geotiff/spec/geotiffhome.html>
+for the complete GeoTIFF specification.  Also included in the table below
+are ChartTIFF tags (see
+L<https://web.archive.org/web/20020828193928/http://www.charttiff.com/whitepapers.shtml>).
+GeoTIFF tags are not writable individually, but they may be copied en mass
+via the block tags GeoTiffDirectory, GeoTiffDoubleParams and
+GeoTiffAsciiParams.
 },
     JFIF => q{
 The following information is extracted from the JPEG JFIF header.  See
@@ -1289,16 +1291,19 @@ TagID:  foreach $tagID (@keys) {
                         $printConv = shift @printConvList;
                         $index = shift @indexList;
                     }
-                } elsif ($printConv and $printConv =~ /DecodeBits\(\$val,\s*(\{.*\})\s*\)/s) {
+                # look inside scalar PrintConv for a bit/byte conversion
+                # (see Photoshop:PrintFlags for use of "$byte" decoding)
+                } elsif ($printConv and $printConv =~ /DecodeBits\(\$(val|byte),\s*(\\\%[\w:]+|\{.*\})\s*\)/s) {
+                    my $type = $1 eq 'byte' ? 'Byte' : 'Bit';
                     $$self{Model} = '';   # needed for Nikon ShootingMode
-                    my $bits = eval $1;
+                    my $bits = eval $2;
                     delete $$self{Model};
                     if ($@) {
                         warn $@;
                     } else {
                         my @pk = sort { NumbersFirst($a,$b) } keys %$bits;
                         foreach (@pk) {
-                            push @values, "Bit $_ = " . $$bits{$_};
+                            push @values, "$type $_ = " . $$bits{$_};
                         }
                     }
                 }
@@ -1324,9 +1329,12 @@ TagID:  foreach $tagID (@keys) {
                     if ($writable) {
                         foreach ('PrintConv','ValueConv') {
                             next unless $$tagInfo{$_};
-                            next if $$tagInfo{$_ . 'Inv'};
-                            next if ref($$tagInfo{$_}) =~ /^(HASH|ARRAY)$/;
-                            next if $$tagInfo{WriteAlso};
+                            next if defined $$tagInfo{$_ . 'Inv'};
+                            # (undefined inverse conversion overrides hash lookup)
+                            unless (exists $$tagInfo{$_ . 'Inv'}) {
+                                next if ref($$tagInfo{$_}) =~ /^(HASH|ARRAY)$/;
+                                next if $$tagInfo{WriteAlso};
+                            }
                             if ($_ eq 'ValueConv') {
                                 undef $writable;
                             } else {
@@ -2570,6 +2578,9 @@ sub WriteTagNames($$)
                 $tip = '';
                 # use copyright symbol in QuickTime UserData tags
                 $tagIDstr =~ s/^"\\xa9/"&copy;/;
+                # escape necessary characters in html
+                $tagIDstr =~ s/>/&gt;/g;
+                $tagIDstr =~ s/</&lt;/g;
             }
             # add tooltip for special writable attributes
             my $wtip = '';