exiftool-vendored.pl 12.30.0 → 12.38.0

package/bin/Changes

@@ -7,6 +7,129 @@ RSS feed: https://exiftool.org/rss.xml
 Note: The most recent production release is Version 12.30. (Other versions are
 considered development releases, and are not uploaded to MetaCPAN.)
 
+Dec. 20, 2021 - Version 12.38
+
+  - Decode a number of new tags for the Nikon Z9 (thanks Warren Hatch)
+  - Patched incorrect decoding of AEBShotCount for the Canon EOS 90D
+  - Patched EXR reader to support long tag names
+  - Patched security issue (thanks Joe Lothan)
+  - Fixed an incorrect tag ID for a new Nikon MakerNote tag (github #108)
+  - Fixed XMP-exif:GPSMeasureMode conversions to match EXIF
+  - Fixed problem where some namespaces may be undeclared in the -X output when
+    using the -struct option
+
+Dec. 8, 2021 - Version 12.37
+
+  - Decode timed GPS from Vantrue S1 dashcam MP4 videos
+  - Decode ColorData tags for the Canon EOS R3 (thanks LibRaw)
+  - Decode more makernotes tags for Nikon Z cameras (thanks Warren Hatch)
+  - Extract TransparentColor from GIF images
+  - Improved parsing of input time values for GPSTimeStamp to properly handle a
+    "." separator
+  - Improved warning when incorrectly using "
+
+Nov. 16, 2021 - Version 12.36
+
+  - IMPORTANT: Fixed bug introduced in 12.35 which corrupted JPEG 2000 images
+    when removing all metadata with -all=
+  - Added feature to bypass processing of specified XMP namespaces and
+    properties (to improve performance in cases where the XMP suffers from
+    Adobe-editing bloat)
+  - Added a number of new XMP tags used by Lightroom 11.0
+  - Decode a number of new Nikon tags (thanks Warren Hatch)
+  - Made the Composite GPSPosition tag writable
+  - Fixed erroneous "Skipped unknown bytes after JPEG SOS" warning
+  - Fixed group for new writable Jpeg2000 color tags in -listx output
+  - Fixed problem finding files in Windows when using wildcards in file name and
+    a drive letter with no slash
+
+Nov. 11, 2021 - Version 12.35
+
+  - Added ability to write ICC_Profile (and other color specifications) to
+    Jpeg2000 images
+  - Added %o code to -W option format string
+  - Added %f code to -d option for fractional seconds
+  - Added a couple of new Sony LensType values (thanks Jos Roost)
+  - Added a new CanonModelID (thanks Norbert Wasser)
+  - Added a new Nikon LensID
+  - Decode more Nikon MakerNotes tags for some new models (thanks Warren Hatch)
+  - Extract ThumbnailImage from some DJI drone videos
+  - Enhanced -ee option to extract metadata from all frames in a SEQ file
+  - Patched to avoid possible "Use of uninitialized value" runtime warning
+  - Fixed a couple of misspelt new ICC_Profile tag names (thanks Herb)
+  - Fixed problem generating the correct file extension when extracting
+    OriginalRawImage from a DNG file using the -W option with the %s format code
+  - Fixed bug introduced in 11.91 where exiftool couldn't find its libraries
+    when run via a soft link.  Also changed to look for config file in the link
+    target directory instead of the directory of the link itself
+
+Oct. 27, 2021 - Version 12.34
+
+  - Added support for ICC.2:2019 (Profile version 5.0.0 - iccMAX) color profiles
+  - Added ability to detect/delete a Windows Zone.Identifier alternate data
+    stream (ADS) via the new ZoneIdentifier tag (thanks Alex Xu)
+  - Added support for the Sony ILCE-7M4 (thanks Jos Roost)
+  - Added a new Sony lens (thanks LibRaw and Jos Roost)
+  - Added a new SonyModelID (thanks LibRaw)
+  - Added a new Canon RF lens (thanks Norbert Wasser)
+  - Improved handling of some SVG files
+  - Patched -overwrite_original_in_place option to open the output file in
+    update mode rather than write mode (to allow some write optimizations on
+    certain filesystems) (thanks Joel Low)
+  - Fixed case of tag ID for new XMP-iptcExt:EventID (thanks Michael Steidl)
+  - Fixed problem extracting ICC_Profile information from some PDF files
+  - API Changes:
+      - Added QuickTimePad option
+
+Oct. 16, 2021 - Version 12.33
+
+  - Added support for DNG version 1.6.0.0
+  - Added two new Sony LensType values (thanks Jos Roost and LibRaw)
+  - Added some new elements to the XMP-crs:Look structure (thanks Herb)
+  - Added a few new IPTC XMP tags (thanks Michael Steidl)
+  - Added a new Canon RF lens (thanks Norbert Wasser)
+  - Decode Canon ShutterMode (thanks John Moyer)
+  - Extract LensModel from some Olympus MOV videos
+  - Generate MediaDataOffset/Size for MOV videos with zero-sized MDAT chunk
+  - Improvements to CBOR reader, including hex dump with -v3 option
+  - Recognize Final Cut Pro XML files
+  - Allow binary data of Protected tags to be extracted with the -X -j and -php
+    options with -b by setting the API RequestAll option to 3
+  - Changed name of "Canon EF 80-200mm f/4.5-5.6" lens with LensType 38 to add
+    "II" to the name (Exiv2 issue 1906)
+  - Fixed runtime warning when processing files with a .DIR extension
+
+Sept. 30, 2021 - Version 12.32
+
+  - Added support for CBOR-format metadata in JUMBF (note that JUMBF support is
+    still experimental)
+  - Added a new Nikon LensID
+  - Added a new Pentax LensType
+  - Decode timed GPS for two more dashcam formats
+  - Support reference direction columns in -geotag CSV input
+  - Removed generation of GPSSpeedRef and GPSTrackRef tags in timed metadata for
+    most dashcam formats when speed is km/h and track is relative to true north
+  - Patched to allow writing of console output to named pipes
+  - Fixed formatting of InternalSerialNumber for some Panasonic cameras
+  - Fixed bug in arg_files/xmp2exif.args support file
+
+Sept. 22, 2021 - Version 12.31
+
+  - Added a new SonyModelID and a couple of new Sony lenses (thanks Jos Roost)
+  - Added a new Canon LensType (thanks Chris Skopec)
+  - Added Composite GPSLatitude/Longitude tags for Sony videos to combine the
+    reference hemispheres as with the Composite tags for EXIF GPS
+  - Decode DPX AspectRatio
+  - Decode more GoPro MP4 tags
+  - Extract ICC_Profile from CS0 object in PDF files
+  - Extract encrypted GPS from Akaso V1 dashcam videos (can't yet decrypt)
+  - Improved handling of QuickTime iTunesInfo tags, and created new "iTunes"
+    family 1 group for these
+  - Patched so NoPDFList option also applies when writing
+  - Patched to allow user-defined PNG TextualData tags to be written only as iTXt
+  - Patched PDF reader to avoid concatenating values of multiple List-type tags
+    into a single tag
+
 Aug. 12, 2021 - Version 12.30 (production release)
 
   - Added read support for Portable FloatMap (PFM) images (this was a bit of a
@@ -86,6 +209,8 @@ May 20, 2021 - Version 12.26 (production release)
   - Fixed problem which could cause a "Wide character" warning and generate a
     corrupted output file when writing some illegal values
 
+History of older versions (back to Nov. 19, 2003 - Version 1.00) -->
+
 Apr. 22, 2021 - Version 12.25
 
   - JPEG XL support is now official
@@ -568,6 +693,7 @@ Mar. 19, 2020 - Version 11.92
 
 Mar. 5, 2020 - Version 11.91
 
+  - Added undocumented -xpath option for use by alternate Windows version
   - Decode a couple of new Panasonic tags
   - Documented -ec option (available since version 11.54)
   - Reverted -htmlDump fix of 11.90 because it broke more than it fixed, and
@@ -1453,8 +1579,8 @@ Oct. 9, 2018 - Version 11.13
   - Added a new Canon LensType (thanks LibRaw)
   - Minor improvements to verbose dump of streaming GPS metadata
   - Reverted change of version 10.71 which resulted in Windows not recognizing
-    PNG CreationTime as written by ExifTool (added this feature to the
-    StrictDate API option instead)
+    PNG CreationTime as written by ExifTool (added this feature to the API
+    StrictDate option instead)
   - Improved decoding of Nikon CropHiSpeed (thanks LibRaw)
   - Improved -fast option to reduce memory usage when reading JPG, PNG,
     QuickTime-based and RIFF-based files via a sequential stream
@@ -1568,7 +1694,7 @@ June 21, 2018 - Version 11.03
 June 13, 2018 - Version 11.02
 
   - Added support for a different format of Apple iWorks files
-  - Added undocumented FixCorruptedMOV API option to allow fixing MOV videos
+  - Added undocumented API FixCorruptedMOV option to allow fixing MOV videos
     with multiple 'mdat' atoms which were corrupted by ExifTool
   - Decode more QuickTime tags
   - Decode more PanasonicRaw tags (thanks Klaus Homeister)

package/bin/MANIFEST

@@ -48,6 +48,7 @@ html/TagNames/Apple.html
 html/TagNames/Audible.html
 html/TagNames/BMP.html
 html/TagNames/BPG.html
+html/TagNames/CBOR.html
 html/TagNames/Canon.html
 html/TagNames/CanonCustom.html
 html/TagNames/CanonRaw.html
@@ -217,6 +218,7 @@ lib/Image/ExifTool/BPG.pm
 lib/Image/ExifTool/BZZ.pm
 lib/Image/ExifTool/BigTIFF.pm
 lib/Image/ExifTool/BuildTagLookup.pm
+lib/Image/ExifTool/CBOR.pm
 lib/Image/ExifTool/Canon.pm
 lib/Image/ExifTool/CanonCustom.pm
 lib/Image/ExifTool/CanonRaw.pm

package/bin/META.json

@@ -47,6 +47,6 @@
       }
    },
    "release_status" : "stable",
-   "version" : "12.30",
+   "version" : "12.38",
    "x_serialization_backend" : "JSON::PP version 4.02"
 }

package/bin/META.yml

@@ -28,5 +28,5 @@ recommends:
   Time::HiRes: 0
 requires:
   perl: 5.004
-version: 12.30
+version: 12.38
 x_serialization_backend: 'JSON::PP version 4.02'

package/bin/README

@@ -107,8 +107,8 @@ your home directory, then you would type the following commands in a
 terminal window to extract and run ExifTool:
 
   cd ~/Desktop
-  gzip -dc Image-ExifTool-12.30.tar.gz | tar -xf -
-  cd Image-ExifTool-12.30
+  gzip -dc Image-ExifTool-12.38.tar.gz | tar -xf -
+  cd Image-ExifTool-12.38
   ./exiftool t/images/ExifTool.jpg
 
 Note:  These commands extract meta information from one of the test images. 

package/bin/arg_files/xmp2exif.args

@@ -13,6 +13,7 @@
 #               2015/01/12 - PH Avoid copying from non-standard namespaces
 #               2016/09/26 - PH Write Composite SubSec tags
 #               2018/05/07 - PH Added support for GPSDestXxxRef tags
+#               2021/09/30 - PH Removed erroneous "-" when copying CreatorTool
 #
 # References:   http://www.metadataworkinggroup.org/specs/
 #
@@ -34,7 +35,7 @@
 -Composite:SubSecDateTimeOriginal < XMP-photoshop:DateCreated
 -Composite:SubSecCreateDate < XMP-xmp:CreateDate
 -Composite:SubSecModifyDate < XMP-xmp:ModifyDate
--EXIF:Software < -XMP-xmp:CreatorTool
+-EXIF:Software < XMP-xmp:CreatorTool
 -EXIF:Copyright < XMP-dc:Rights
 -EXIF:Artist < XMP-dc:Creator
 # XMP flash information is translated by the Composite Flash tag

package/bin/config_files/example.config

@@ -133,7 +133,7 @@
         # Example 12.  PNG:NewPngTag1
         NewPngTag1 => { },
         # Example 13.  PNG:NewPngTag2
-        NewPngTag2 => { },
+        NewPngTag2 => { iTXt => 1 }, # (force this tag to be written as iTXt)
         # Example 14.  PNG:NewPngTag3
         NewPngTag3 => { },
     },

package/bin/exiftool

@@ -10,24 +10,26 @@
 use strict;
 require 5.004;
 
-my $version = '12.30';
+my $version = '12.38';
 
 # add our 'lib' directory to the include list BEFORE 'use Image::ExifTool'
-my $exeDir;
 BEGIN {
     # (undocumented -xpath option added in 11.91, must come before other options)
-    $Image::ExifTool::exePath = @ARGV && lc($ARGV[0]) eq '-xpath' && shift() ? $^X : $0;
+    my $exePath = @ARGV && lc($ARGV[0]) eq '-xpath' && shift() ? $^X : $0;
     # get exe directory
-    $exeDir = ($Image::ExifTool::exePath =~ /(.*)[\\\/]/) ? $1 : '.';
+    my $exeDir = ($exePath =~ /(.*)[\\\/]/) ? $1 : '.';
+    my $incDir = ($0 =~ /(.*)[\\\/]/) ? "$1/lib" : './lib';
     if (-l $0) {
         my $lnk = eval { readlink $0 };
         if (defined $lnk) {
             my $lnkDir = ($lnk =~ /(.*)[\\\/]/) ? $1 : '.';
             $exeDir = (($lnk =~ m(^/)) ? '' : $exeDir . '/') . $lnkDir;
+            $incDir = "$exeDir/lib";
         }
     }
+    $Image::ExifTool::exeDir = $exeDir; # use our exeDir for loading config file
     # add lib directory at start of include path
-    unshift @INC, ($0 =~ /(.*)[\\\/]/) ? "$1/lib" : './lib';
+    unshift @INC, $incDir;
     # load or disable config file if specified
     if (@ARGV and lc($ARGV[0]) eq '-config') {
         shift;
@@ -757,7 +759,7 @@ for (;;) {
         }
         my $fp = ($stayOpen == 1 ? \*STAYOPEN : \*ARGFILE);
         unless ($mt->Open($fp, $argFile)) {
-            unless ($argFile !~ /^\// and $mt->Open($fp, "$exeDir/$argFile")) {
+            unless ($argFile !~ /^\// and $mt->Open($fp, "$Image::ExifTool::exeDir/$argFile")) {
                 Error "Error opening arg file $argFile\n";
                 $badCmd = 1;
                 next
@@ -1235,7 +1237,7 @@ for (;;) {
         $textOverwrite += 2 if $t2 =~ /\+/; # append
         if ($t1 ne 'W' and lc($t1) ne 'tagout') {
             undef $tagOut;
-        } elsif ($textOverwrite >= 2 and $textOut !~ /%[-+]?\d*[.:]?\d*[lu]?[tgs]/) {
+        } elsif ($textOverwrite >= 2 and $textOut !~ /%[-+]?\d*[.:]?\d*[lu]?[tgso]/) {
             $tagOut = 0; # append tags to one file
         } else {
             $tagOut = 1; # separate file for each tag
@@ -1619,7 +1621,7 @@ if (@newValues) {
             next;
         }
         my %opts = ( Shift => 0 );  # shift values if possible instead of adding/deleting
-        # allow writing of 'unsafe' tags unless specified by wildcard
+        # allow writing of 'Unsafe' tags unless specified by wildcard
         $opts{Protected} = 1 unless $tag =~ /[?*]/;
 
         if ($tag =~ s/<// and defined $newVal) {
@@ -1967,6 +1969,7 @@ sub GetImageInfo($$)
             } else {
                 $pipe = qq{bzip2 -dc "$file" |};
             }
+            $$et{TRUST_PIPE} = 1;
         }
     }
     # evaluate -if expression for conditional processing
@@ -2237,12 +2240,13 @@ sub GetImageInfo($$)
                         next unless defined $forcePrint;
                         $grp0 = $grp1 = 'Unknown';
                     }
+                    # add groups from structure fields
+                    AddGroups($$info{$tag}, $grp0, \%groups, \@groups) if ref $$info{$tag};
                     next if $groups{$grp1};
                     # include family 0 and 1 groups in URI except for internal tags
                     # (this will put internal tags in the "XML" group on readback)
                     $groups{$grp1} = $grp0;
                     push @groups, $grp1;
-                    AddGroups($$info{$tag}, $grp0, \%groups, \@groups) if ref $$info{$tag};
                 }
                 foreach $grp1 (@groups) {
                     my $grp = $groups{$grp1};
@@ -2285,7 +2289,7 @@ TAG:    foreach $tag (@foundTags) {
                     # avoid extracting Protected binary tags (eg. data blocks) [insider information]
                     my $lcTag = lc $tag;
                     $lcTag =~ s/ .*//;
-                    next unless $$et{REQ_TAG_LOOKUP}{$lcTag};
+                    next unless $$et{REQ_TAG_LOOKUP}{$lcTag} or ($$et{OPTIONS}{RequestAll} || 0) > 2;
                 }
                 $val = ConvertBinary($val); # convert SCALAR references
                 next unless defined $val;
@@ -2365,7 +2369,8 @@ TAG:    foreach $tag (@foundTags) {
                     }
                     my @groups = $et->GetGroup($tag);
                     $outfile and close($fp), undef($tmpText); # (shouldn't happen)
-                    ($fp, $outfile, $append) = OpenOutputFile($orig, $tagName, \@groups, $ext);
+                    my $org = $et->GetValue('OriginalRawFileName') || $et->GetValue('OriginalFileName');
+                    ($fp, $outfile, $append) = OpenOutputFile($orig, $tagName, \@groups, $ext, $org);
                     $fp or ++$countBad, next TAG;
                     $tmpText = $outfile unless $append;
                 }
@@ -3061,12 +3066,14 @@ sub SetImageInfo($$$)
                         # temporarily disable CTRL-C during this critical operation
                         $critical = 1;
                         undef $tmpFile;     # handle deletion of temporary file ourself
-                        if ($et->Open(\*ORIG_FILE, $file, '>')) {
+                        if ($et->Open(\*ORIG_FILE, $file, '+<')) {
                             binmode(ORIG_FILE);
                             while (read(NEW_FILE, $buff, 65536)) {
                                 print ORIG_FILE $buff or $err = 1;
                             }
                             close(NEW_FILE);
+                            # Handle files being shorter than the original
+                            eval { truncate(ORIG_FILE, tell(ORIG_FILE)) } or $err = 1;
                             close(ORIG_FILE) or $err = 1;
                             if ($err) {
                                 Warn "Couldn't overwrite in place - $file\n";
@@ -3250,7 +3257,8 @@ sub FormatXML($$$)
     } elsif (ref $val eq 'HASH') {
         $gt = " rdf:parseType='Resource'>";
         my $val2 = '';
-        foreach (sort keys %$val) {
+        my @keys = $$val{_ordered_keys_} ? @{$$val{_ordered_keys_}} : sort keys %$val;
+        foreach (@keys) {
             # (some variable-namespace XML structure fields may have a different group)
             my $tok = /:/ ? $_ : ($grp . ':' . $_);
             $val2 .= "\n$ind <$tok" . FormatXML($$val{$_}, "$ind ", $grp) . "</$tok>";
@@ -3327,7 +3335,8 @@ sub FormatJSON($$$)
     } elsif (ref $val eq 'HASH') {
         my ($bra, $ket, $sep) = $json == 1 ? ('{','}',':') : ('Array(',')',' =>');
         print $fp $bra;
-        foreach (sort keys %$val) {
+        my @keys = $$val{_ordered_keys_} ? @{$$val{_ordered_keys_}} : sort keys %$val;
+        foreach (@keys) {
             print $fp ',' if $comma;
             my $key = EscapeJSON($_, 1);
             print $fp qq(\n$ind  $key$sep );
@@ -3460,18 +3469,26 @@ sub ConvertBinary($)
 }
 
 #------------------------------------------------------------------------------
-# Compare two tag values to see if they are equal
+# Compare ValueConv and PrintConv values of a tag to see if they are equal
 # Inputs: 0) value1, 1) value2
 # Returns: true if they are equal
 sub IsEqual($$)
 {
-    return 1 if ref $_[0] eq 'SCALAR' or $_[0] eq $_[1];
-    return 0 if ref $_[0] ne 'ARRAY' or ref $_[1] ne 'ARRAY' or
-                @{$_[0]} ne @{$_[1]};
-    # test all elements of an array
-    my $i = 0;
-    for ($i=0; $i<scalar(@{$_[0]}); ++$i) {
-        return 0 if $_[0][$i] ne $_[1][$i];
+    my ($a, $b) = @_;
+    # (scalar values are not print-converted)
+    return 1 if $a eq $b or ref $a eq 'SCALAR';
+    if (ref $a eq 'HASH' and ref $b eq 'HASH') {
+        return 0 if scalar(keys %$a) != scalar(keys %$b);
+        my $key;
+        foreach $key (keys %$a) {
+            return 0 unless IsEqual($$a{$key}, $$b{$key});
+        }
+    } else {
+        return 0 if ref $a ne 'ARRAY' or ref $b ne 'ARRAY' or @$a != @$b;
+        my $i;
+        for ($i=0; $i<scalar(@$a); ++$i) {
+            return 0 unless IsEqual($$a[$i], $$b[$i]);
+        }
     }
     return 1;
 }
@@ -3799,7 +3816,7 @@ sub FindFileWindows($$)
     my $enc = $et->Options('CharsetFileName');
     $wildfile = $et->Decode($wildfile, $enc, undef, 'UTF8') if $enc and $enc ne 'UTF8';
     $wildfile =~ tr/\\/\//; # use forward slashes
-    my ($dir, $wildname) = ($wildfile =~ m{(.*/)(.*)}) ? ($1, $2) : ('', $wildfile);
+    my ($dir, $wildname) = ($wildfile =~ m{(.*[:/])(.*)}) ? ($1, $2) : ('', $wildfile);
     if ($dir =~ /[*?]/) {
         Warn "Wildcards don't work in the directory specification\n";
         return ();
@@ -3939,7 +3956,7 @@ sub SuggestedExtension($$$)
         $ext = 'xml';
     } elsif ($$valPt =~ /^RIFF....WAVE/s) {
         $ext = 'wav';
-    } elsif ($tag eq 'OriginalRawFileData' and defined($ext = $et->GetValue('OriginalRawFileName'))) {
+    } elsif ($tag eq 'OriginalRawImage' and defined($ext = $et->GetValue('OriginalRawFileName'))) {
         $ext =~ s/^.*\.//s;
         $ext = $ext ? lc($ext) : 'raw';
     } elsif ($tag eq 'EXIF') {
@@ -3991,14 +4008,15 @@ sub LoadPrintFormat($)
 # A sort of sprintf for filenames
 # Inputs: 0) format string (%d=dir, %f=file name, %e=ext),
 #         1) source filename or undef to test format string
-#         2-4) [%t %g %s only] tag name, ref to array of group names, suggested extension
+#         2-4) [%t %g %s %o only] tag name, ref to array of group names,
+#              suggested extension, original raw file name
 # Returns: new filename or undef on error (or if no file and fmt contains token)
 sub FilenameSPrintf($;$@)
 {
     my ($fmt, $file, @extra) = @_;
     local $_;
     # return format string straight away if no tokens
-    return $fmt unless $fmt =~ /%[-+]?\d*[.:]?\d*[lu]?[dDfFeEtgs]/;
+    return $fmt unless $fmt =~ /%[-+]?\d*[.:]?\d*[lu]?[dDfFeEtgso]/;
     return undef unless defined $file;
     CleanFilename($file);   # make sure we are using forward slashes
     # split filename into directory, file, extension
@@ -4012,9 +4030,9 @@ sub FilenameSPrintf($;$@)
     }
     $part{F} = $part{f} . $part{E};
     ($part{D} = $part{d}) =~ s{/+$}{};
-    @part{qw(t g s)} = @extra;
+    @part{qw(t g s o)} = @extra;
     my ($filename, $pos) = ('', 0);
-    while ($fmt =~ /(%([-+]?)(\d*)([.:]?)(\d*)([lu]?)([dDfFeEtgs]))/g) {
+    while ($fmt =~ /(%([-+]?)(\d*)([.:]?)(\d*)([lu]?)([dDfFeEtgso]))/g) {
         $filename .= substr($fmt, $pos, pos($fmt) - $pos - length($1));
         $pos = pos($fmt);
         my ($sign, $wid, $dot, $skip, $mod, $code) = ($2, $3, $4, $5 || 0, $6, $7);
@@ -4177,7 +4195,7 @@ sub OpenOutputFile($;@)
     if ($textOut) {
         $outfile = $file;
         CleanFilename($outfile);
-        if ($textOut =~ /%[-+]?\d*[.:]?\d*[lun]?[dDfFeEtgscC]/ or defined $tagOut) {
+        if ($textOut =~ /%[-+]?\d*[.:]?\d*[lun]?[dDfFeEtgsocC]/ or defined $tagOut) {
             # make filename from printf-like $textOut
             $outfile = FilenameSPrintf($textOut, $file, @args);
             return () unless defined $outfile;
@@ -4714,6 +4732,14 @@ group delete (unless a family 2 group is specified, see note 4 below).
 Instead, individual tags may be recovered using the B<-tagsFromFile> option
 (eg. C<-all= -tagsfromfile @ -artist>).
 
+To speed processing when reading XMP, exclusions in XMP groups also bypass
+processing of the corresponding XMP property and any contained properties.
+For example, C<--xmp-crs:all> may speed processing significantly in cases
+where a large number of XMP-crs tags exist.  To use this feature to bypass
+processing of a specific XMP property, the property name must be used
+instead of the ExifTool tag name (eg. C<--xmp-crs:dabs>).  Also, C<XMP-all>
+may be used to to indicate any XMP namespace (eg. <C--xmp-all:dabs>).
+
 =item B<->I<TAG>[+-^]B<=>[I<VALUE>]
 
 Write a new value for the specified tag (eg. C<-comment=wow>), or delete the
@@ -4724,17 +4750,18 @@ for more details).  C<+=> may also be used to increment numerical values (or
 decrement if I<VALUE> is negative), and C<-=> may be used to conditionally
 delete or replace a tag (see L</WRITING EXAMPLES> for examples).  C<^=> is
 used to write an empty string instead of deleting the tag when no I<VALUE>
-is given, but otherwise it is equivalent to C<=>.
+is given, but otherwise it is equivalent to C<=>, but note that the caret
+must be quoted on the Windows command line.
 
 I<TAG> may contain one or more leading family 0, 1, 2 or 7 group names,
 prefixed by optional family numbers, and separated colons.  If no group name
 is specified, the tag is created in the preferred group, and updated in any
 other location where a same-named tag already exists.  The preferred group
-is the first group in the following list where I<TAG> is valid: 1) EXIF, 2)
-IPTC, 3) XMP.
+in JPEG and TIFF-format images is the first group in the following list
+where I<TAG> is valid: 1) EXIF, 2) IPTC, 3) XMP.
 
 The wildcards C<*> and C<?> may be used in tag names to assign the same
-value to multiple tags.  When specified with wildcards, "unsafe" tags are
+value to multiple tags.  When specified with wildcards, "Unsafe" tags are
 not written.  A tag name of C<All> is equivalent to C<*> (except that it
 doesn't require quoting, while arguments with wildcards do on systems with
 shell globbing), and is often used when deleting all metadata (ie. C<-All=>)
@@ -4880,10 +4907,10 @@ See L</COPYING EXAMPLES> for examples using B<-tagsFromFile>.
 Notes:
 
 1) Some tags (generally tags which may affect the appearance of the image)
-are considered "unsafe" to write, and are only copied if specified
+are considered "Unsafe" to write, and are only copied if specified
 explicitly (ie. no wildcards).  See the
 L<tag name documentation|Image::ExifTool::TagNames> for more details about
-"unsafe" tags.
+"Unsafe" tags.
 
 2) Be aware of the difference between excluding a tag from being copied
 (--I<TAG>), and deleting a tag (-I<TAG>=).  Excluding a tag prevents it from
@@ -4981,7 +5008,7 @@ intermediate file (C<out.args> in this example):
     exiftool -@ out.args -sep ', ' dst.jpg
 
 Note:  Be careful when copying information with this technique since it is
-easy to write tags which are normally considered "unsafe".  For instance,
+easy to write tags which are normally considered "Unsafe".  For instance,
 the FileName and Directory tags are excluded in the example above to avoid
 renaming and moving the destination file.  Also note that the second command
 above will produce warning messages for any tags which are not writable.
@@ -5001,8 +5028,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 must be specified explicitly to be extracted as binary in
-these formats.
+"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.
@@ -5163,9 +5190,11 @@ various components of a date/time value.  The specifics of the I<FMT> syntax
 are system dependent -- consult the C<strftime> man page on your system for
 details.  The default format is equivalent to "%Y:%m:%d %H:%M:%S".  This
 option has no effect on date-only or time-only tags and ignores timezone
-information if present.  Only one B<-d> option may be used per command.
-Requires POSIX::strptime or Time::Piece for the inversion conversion when
-writing.
+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
+POSIX::strptime or Time::Piece for the inversion conversion when writing.
 
 =item B<-D> (B<-decimal>)
 
@@ -5203,7 +5232,7 @@ By default the resulting group name is simplified by removing any leading
 C<Main:> and collapsing adjacent identical group names, but this can be
 avoided by placing a colon before the first family number (eg. B<-g:3:1>).
 Use the B<-listg> option to list group names for a specified family.  The
-SavePath and SaveFormat API options are automatically enabled if the
+API SavePath and SaveFormat options are automatically enabled if the
 respective family 5 or 6 group names are requested.  See the
 L<API GetGroup documentation|Image::ExifTool/GetGroup> for more information.
 
@@ -5392,7 +5421,8 @@ directory if C<#[SECT]> contains C<$directory>).  Lines beginning with
 C<#[BODY]> and lines not beginning with C<#> are output for each processed
 file.  Lines beginning with C<#[IF]> are not output, but all BODY lines are
 skipped if any tag on an IF line doesn't exist.  Other lines beginning with
-C<#> are ignored.  For example, this format file:
+C<#> are ignored.  (To output a line beginning with C<#>, use C<#[BODY]#>.)
+For example, this format file:
 
     # this is a comment line
     #[HEAD]-- Generated by ExifTool $exifToolVersion --
@@ -5406,7 +5436,7 @@ with this command:
 
 produces output like this:
 
-    -- Generated by ExifTool 12.30 --
+    -- Generated by ExifTool 12.38 --
     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
@@ -5423,7 +5453,7 @@ are effectively processed as separate input files.
 If a specified tag does not exist, a minor warning is issued and the line
 with the missing tag is not printed.  However, the B<-f> option may be used
 to set the value of missing tags to '-' (but this may be configured via the
-MissingTagValue API option), or the B<-m> option may be used to ignore minor
+API MissingTagValue option), or the B<-m> option may be used to ignore minor
 warnings and leave the missing values empty.  Alternatively, B<-q -q> may be
 used to simply suppress the warning messages.
 
@@ -5661,12 +5691,14 @@ between B<-W> and B<-w>:
 
 1) With B<-W>, a new output file is created for each extracted tag.
 
-2) B<-W> supports three additional format codes:  %t, %g and %s represent
-the tag name, group name, and suggested extension for the output file (based
-on the format of the data).  The %g code may be followed by a single digit
-to specify the group family number (eg. %g1), otherwise family 0 is assumed.
-The substring width/position/case specifiers may be used with these format
-codes in exactly the same way as with %f and %e.
+2) B<-W> supports four additional format codes:  %t, %g and %s represent the
+tag name, group name, and suggested extension for the output file (based on
+the format of the data), and %o represents the value of the
+OriginalRawFileName or OriginalFileName tag from the input file (including
+extension).  The %g code may be followed by a single digit to specify the
+group family number (eg. %g1), otherwise family 0 is assumed.  The substring
+width/position/case specifiers may be used with these format codes in
+exactly the same way as with %f and %e.
 
 3) The argument for B<-W> is interpreted as a file name if it contains no
 format codes.  (For B<-w>, this would be a file extension.)  This change
@@ -5686,7 +5718,7 @@ example, the following pairs of commands give the same result:
 4) Adding the B<-v> option to B<-W> sends a list of the tags and output file
 names to the console instead of giving a verbose dump of the entire file. 
 (Unless appending all output to one file for each source file by using
-B<-W+> with an output file I<FMT> that does not contain %t, $g or %s.)
+B<-W+> with an output file I<FMT> that does not contain %t, %g, %s or %o.)
 
 5) Individual list items are stored in separate files when B<-W> is combined
 with B<-b>, but note that for separate files to be created %c or %C must be
@@ -5722,9 +5754,10 @@ The B<-t> option adds tag table information to the output (see B<-t> for
 details).
 
 Note:  This output is NOT the same as XMP because it uses
-dynamically-generated property names corresponding to the ExifTool tag
-names, and not the standard XMP properties.  To write XMP instead, use the
-B<-o> option with an XMP extension for the output file.
+dynamically-generated property names corresponding to the ExifTool tag names
+with ExifTool family 1 group names as namespaces, and not the standard XMP
+properties and namespaces.  To write XMP instead, use the B<-o> option with
+an XMP extension for the output file.
 
 =back
 

package/bin/fmt_files/gpx.fmt

@@ -13,7 +13,7 @@
 #               2019/10/24 - PH Preserve sub-seconds in GPSDateTime value
 #
 # Notes:     1) Input file(s) must contain GPSLatitude and GPSLongitude.
-#            2) The -ee option is to extract the full track from video files.
+#            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.
 #------------------------------------------------------------------------------

package/bin/fmt_files/gpx_wpt.fmt

@@ -14,7 +14,7 @@
 #               2019/10/24 - PH Preserve sub-seconds in GPSDateTime value
 #
 # Notes:     1) Input file(s) must contain GPSLatitude and GPSLongitude.
-#            2) The -ee option is to extract the full track from video files.
+#            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.
 #------------------------------------------------------------------------------