exiftool-vendored.pl 13.17.0 → 13.25.0

package/bin/exiftool

@@ -11,7 +11,9 @@ use strict;
 use warnings;
 require 5.004;
 
-my $version = '13.17';
+my $version = '13.25';
+
+$^W = 1;    # enable global warnings
 
 # add our 'lib' directory to the include list BEFORE 'use Image::ExifTool'
 my $exePath;
@@ -52,7 +54,7 @@ sub EncodeXML($);
 sub FormatXML($$$);
 sub EscapeJSON($;$);
 sub FormatJSON($$$;$);
-sub PrintCSV();
+sub PrintCSV(;$);
 sub AddGroups($$$$);
 sub ConvertBinary($);
 sub IsEqual($$);
@@ -189,6 +191,7 @@ my $outFormat;      # -1=Canon format, 0=same-line, 1=tag names, 2=values only
 my $outOpt;         # output file or directory name
 my $overwriteOrig;  # flag to overwrite original file (1=overwrite, 2=in place)
 my $pause;          # pause before returning
+my $plot;           # flag for plot output format
 my $preserveTime;   # flag to preserve times of updated files (2=preserve FileCreateDate only)
 my $progress;       # flag to calculate total files to process (0=calculate but don't display)
 my $progressCount;  # count of files processed
@@ -216,6 +219,7 @@ my $structOpt;      # output structured XMP information (JSON and XML output onl
 my $tabFormat;      # non-zero for tab output format
 my $tagOut;         # flag for separate text output file for each tag
 my $textOut;        # extension for text output file (or undef for no output)
+my $textOut2;       # complete file name for single text output file
 my $textOverwrite;  # flag to overwrite existing text output file (2=append, 3=over+append)
 my $tmpFile;        # temporary file to delete on exit
 my $tmpText;        # temporary text file
@@ -459,8 +463,8 @@ undef %filterExt;
 undef %ignore;
 undef %outComma;
 undef %outTrailer;
-undef %printFmt;
 undef %preserveTime;
+undef %printFmt;
 undef %seqFileDir;
 undef %setTags;
 undef %setTagsList;
@@ -1176,6 +1180,7 @@ for (;;) {
     }
     /^overwrite_original$/i and $overwriteOrig = 1, next;
     /^overwrite_original_in_place$/i and $overwriteOrig = 2, next;
+    /^plot$/i and require Image::ExifTool::Plot and $plot = Image::ExifTool::Plot->new, next;
     if (/^p(-?)$/ or /^printformat(-?)$/i) {
         my $fmt = shift;
         if ($pass) {
@@ -1391,7 +1396,8 @@ for (;;) {
                 # add geotag/geosync/geolocate commands first
                 unshift @newValues, pop @newValues;
                 if (lc $2 eq 'geotag' and (not defined $addGeotime or $addGeotime) and length $val) {
-                    $addGeotime = ($1 || '') . 'Geotime<DateTimeOriginal#';
+                    $addGeotime = [ ($1 || '') . 'Geotime<DateTimeOriginal#',
+                                    ($1 || '') . 'Geotime<SubSecDateTimeOriginal#' ];
                 }
             }
         }
@@ -1465,15 +1471,10 @@ if (not @files and not $outOpt and not @newValues) {
 # print help
 unless ((@tags and not $outOpt) or @files or @newValues or $geoOnly) {
     if ($doGlob and $doGlob == 2) {
-        Warn "No matching files\n";
-        $rtnVal = 1;
-        next;
-    }
-    if ($outOpt) {
-        Warn "Nothing to write\n";
-        $rtnVal = 1;
+        Error "No matching files\n";
         next;
     }
+    $outOpt and Error("Nothing to write\n"), next;
     unless ($helped) {
         # catch warnings if we have problems running perldoc
         local $SIG{'__WARN__'} = sub { $evalWarning = $_[0] };
@@ -1498,38 +1499,34 @@ unless ((@tags and not $outOpt) or @files or @newValues or $geoOnly) {
 if (defined $deleteOrig and (@newValues or @tags)) {
     if (not @newValues) {
         my $verb = $deleteOrig ? 'deleting' : 'restoring from';
-        Warn "Can't specify tags when $verb originals\n";
+        Error "Can't specify tags when $verb originals\n";
     } elsif ($deleteOrig) {
-        Warn "Can't use -delete_original when writing.\n";
-        Warn "Maybe you meant -overwrite_original ?\n";
+        Error "Can't use -delete_original when writing.\n";
+        Error "Maybe you meant -overwrite_original ?\n";
     } else {
-        Warn "It makes no sense to use -restore_original when writing\n";
+        Error "It makes no sense to use -restore_original when writing\n";
     }
-    $rtnVal = 1;
     next;
 }
 
 if ($overwriteOrig > 1 and $outOpt) {
-    Warn "Can't overwrite in place when -o option is used\n";
-    $rtnVal = 1;
+    Error "Can't overwrite in place when -o option is used\n";
     next;
 }
 
-if (($tagOut or defined $diff) and ($csv or $json or %printFmt or $tabFormat or $xml or
+if (($tagOut or defined $diff) and ($csv or $json or %printFmt or $tabFormat or $xml or $plot or
     ($verbose and $html)))
 {
     my $opt = $tagOut ? '-W' : '-diff';
-    Warn "Sorry, $opt may not be combined with -csv, -htmlDump, -j, -p, -t or -X\n";
-    $rtnVal = 1;
+    Error "Sorry, $opt may not be combined with -csv, -htmlDump, -j, -p, -t or -X\n";
     next;
 }
 
 if ($csv and $csv eq 'CSV' and not $isWriting) {
     $json = 0;    # (not compatible)
     if ($textOut) {
-        Warn "Sorry, -w may not be combined with -csv\n";
-        $rtnVal = 1;
-        next;
+        $textOut2 = $textOut;
+        undef $textOut;
     }
     if ($binaryOutput) {
         $binaryOutput = 0;
@@ -1541,6 +1538,32 @@ if ($csv and $csv eq 'CSV' and not $isWriting) {
     }
     require Image::ExifTool::XMP if $setCharset;
 }
+if ($plot and $textOut) {
+    $textOut2 = $textOut;
+    undef $textOut;
+}
+if ($textOut2) {
+    if ($textOverwrite > 1) {
+        Error "Can not append to multi-file output format\n";
+        undef $textOut2;
+        next;
+    }
+    if (not $textOverwrite and $mt->Exists($textOut2, 1)) {
+        Error "Output file $textOut2 already exists\n";
+        undef $textOut2;
+        next;
+    }
+    # make sure we can write the output text file before processing all input files
+    CreateDirectory($textOut2);  # create directory if necessary
+    if ($mt->Open(\*OUTFILE, $textOut2, '>')) {
+        close(\*OUTFILE);
+        unlink($textOut2);  # (this was just a test)
+    } else {
+        Error("Error creating $textOut2\n");
+        undef $textOut2;
+        next;
+    }
+}
 
 if ($escapeHTML or $json) {
     # must be UTF8 for HTML conversion and JSON output
@@ -1554,7 +1577,7 @@ if ($escapeHTML or $json) {
 # set sort option
 if ($sortOpt) {
     # (note that -csv sorts alphabetically by default anyway if more than 1 file)
-    my $sort = ($outFormat > 0 or $xml or $json or $csv) ? 'Tag' : 'Descr';
+    my $sort = ($outFormat > 0 or $xml or $json or $csv or $plot) ? 'Tag' : 'Descr';
     $mt->Options(Sort => $sort, Sort2 => $sort);
 }
 
@@ -1565,7 +1588,11 @@ if ($mt->Options('Struct') and not $structOpt) {
 }
 
 # set up for RDF/XML, JSON and PHP output formats
-if ($xml) {
+if ($plot) {
+    undef $joinLists;
+    $mt->Options(List => 1);
+    $plot->Settings($mt->Options('Plot'));
+} elsif ($xml) {
     require Image::ExifTool::XMP;   # for EscapeXML()
     my $charset = $mt->Options('Charset');
     # standard XML encoding names for supported Charset settings
@@ -1637,11 +1664,10 @@ if (Image::ExifTool::IsPC()) {
 unless (@files) {
     unless ($outOpt) {
         if ($doGlob and $doGlob == 2) {
-            Warn "No matching files\n";
+            Error "No matching files\n";
         } else {
-            Warn "No file specified\n";
+            Error "No file specified\n";
         }
-        $rtnVal = 1;
         next;
     }
     push @files, '';    # create file from nothing
@@ -1670,8 +1696,9 @@ if (@newValues) {
     # assume -geotime value if -geotag specified without -geotime
     if ($addGeotime) {
         AddSetTagsFile($setTagsFile = '@') unless $setTagsFile and $setTagsFile eq '@';
-        push @{$setTags{$setTagsFile}}, $addGeotime;
-        $verbose and print $vout qq{Argument "-$addGeotime" is assumed\n};
+        push @{$setTags{$setTagsFile}}, @$addGeotime;
+        my @a = map qq("-$_"), @$addGeotime;
+        $verbose and print $vout 'Arguments ',join(' and ', @a)," are assumed\n";
     }
     my %setTagsIndex;
     # add/delete option lookup
@@ -1703,8 +1730,7 @@ if (@newValues) {
                 next;   # set tags from dynamic file later
             }
             unless ($mt->Exists($newVal) or $newVal eq '-') {
-                Warn "File '${newVal}' does not exist for -tagsFromFile option\n";
-                $rtnVal = 1;
+                Error "File '${newVal}' does not exist for -tagsFromFile option\n";
                 next Command;
             }
             my $setTags = $setTags{$newVal};
@@ -1768,19 +1794,20 @@ if (@newValues) {
         }
     }
     unless ($isWriting or $outOpt or @tags) {
-        Warn "Nothing to do.\n";
-        $rtnVal = 1;
+        Error "Nothing to do.\n";
         next;
     }
 } elsif (grep /^(\*:)?\*$/, @exclude) {
-    Warn "All tags excluded -- nothing to do.\n";
-    $rtnVal = 1;
+    Error "All tags excluded -- nothing to do.\n";
     next;
 }
 if ($isWriting) {
     if (defined $diff) {
         Error "Can't use -diff option when writing tags\n";
         next;
+    } elsif ($plot) {
+        Error "Can't use -plot option when writing tags\n";
+        next;
     } elsif (@tags and not $outOpt and not $csv) {
         my ($tg, $s) = @tags > 1 ? ("$tags[0] ...", 's') : ($tags[0], '');
         Warn "Ignored superfluous tag name$s or invalid option$s: -$tg\n";
@@ -1929,9 +1956,6 @@ ProcessFiles($mt);
 
 Error "No file with specified extension\n" if $filtered and not $validFile;
 
-# print CSV information if necessary
-PrintCSV() if $csv and not $isWriting;
-
 # print folder/file trailer if necessary
 if ($textOut) {
     foreach (keys %outTrailer) {
@@ -1947,6 +1971,37 @@ if ($textOut) {
 } else {
     print $sectTrailer if $sectTrailer;
     print $fileTrailer if $fileTrailer and not $fileHeader;
+    # print CSV or SVG output file if necessary
+    my ($fp, $err);
+    if ($textOut2) {
+        if ($mt->Open(\*OUTFILE, $textOut2, '>')) {
+            $fp = \*OUTFILE;
+        } else {
+            Error("Error creating $textOut2\n");
+            $err = 1;
+        }
+    }
+    unless ($err) {
+        PrintCSV($fp) if $csv and not $isWriting;
+        # print SVG plot
+        if ($plot) {
+            $plot->Draw($fp || \*STDOUT);
+            if ($$plot{Error}) {
+                Error("Error: $$plot{Error}\n");
+                $err = 1;
+            } elsif ($$plot{Warn}) {
+                Warn("Warning: $$plot{Warn}\n");
+            }
+        }
+    }
+    if ($fp) {
+        close($fp) or $err = 1;
+        if ($err) {
+            $mt->Unlink($textOut2);
+        } else {
+            $created{$textOut2} = 1;
+        }
+    }
 }
 
 my $totWr = $countGoodWr + $countBadWr + $countSameWr + $countCopyWr +
@@ -1991,7 +2046,7 @@ if (defined $deleteOrig) {
     # print summary
     my $tot = $count + $countBad;
     if ($countDir or $totWr or $countFailed or $tot > 1 or $textOut or %countLink) {
-        my $o = (($html or $json or $xml or %printFmt or $csv) and not $textOut) ? \*STDERR : $vout;
+        my $o = (($html or $json or $xml or %printFmt or $csv or $plot) and not $textOut) ? \*STDERR : $vout;
         printf($o "%5d directories scanned\n", $countDir) if $countDir;
         printf($o "%5d directories created\n", $countNewDir) if $countNewDir;
         printf($o "%5d files failed condition\n", $countFailed) if $countFailed;
@@ -2003,7 +2058,7 @@ if (defined $deleteOrig) {
         printf($o "%5d files weren't created due to errors\n", $countBadCr) if $countBadCr;
         printf($o "%5d image files read\n", $count) if ($tot+$countFailed)>1 or ($countDir and not $totWr);
         printf($o "%5d files could not be read\n", $countBad) if $countBad;
-        printf($o "%5d output files created\n", scalar(keys %created)) if $textOut;
+        printf($o "%5d output files created\n", scalar(keys %created)) if $textOut or $textOut2;
         printf($o "%5d output files appended\n", scalar(keys %appended)) if %appended;
         printf($o "%5d hard links created\n", $countLink{Hard} || 0) if $countLink{Hard} or $countLink{BadHard};
         printf($o "%5d hard links could not be created\n", $countLink{BadHard}) if $countLink{BadHard};
@@ -2208,7 +2263,7 @@ sub GetImageInfo($$)
 
     my $lineCount = 0;
     my ($fp, $outfile, $append);
-    if ($textOut and ($verbose or $et->Options('PrintCSV')) and not ($tagOut or defined $diff)) {
+    if ($textOut and ($verbose or $et->Options('PrintCSV')) and not ($tagOut or defined $diff or $plot)) {
         ($fp, $outfile, $append) = OpenOutputFile($orig);
         $fp or EFile($file), ++$countBad, return;
         # delete file if we exit prematurely (unless appending)
@@ -2248,7 +2303,7 @@ sub GetImageInfo($$)
     }
     # print file/progress message
     my $o;
-    unless ($binaryOutput or $textOut or %printFmt or $html > 1 or $csv) {
+    unless ($binaryOutput or $textOut or %printFmt or $html > 1 or $csv or $plot) {
         if ($html) {
             require Image::ExifTool::HTML;
             my $f = Image::ExifTool::HTML::EscapeHTML($file);
@@ -2351,7 +2406,7 @@ sub GetImageInfo($$)
     unless (defined $outfile or $tagOut) {
         ($fp, $outfile, $append) = OpenOutputFile($orig);
         $fp or EFile($file), ++$countBad, return;
-        $tmpText = $outfile unless $append;
+        $tmpText = $outfile if defined $outfile and not $append;
     }
 
     # print differences if requested
@@ -2462,9 +2517,8 @@ T2:         foreach $t2 (@tags2) {
             $done2{$tag2} = 1 if defined $tag2;
         }
         print $fp "(no metadata differences)\n" unless $wasDiff;
-        undef $tmpText;
         if (defined $outfile) {
-            ++$created{$outfile};
+            $created{$outfile} = 1;
             close($fp);
             undef $tmpText;
         }
@@ -2539,6 +2593,17 @@ T2:         foreach $t2 (@tags2) {
         delete $printFmt{HEAD} unless defined $outfile; # print header only once per output file
         my $errs = $et->GetInfo('Warning', 'Error');
         PrintErrors($et, $errs, $file) and EFile($file);
+    } elsif ($plot) {
+        # add points from this file to the plot
+        my $tagExtra = $$et{TAG_EXTRA};
+        my ($tag, %docNum);
+        foreach $tag (keys %$info) {
+            next unless $$tagExtra{$tag} and $$tagExtra{$tag}{G3};
+            $docNum{$tag} = $1 if $$tagExtra{$tag}{G3} =~ /(\d+)/;
+        }
+        $$plot{DocNum} = \%docNum;
+        $$plot{EE} = 1 if $et->Options('ExtractEmbedded');
+        $plot->AddPoints($info, \@foundTags);
     } elsif (not $disableOutput) {
         my ($tag, $line, %noDups, %csvInfo, $bra, $ket, $sep, $quote);
         if ($fp) {
@@ -3771,8 +3836,10 @@ sub FormatCSV($)
 
 #------------------------------------------------------------------------------
 # Print accumulated CSV information
-sub PrintCSV()
+# Inputs: 0) file ref
+sub PrintCSV(;$)
 {
+    my $fp = shift || \*STDOUT;
     my ($file, $lcTag, @tags);
 
     @csvTags or @csvTags = sort keys %csvTags;
@@ -3780,7 +3847,7 @@ sub PrintCSV()
     foreach $lcTag (@csvTags) {
         push @tags, FormatCSV($csvTags{$lcTag}) if $csvTags{$lcTag};
     }
-    print join($csvDelim, 'SourceFile', @tags), "\n";
+    print $fp join($csvDelim, 'SourceFile', @tags), "\n";
     my $empty = defined($forcePrint) ? $forcePrint : '';
     foreach $file (@csvFiles) {
         my @vals = (FormatCSV($file)); # start with full file name
@@ -3791,7 +3858,7 @@ sub PrintCSV()
             defined $val or push(@vals,$empty), next;
             push @vals, FormatCSV($val);
         }
-        print join($csvDelim, @vals), "\n";
+        print $fp join($csvDelim, @vals), "\n";
     }
 }
 
@@ -4125,9 +4192,8 @@ sub ProcessFiles($;$)
                 $filtered = 1;
                 Progress($vout, "-------- $file (wrong extension)") if $verbose;
             } else {
-                Warn "Error: File not found - $file\n";
+                Error "Error: File not found - $file\n";
                 FileNotFound($file);
-                $rtnVal = 1;
             }
         } else {
             $validFile = 1;
@@ -4886,7 +4952,7 @@ sub PrintTagList($@)
     my $msg = shift;
     print $msg, ":\n" unless $quiet;
     my $tag;
-    if ($outFormat < 0 and $msg =~ /file extensions$/ and @_) {
+    if (($outFormat < 0 or $verbose) and $msg =~ /file extensions$/ and @_) {
         foreach $tag (@_) {
             printf("  %-11s %s\n", $tag, GetFileType($tag, 1));
         }
@@ -4989,50 +5055,50 @@ supported by ExifTool (r = read, w = write, c = create):
 
   File Types
   ------------+-------------+-------------+-------------+------------
-  360   r/w   | DOCX  r     | ITC   r     | NUMBERS r   | RAW   r/w
-  3FR   r     | DPX   r     | J2C   r     | NXD   r     | RIFF  r
-  3G2   r/w   | DR4   r/w/c | JNG   r/w   | O     r     | RSRC  r
-  3GP   r/w   | DSS   r     | JP2   r/w   | ODP   r     | RTF   r
-  7Z    r     | DV    r     | JPEG  r/w   | ODS   r     | RW2   r/w
-  A     r     | DVB   r/w   | JSON  r     | ODT   r     | RWL   r/w
-  AA    r     | DVR-MS r    | JXL   r/w   | OFR   r     | RWZ   r
-  AAC   r     | DYLIB r     | K25   r     | OGG   r     | RM    r
-  AAE   r     | EIP   r     | KDC   r     | OGV   r     | SEQ   r
-  AAX   r/w   | EPS   r/w   | KEY   r     | ONP   r     | SKETCH r
-  ACR   r     | EPUB  r     | LA    r     | OPUS  r     | SO    r
-  AFM   r     | ERF   r/w   | LFP   r     | ORF   r/w   | SR2   r/w
-  AI    r/w   | EXE   r     | LIF   r     | ORI   r/w   | SRF   r
-  AIFF  r     | EXIF  r/w/c | LNK   r     | OTF   r     | SRW   r/w
-  APE   r     | EXR   r     | LRV   r/w   | PAC   r     | SVG   r
-  ARQ   r/w   | EXV   r/w/c | M2TS  r     | PAGES r     | SWF   r
-  ARW   r/w   | F4A/V r/w   | M4A/V r/w   | PBM   r/w   | THM   r/w
-  ASF   r     | FFF   r/w   | MACOS r     | PCD   r     | TIFF  r/w
-  AVI   r     | FITS  r     | MAX   r     | PCX   r     | TORRENT r
-  AVIF  r/w   | FLA   r     | MEF   r/w   | PDB   r     | TTC   r
-  AZW   r     | FLAC  r     | MIE   r/w/c | PDF   r/w   | TTF   r
-  BMP   r     | FLIF  r/w   | MIFF  r     | PEF   r/w   | TXT   r
-  BPG   r     | FLV   r     | MKA   r     | PFA   r     | VCF   r
-  BTF   r     | FPF   r     | MKS   r     | PFB   r     | VNT   r
-  C2PA  r     | FPX   r     | MKV   r     | PFM   r     | VRD   r/w/c
-  CHM   r     | GIF   r/w   | MNG   r/w   | PGF   r     | VSD   r
-  COS   r     | GLV   r/w   | MOBI  r     | PGM   r/w   | WAV   r
-  CR2   r/w   | GPR   r/w   | MODD  r     | PLIST r     | WDP   r/w
-  CR3   r/w   | GZ    r     | MOI   r     | PICT  r     | WEBP  r/w
-  CRM   r/w   | HDP   r/w   | MOS   r/w   | PMP   r     | WEBM  r
-  CRW   r/w   | HDR   r     | MOV   r/w   | PNG   r/w   | WMA   r
-  CS1   r/w   | HEIC  r/w   | MP3   r     | PPM   r/w   | WMV   r
-  CSV   r     | HEIF  r/w   | MP4   r/w   | PPT   r     | WPG   r
-  CUR   r     | HTML  r     | MPC   r     | PPTX  r     | WTV   r
-  CZI   r     | ICC   r/w/c | MPG   r     | PS    r/w   | WV    r
-  DCM   r     | ICO   r     | MPO   r/w   | PSB   r/w   | X3F   r/w
-  DCP   r/w   | ICS   r     | MQV   r/w   | PSD   r/w   | XCF   r
-  DCR   r     | IDML  r     | MRC   r     | PSP   r     | XISF  r
-  DFONT r     | IIQ   r/w   | MRW   r/w   | QTIF  r/w   | XLS   r
-  DIVX  r     | IND   r/w   | MXF   r     | R3D   r     | XLSX  r
-  DJVU  r     | INSP  r/w   | NEF   r/w   | RA    r     | XMP   r/w/c
-  DLL   r     | INSV  r     | NKA   r     | RAF   r/w   | ZIP   r
-  DNG   r/w   | INX   r     | NKSC  r/w   | RAM   r     |
-  DOC   r     | ISO   r     | NRW   r/w   | RAR   r     |
+  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
 
   Meta Information
   ----------------------+----------------------+---------------------
@@ -5100,6 +5166,7 @@ L<Input-output text formatting|/Input-output text formatting>
   -n          (--printConv)        No print conversion
   -p[-] STR   (-printFormat)       Print output in specified format
   -php                             Export tags as a PHP Array
+  -plot                            Output tags as SVG plot file
   -s[NUM]     (-short)             Short output format (-s for tag names)
   -S          (-veryShort)         Very short output format
   -sep STR    (-separator)         Set separator string for list items
@@ -5678,14 +5745,16 @@ option may be used to split them back into separate items when importing.
 Special feature:  B<-csv>+=I<CSVFILE> may be used to add items to existing
 lists.  This affects only list-type tags.  Also applies to the B<-j> option.
 
-Note that this option is fundamentally different than all other output
-format options because it requires information from all input files to be
-buffered in memory before the output is written.  This may result in
-excessive memory usage when processing a very large number of files with a
-single command.  Also, it makes this option incompatible with the B<-w> and
-B<-W> options.  When processing a large number of files, it is recommended
-to either use the JSON (B<-j>) or XML (B<-X>) output format, or use B<-p> to
-generate a fixed-column CSV file instead of using the B<-csv> option.
+Note that this and the B<-plot> options are fundamentally different than all
+other output format options because they require information from all input
+files to be buffered in memory before the output is written.  This may
+result in excessive memory usage when processing a very large number of
+files with a single command.  Also, when used with B<-csv>, the B<-w> option
+changes to specify a complete file name with no filename formatting codes or
+append mode allowed, and B<-W> may not be used.  When processing a large
+number of files, it is recommended to either use the JSON (B<-j>) or XML
+(B<-X>) output format, or use B<-p> to generate a fixed-column CSV file
+instead of using the B<-csv> option.
 
 =item B<-csvDelim> I<STR>
 
@@ -5984,7 +6053,7 @@ with this command:
 
 produces output like this:
 
-    -- Generated by ExifTool 13.17 --
+    -- Generated by ExifTool 13.25 --
     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
@@ -6033,6 +6102,21 @@ showing how this could be used in a PHP script:
     print_r($array);
     ?>
 
+=item B<-plot>
+
+Write output for all specified tags and all input files as a single
+SVG-formatted plot.  When combined with this feature, the B<-w> option
+argument is a complete file name with no format codes and the append feature
+may not be used.  Each tag specified on the command line represents a
+dataset in the plot (or more for array values or if the Split plot setting
+is used).  Non-numerical values are ignored.  Each input file may contribute
+multiple points to a dataset if it contains sub-documents and the B<-ee>
+option is used, or if the tag value is a delimited string of numbers (valid
+delimiters are: space, comma, semicolon, tab and newline).  Line, Scatter
+and Histogram plot types are available.  See the API Plot Option and
+L<https://exiftool.org/plot.html> for more details and information about the
+plot settings.
+
 =item B<-s>[I<NUM>] (B<-short>)
 
 Short output format.  Prints tag names instead of descriptions.  Add I<NUM>
@@ -6170,6 +6254,10 @@ ways to create a single output file from multiple source files:
     # 3. With the -W option (see the -W option below)
     exiftool -W+! out.txt FILE1 FILE2 ...
 
+3) The B<-w> option changes when used with a multi-file output format
+(B<-csv> or B<-plot>).  With these, the argument of B<-w> is a complete file
+name with no formatting codes, and the append feature may not be used.
+
 Advanced features:
 
 A substring of the original file name, directory or extension may be taken
@@ -6458,13 +6546,13 @@ across directory boundaries if multiple input directories are specified.
 =item B<-i> I<DIR> (B<-ignore>)
 
 Ignore specified directory name.  I<DIR> may be either an individual folder
-name, or a full path.  If a full path is specified, it must match the
-Directory tag exactly to be ignored.  Use multiple B<-i> options to ignore
-more than one directory name.  A special I<DIR> value of C<SYMLINKS> (case
-sensitive) may be specified to avoid recursing into directories which are
+name, or a full path, and is case sensitive.  If a full path is specified,
+it must match the Directory tag exactly to be ignored.  Use multiple B<-i>
+options to ignore more than one directory name.  A special I<DIR> value of
+C<SYMLINKS> may be specified to avoid recursing into directories which are
 symbolic links when the B<-r> option is used.  As well, a value of C<HIDDEN>
-(case sensitive) may be used to ignore files with names that start with a
-"." (ie. hidden files on Unix systems) when scanning a directory.
+may be used to ignore files with names that start with a "." (ie. hidden
+files on Unix systems) when scanning a directory.
 
 =item B<-if>[I<NUM>] I<EXPR>
 
@@ -6771,12 +6859,12 @@ B<-listw> and B<-listx> options may be followed by an additional argument of
 the form C<-GROUP:All> to list only tags in a specific group, where C<GROUP>
 is one or more family 0-2 group names (excepting EXIF IFD groups) separated
 by colons.  With B<-listg>, I<NUM> may be given to specify the group family,
-otherwise family 0 is assumed.  The B<-l> option may be combined with
-B<-listf>, B<-listr> or B<-listwf> to add file descriptions to the list. 
-The B<-lang> option may be combined with B<-listx> to output descriptions in
-a single language, and the B<-sort> and/or B<-lang> options may be combined
-with B<-listgeo>.  Also, the API GeolocMinPop, GeolocFeature and
-GeolocAltNames options apply to the B<-listgeo> output.  Here are some
+otherwise family 0 is assumed.  The B<-l> or B<-v> option may be combined
+with B<-listf>, B<-listr> or B<-listwf> to add file descriptions to the
+list. The B<-lang> option may be combined with B<-listx> to output
+descriptions in a single language, and the B<-sort> and/or B<-lang> options
+may be combined with B<-listgeo>.  Also, the API GeolocMinPop, GeolocFeature
+and GeolocAltNames options apply to the B<-listgeo> output.  Here are some
 examples:
 
     -list               # list all tag names
@@ -7808,8 +7896,9 @@ the B<-geotag> option.)
 
 Geotag an image (C<a.jpg>) from position information in a GPS track log
 (C<track.log>).  Since the C<Geotime> tag is not specified, the value of
-DateTimeOriginal is used for geotagging.  Local system time is assumed
-unless DateTimeOriginal contains a timezone.
+SubSecDateTimeOriginal (preferentially) or DateTimeOriginal is used for
+geotagging.  Local system time is assumed unless the time contains a
+timezone.
 
 =item C<exiftool -geotag track.log -geolocate=geotag a.jpg>
 
@@ -7854,7 +7943,8 @@ Delete XMP GPS tags which were added by the geotag feature.
 
 =item C<exiftool -xmp:geotag=track.log a.jpg>
 
-Geotag an image with XMP tags, using the time from DateTimeOriginal.
+Geotag an image with XMP tags, using the time from SubSecDateTimeOriginal or
+DateTimeOriginal.
 
 =item C<exiftool -geotag a.log -geotag b.log -r dir>
 

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

@@ -16,7 +16,7 @@ use vars qw($VERSION);
 use Image::ExifTool::Exif;
 use Image::ExifTool::PLIST;
 
-$VERSION = '1.14';
+$VERSION = '1.15';
 
 sub ConvertPLIST($$);
 
@@ -307,7 +307,17 @@ sub ConvertPLIST($$);
         Name => 'Apple_0x004f',
         Unknown => 1,
         ValueConv => \&ConvertPLIST,
-    }
+    },
+    0x0054 => {
+        Name => 'Apple_0x0054',
+        Unknown => 1,
+        ValueConv => \&ConvertPLIST,
+    },
+    0x005a => {
+        Name => 'Apple_0x005a',
+        Unknown => 1,
+        ValueConv => \&ConvertPLIST,
+    },
 );
 
 # PLIST-format CMTime structure (ref PH)