exiftool-vendored.pl 12.60.0 → 12.62.0

package/bin/MANIFEST

@@ -176,6 +176,7 @@ html/TagNames/Torrent.html
 html/TagNames/Unknown.html
 html/TagNames/VCard.html
 html/TagNames/Vorbis.html
+html/TagNames/WPG.html
 html/TagNames/WTV.html
 html/TagNames/XMP.html
 html/TagNames/ZIP.html
@@ -416,6 +417,7 @@ lib/Image/ExifTool/Unknown.pm
 lib/Image/ExifTool/VCard.pm
 lib/Image/ExifTool/Validate.pm
 lib/Image/ExifTool/Vorbis.pm
+lib/Image/ExifTool/WPG.pm
 lib/Image/ExifTool/WTV.pm
 lib/Image/ExifTool/WriteCanonRaw.pl
 lib/Image/ExifTool/WriteExif.pl
@@ -856,6 +858,8 @@ t/VCard_2.out
 t/VCard_3.out
 t/Vorbis.t
 t/Vorbis_2.out
+t/WPG.t
+t/WPG_2.out
 t/WTV.t
 t/WTV_2.out
 t/Writer.t
@@ -965,6 +969,7 @@ t/ZIP_4.out
 t/ZIP_5.out
 t/ZIP_6.out
 t/ZIP_7.out
+t/ZIP_8.out
 t/ZISRAW.t
 t/ZISRAW_2.out
 t/images/AFCP.jpg
@@ -1132,6 +1137,7 @@ t/images/Unknown.jpg
 t/images/VCard.ics
 t/images/VCard.vcf
 t/images/Vorbis.ogg
+t/images/WPG.wpg
 t/images/WTV.wtv
 t/images/Writer.jpg
 t/images/XMP.inx
@@ -1148,6 +1154,7 @@ t/images/XMP7.xmp
 t/images/XMP8.xmp
 t/images/XMP9.xmp
 t/images/ZIP.gz
+t/images/ZIP.rar
 t/images/ZIP.zip
 t/images/ZISRAW.czi
 t/images/iWork.numbers

package/bin/META.json

@@ -47,6 +47,6 @@
       }
    },
    "release_status" : "stable",
-   "version" : "12.60",
+   "version" : "12.62",
    "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.60
+version: 12.62
 x_serialization_backend: 'JSON::PP version 4.02'

package/bin/README

@@ -14,48 +14,49 @@ supported by ExifTool (r = read, w = write, c = create):
 
   File Types
   ------------+-------------+-------------+-------------+------------
-  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     | VNT   r
-  CRM   r/w   | GZ    r     | MOBI  r     | PGM   r/w   | VRD   r/w/c
-  CRW   r/w   | HDP   r/w   | MODD  r     | PLIST r     | VSD   r
-  CS1   r/w   | HDR   r     | MOI   r     | PICT  r     | WAV   r
-  CSV   r     | HEIC  r/w   | MOS   r/w   | PMP   r     | WDP   r/w
-  CUR   r     | HEIF  r/w   | MOV   r/w   | PNG   r/w   | WEBP  r/w
-  CZI   r     | HTML  r     | MP3   r     | PPM   r/w   | WEBM  r
-  DCM   r     | ICC   r/w/c | MP4   r/w   | PPT   r     | WMA   r
-  DCP   r/w   | ICO   r     | MPC   r     | PPTX  r     | WMV   r
-  DCR   r     | ICS   r     | MPG   r     | PS    r/w   | WTV   r
-  DFONT r     | IDML  r     | MPO   r/w   | PSB   r/w   | WV    r
-  DIVX  r     | IIQ   r/w   | MQV   r/w   | PSD   r/w   | X3F   r/w
-  DJVU  r     | IND   r/w   | MRC   r     | PSP   r     | XCF   r
-  DLL   r     | INSP  r/w   | MRW   r/w   | QTIF  r/w   | XLS   r
-  DNG   r/w   | INSV  r     | MXF   r     | R3D   r     | XLSX  r
-  DOC   r     | INX   r     | NEF   r/w   | RA    r     | XMP   r/w/c
-  DOCX  r     | ISO   r     | NKSC  r/w   | RAF   r/w   | ZIP   r
+  360   r/w   | DR4   r/w/c | JNG   r/w   | ODP   r     | RSRC  r
+  3FR   r     | DSS   r     | JP2   r/w   | ODS   r     | RTF   r
+  3G2   r/w   | DV    r     | JPEG  r/w   | ODT   r     | RW2   r/w
+  3GP   r/w   | DVB   r/w   | JSON  r     | OFR   r     | RWL   r/w
+  A     r     | DVR-MS r    | JXL   r     | OGG   r     | RWZ   r
+  AA    r     | DYLIB r     | K25   r     | OGV   r     | RM    r
+  AAE   r     | EIP   r     | KDC   r     | ONP   r     | SEQ   r
+  AAX   r/w   | EPS   r/w   | KEY   r     | OPUS  r     | SKETCH r
+  ACR   r     | EPUB  r     | LA    r     | ORF   r/w   | SO    r
+  AFM   r     | ERF   r/w   | LFP   r     | ORI   r/w   | SR2   r/w
+  AI    r/w   | EXE   r     | LIF   r     | OTF   r     | SRF   r
+  AIFF  r     | EXIF  r/w/c | LNK   r     | PAC   r     | SRW   r/w
+  APE   r     | EXR   r     | LRV   r/w   | PAGES r     | SVG   r
+  ARQ   r/w   | EXV   r/w/c | M2TS  r     | PBM   r/w   | SWF   r
+  ARW   r/w   | F4A/V r/w   | M4A/V r/w   | PCD   r     | THM   r/w
+  ASF   r     | FFF   r/w   | MACOS r     | PCX   r     | TIFF  r/w
+  AVI   r     | FITS  r     | MAX   r     | PDB   r     | TORRENT r
+  AVIF  r/w   | FLA   r     | MEF   r/w   | PDF   r/w   | TTC   r
+  AZW   r     | FLAC  r     | MIE   r/w/c | PEF   r/w   | TTF   r
+  BMP   r     | FLIF  r/w   | MIFF  r     | PFA   r     | TXT   r
+  BPG   r     | FLV   r     | MKA   r     | PFB   r     | VCF   r
+  BTF   r     | FPF   r     | MKS   r     | PFM   r     | VNT   r
+  CHM   r     | FPX   r     | MKV   r     | PGF   r     | VRD   r/w/c
+  COS   r     | GIF   r/w   | MNG   r/w   | PGM   r/w   | VSD   r
+  CR2   r/w   | GPR   r/w   | MOBI  r     | PLIST r     | WAV   r
+  CR3   r/w   | GZ    r     | MODD  r     | PICT  r     | WDP   r/w
+  CRM   r/w   | HDP   r/w   | MOI   r     | PMP   r     | WEBP  r/w
+  CRW   r/w   | HDR   r     | MOS   r/w   | PNG   r/w   | WEBM  r
+  CS1   r/w   | HEIC  r/w   | MOV   r/w   | PPM   r/w   | WMA   r
+  CSV   r     | HEIF  r/w   | MP3   r     | PPT   r     | WMV   r
+  CUR   r     | HTML  r     | MP4   r/w   | PPTX  r     | WPG   r
+  CZI   r     | ICC   r/w/c | MPC   r     | PS    r/w   | WTV   r
+  DCM   r     | ICO   r     | MPG   r     | PSB   r/w   | WV    r
+  DCP   r/w   | ICS   r     | MPO   r/w   | PSD   r/w   | X3F   r/w
+  DCR   r     | IDML  r     | MQV   r/w   | PSP   r     | XCF   r
+  DFONT r     | IIQ   r/w   | MRC   r     | QTIF  r/w   | XLS   r
+  DIVX  r     | IND   r/w   | MRW   r/w   | R3D   r     | XLSX  r
+  DJVU  r     | INSP  r/w   | MXF   r     | RA    r     | XMP   r/w/c
+  DLL   r     | INSV  r     | NEF   r/w   | RAF   r/w   | ZIP   r
+  DNG   r/w   | INX   r     | NKSC  r/w   | RAM   r     |
+  DOC   r     | ISO   r     | NRW   r/w   | RAR   r     |
+  DOCX  r     | ITC   r     | NUMBERS r   | RAW   r/w   |
+  DPX   r     | J2C   r     | O     r     | RIFF  r     |
 
   Meta Information
   ----------------------+----------------------+---------------------
@@ -107,8 +108,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.60.tar.gz | tar -xf -
-  cd Image-ExifTool-12.60
+  gzip -dc Image-ExifTool-12.62.tar.gz | tar -xf -
+  cd Image-ExifTool-12.62
   ./exiftool t/images/ExifTool.jpg
 
 Note:  These commands extract meta information from one of the test images. 

package/bin/exiftool

@@ -11,7 +11,7 @@ use strict;
 use warnings;
 require 5.004;
 
-my $version = '12.60';
+my $version = '12.62';
 
 # add our 'lib' directory to the include list BEFORE 'use Image::ExifTool'
 BEGIN {
@@ -365,13 +365,14 @@ sub Cleanup() {
 
 # isolate arguments common to all commands
 if (grep /^-common_args$/i, @ARGV) {
-    my (@newArgs, $common);
+    my (@newArgs, $common, $end);
     foreach (@ARGV) {
-        if (/^-common_args$/i) {
+        if (/^-common_args$/i and not $end) {
             $common = 1;
         } elsif ($common) {
             push @commonArgs, $_;
         } else {
+            $end = 1 if $_ eq '--';
             push @newArgs, $_;
         }
     }
@@ -836,7 +837,7 @@ for (;;) {
                 $mt->Options(Charset => $charset);
             }
             if ($evalWarning) {
-                warn $evalWarning;
+                Warn $evalWarning;
             } else {
                 $setCharset = $mt->Options('Charset');
             }
@@ -1737,7 +1738,8 @@ if ($textOut) {
 if ($outOpt) {
     my $type = GetFileType($outOpt);
     if ($type) {
-        unless (CanWrite($type)) {
+        # (must test original file name because we can write .webp but not other RIFF types)
+        unless (CanWrite($outOpt)) {
             Warn "Can't write $type files\n";
             $rtnVal = 1;
             next;
@@ -1951,23 +1953,31 @@ sub GetImageInfo($$)
     my (@foundTags, $info, $file, $ind, $g8);
 
     # set window title for this file if necessary
-    if (defined $windowTitle and $progressCount >= $progressNext) {
-        my $prog = $progressMax ? "$progressCount/$progressMax" : '0/0';
-        my $title = $windowTitle;
-        my ($num, $denom) = split '/', $prog;
-        my $frac = $num / ($denom || 1);
-        my $n = $title =~ s/%(\d+)b/%b/ ? $1 : 20;  # length of bar
-        my $bar = int($frac * $n + 0.5);
-        my %lkup = (
-            b => ('I' x $bar) . ('.' x ($n - $bar)), # (undocumented)
-            f => $orig,
-            p => int(100 * $frac + 0.5),
-            r => $prog,
-           '%'=> '%',
-        );
-        $title =~ s/%([%bfpr])/$lkup{$1}/eg;
-        SetWindowTitle($title);
-        undef $progressNext;
+    if (defined $windowTitle) {
+        if ($progressCount >= $progressNext) {
+            my $prog = $progressMax ? "$progressCount/$progressMax" : '0/0';
+            my $title = $windowTitle;
+            my ($num, $denom) = split '/', $prog;
+            my $frac = $num / ($denom || 1);
+            my $n = $title =~ s/%(\d+)b/%b/ ? $1 : 20;  # length of bar
+            my $bar = int($frac * $n + 0.5);
+            my %lkup = (
+                b => ('I' x $bar) . ('.' x ($n - $bar)),
+                f => $orig,
+                p => int(100 * $frac + 0.5),
+                r => $prog,
+               '%'=> '%',
+            );
+            $title =~ s/%([%bfpr])/$lkup{$1}/eg;
+            SetWindowTitle($title);
+            if (defined $progressMax) {
+                undef $progressNext;
+            } else {
+                $progressNext += $progressIncr;
+            }
+        }
+        # ($progressMax is not defined for "-progress:%f")
+        ++$progressCount unless defined $progressMax;
     }
     unless (length $orig or $outOpt) {
         Warn qq(Error: Zero-length file name - ""\n);
@@ -1993,7 +2003,11 @@ sub GetImageInfo($$)
     }
     # set alternate file names
     foreach $g8 (sort keys %altFile) {
-        my $altName = FilenameSPrintf($altFile{$g8}, $orig);
+        my $altName = $orig;
+        # must double any '$' symbols in the original file name because
+        # they are used for tag names in a -fileNUM argument
+        $altName =~ s/\$/\$\$/g;
+        $altName = FilenameSPrintf($altFile{$g8}, $altName);
         $et->SetAlternateFile($g8, $altName);
     }
 
@@ -2536,6 +2550,7 @@ TAG:    foreach $tag (@foundTags) {
                     $xtra .= " et:table='${table}'";
                     $xtra .= " et:index='${index}'" if defined $index;
                 }
+                # Note: New $xtra attributes must be added to %ignoreEtProp in XMP.pm!
                 my $lastVal = $val;
                 for ($valNum=0; $valNum<2; ++$valNum) {
                     $val = FormatXML($val, $ind, $group);
@@ -3700,7 +3715,7 @@ sub ProcessFiles($;$)
         if (defined $progressMax) {
             unless (defined $progressNext) {
                 $progressNext = $progressCount + $progressIncr;
-                $progressNext -= $progressNext % $progressIncr;
+                $progressNext -= $progressNext % $progressIncr; # (show even multiples)
                 $progressNext = $progressMax if $progressNext > $progressMax;
             }
             ++$progressCount;
@@ -4479,7 +4494,7 @@ sub Progress($$)
     my ($file, $msg) = @_;
     if (defined $progStr) {
         print $file $msg, $progStr, "\n";
-        undef $progressNext;
+        undef $progressNext if defined $progressMax;
     }
 }
 
@@ -4590,48 +4605,49 @@ supported by ExifTool (r = read, w = write, c = create):
 
   File Types
   ------------+-------------+-------------+-------------+------------
-  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     | VNT   r
-  CRM   r/w   | GZ    r     | MOBI  r     | PGM   r/w   | VRD   r/w/c
-  CRW   r/w   | HDP   r/w   | MODD  r     | PLIST r     | VSD   r
-  CS1   r/w   | HDR   r     | MOI   r     | PICT  r     | WAV   r
-  CSV   r     | HEIC  r/w   | MOS   r/w   | PMP   r     | WDP   r/w
-  CUR   r     | HEIF  r/w   | MOV   r/w   | PNG   r/w   | WEBP  r/w
-  CZI   r     | HTML  r     | MP3   r     | PPM   r/w   | WEBM  r
-  DCM   r     | ICC   r/w/c | MP4   r/w   | PPT   r     | WMA   r
-  DCP   r/w   | ICO   r     | MPC   r     | PPTX  r     | WMV   r
-  DCR   r     | ICS   r     | MPG   r     | PS    r/w   | WTV   r
-  DFONT r     | IDML  r     | MPO   r/w   | PSB   r/w   | WV    r
-  DIVX  r     | IIQ   r/w   | MQV   r/w   | PSD   r/w   | X3F   r/w
-  DJVU  r     | IND   r/w   | MRC   r     | PSP   r     | XCF   r
-  DLL   r     | INSP  r/w   | MRW   r/w   | QTIF  r/w   | XLS   r
-  DNG   r/w   | INSV  r     | MXF   r     | R3D   r     | XLSX  r
-  DOC   r     | INX   r     | NEF   r/w   | RA    r     | XMP   r/w/c
-  DOCX  r     | ISO   r     | NKSC  r/w   | RAF   r/w   | ZIP   r
+  360   r/w   | DR4   r/w/c | JNG   r/w   | ODP   r     | RSRC  r
+  3FR   r     | DSS   r     | JP2   r/w   | ODS   r     | RTF   r
+  3G2   r/w   | DV    r     | JPEG  r/w   | ODT   r     | RW2   r/w
+  3GP   r/w   | DVB   r/w   | JSON  r     | OFR   r     | RWL   r/w
+  A     r     | DVR-MS r    | JXL   r     | OGG   r     | RWZ   r
+  AA    r     | DYLIB r     | K25   r     | OGV   r     | RM    r
+  AAE   r     | EIP   r     | KDC   r     | ONP   r     | SEQ   r
+  AAX   r/w   | EPS   r/w   | KEY   r     | OPUS  r     | SKETCH r
+  ACR   r     | EPUB  r     | LA    r     | ORF   r/w   | SO    r
+  AFM   r     | ERF   r/w   | LFP   r     | ORI   r/w   | SR2   r/w
+  AI    r/w   | EXE   r     | LIF   r     | OTF   r     | SRF   r
+  AIFF  r     | EXIF  r/w/c | LNK   r     | PAC   r     | SRW   r/w
+  APE   r     | EXR   r     | LRV   r/w   | PAGES r     | SVG   r
+  ARQ   r/w   | EXV   r/w/c | M2TS  r     | PBM   r/w   | SWF   r
+  ARW   r/w   | F4A/V r/w   | M4A/V r/w   | PCD   r     | THM   r/w
+  ASF   r     | FFF   r/w   | MACOS r     | PCX   r     | TIFF  r/w
+  AVI   r     | FITS  r     | MAX   r     | PDB   r     | TORRENT r
+  AVIF  r/w   | FLA   r     | MEF   r/w   | PDF   r/w   | TTC   r
+  AZW   r     | FLAC  r     | MIE   r/w/c | PEF   r/w   | TTF   r
+  BMP   r     | FLIF  r/w   | MIFF  r     | PFA   r     | TXT   r
+  BPG   r     | FLV   r     | MKA   r     | PFB   r     | VCF   r
+  BTF   r     | FPF   r     | MKS   r     | PFM   r     | VNT   r
+  CHM   r     | FPX   r     | MKV   r     | PGF   r     | VRD   r/w/c
+  COS   r     | GIF   r/w   | MNG   r/w   | PGM   r/w   | VSD   r
+  CR2   r/w   | GPR   r/w   | MOBI  r     | PLIST r     | WAV   r
+  CR3   r/w   | GZ    r     | MODD  r     | PICT  r     | WDP   r/w
+  CRM   r/w   | HDP   r/w   | MOI   r     | PMP   r     | WEBP  r/w
+  CRW   r/w   | HDR   r     | MOS   r/w   | PNG   r/w   | WEBM  r
+  CS1   r/w   | HEIC  r/w   | MOV   r/w   | PPM   r/w   | WMA   r
+  CSV   r     | HEIF  r/w   | MP3   r     | PPT   r     | WMV   r
+  CUR   r     | HTML  r     | MP4   r/w   | PPTX  r     | WPG   r
+  CZI   r     | ICC   r/w/c | MPC   r     | PS    r/w   | WTV   r
+  DCM   r     | ICO   r     | MPG   r     | PSB   r/w   | WV    r
+  DCP   r/w   | ICS   r     | MPO   r/w   | PSD   r/w   | X3F   r/w
+  DCR   r     | IDML  r     | MQV   r/w   | PSP   r     | XCF   r
+  DFONT r     | IIQ   r/w   | MRC   r     | QTIF  r/w   | XLS   r
+  DIVX  r     | IND   r/w   | MRW   r/w   | R3D   r     | XLSX  r
+  DJVU  r     | INSP  r/w   | MXF   r     | RA    r     | XMP   r/w/c
+  DLL   r     | INSV  r     | NEF   r/w   | RAF   r/w   | ZIP   r
+  DNG   r/w   | INX   r     | NKSC  r/w   | RAM   r     |
+  DOC   r     | ISO   r     | NRW   r/w   | RAR   r     |
+  DOCX  r     | ITC   r     | NUMBERS r   | RAW   r/w   |
+  DPX   r     | J2C   r     | O     r     | RIFF  r     |
 
   Meta Information
   ----------------------+----------------------+---------------------
@@ -4669,7 +4685,7 @@ L<Tag operations|/Tag operations>
   -TAG or --TAG                    Extract or exclude specified tag
   -TAG[+-^]=[VALUE]                Write new value for tag
   -TAG[+-]<=DATFILE                Write tag value from contents of file
-  -TAG[+-]<SRCTAG                  Copy tag value (see -tagsFromFile)
+  -[+]TAG[+-]<SRCTAG               Copy tag value (see -tagsFromFile)
 
   -tagsFromFile SRCFILE            Copy tag values from file
   -x TAG      (-exclude)           Exclude specified tag
@@ -5541,7 +5557,7 @@ with this command:
 
 produces output like this:
 
-    -- Generated by ExifTool 12.60 --
+    -- Generated by ExifTool 12.62 --
     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
@@ -6544,11 +6560,22 @@ option no longer suppresses the output "{readyNUM}" message.
 
 =item B<-file>I<NUM> I<ALTFILE>
 
-Read tags from an alternate source file.  These tags are accessed via the
+Read tags from an alternate source file.  Among other things, this allows
+tags from different files to be compared and combined using the B<-if> and
+B<-p> options.  Tags from alternate files are accessed via the corresponding
 family 8 group name (eg. C<File1:TAG> for the B<-file1> option, C<File2:TAG>
-for B<-file2>, etc).  I<ALTFILE> may contain filename formatting codes %d,
-%f and %e.  Among other things, this allows tags from different files to be
-compared and combined using the B<-if> and B<-p> options.
+for B<-file2>, etc).  I<ALTFILE> may contain filename formatting codes like
+the B<-w> option (%d, %f, etc), and/or tag names with a leading C<$> symbol
+to access tags from the source file in the same way as the B<-p> option (so
+any other dollar symbol in the file name must be doubled, eg.
+C<money$$.jpg>).  For example, assuming that the OriginalFileName tag has
+been set in the edited file, a command to copy Rights from the original file
+could look like this:
+
+    exiftool -file1 '$originalfilename' '-rights<file1:rights' edited.jpg
+
+Composite tags may access tags from alternate files using the appropriate
+(case-sensitive) family 8 group name.
 
 =item B<-list_dir>
 

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

@@ -358,4 +358,3 @@ L<Image::ExifTool::TagNames/BMP Tags>,
 L<Image::ExifTool(3pm)|Image::ExifTool>
 
 =cut
-

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

@@ -582,10 +582,10 @@ number of available PDF tags.  See
 L<http://www.adobe.com/devnet/pdf/pdf_reference.html> for the official PDF
 specification.
 
-ExifTool supports reading and writing PDF documents up to version 1.7
-extension level 3, including support for RC4, AES-128 and AES-256
-encryption.  A L<Password|../ExifTool.html#Password> option is provided to allow processing of
-password-protected PDF files.
+ExifTool supports reading and writing PDF documents up to version 2.0,
+including support for RC4, AES-128 and AES-256 encryption.  A
+L<Password|../ExifTool.html#Password> option is provided to allow processing
+of password-protected PDF files.
 
 ExifTool may be used to write native PDF and XMP metadata to PDF files. It
 uses an incremental update technique that has the advantages of being both

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

@@ -21,7 +21,7 @@ use Image::ExifTool qw(:DataAccess :Utils);
 use Image::ExifTool::Exif;
 use Image::ExifTool::ASF;   # for GetGUID()
 
-$VERSION = '1.44';
+$VERSION = '1.45';
 
 sub ProcessFPX($$);
 sub ProcessFPXR($$$);
@@ -1539,6 +1539,7 @@ sub ReadFPXValue($$$$$;$$)
     }
     $_[2] = $valPos;    # return updated value position
 
+    push @vals, '' if $type eq 0; # (VT_EMPTY)
     if (wantarray) {
         return @vals;
     } elsif (@vals > 1) {

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

@@ -16,7 +16,7 @@ use strict;
 use vars qw($VERSION);
 use Image::ExifTool qw(:DataAccess :Utils);
 
-$VERSION = '1.33';
+$VERSION = '1.34';
 
 sub ProcessJpeg2000Box($$$);
 sub ProcessJUMD($$$);
@@ -34,6 +34,9 @@ my %resolutionUnit = (
      6 => 'um',
 );
 
+# top-level boxes containing image data
+my %isImageData = ( jp2c=>1, jbrd=>1, jxlp=>1, jxlc=>1 );
+
 # map of where information is written in JPEG2000 image
 my %jp2Map = (
     IPTC         => 'UUID-IPTC',
@@ -428,6 +431,7 @@ my %j2cMarker = (
 # stuff seen in JPEG XL images:
 #
   # jbrd - JPEG Bitstream Reconstruction Data (allows lossless conversion back to original JPG)
+  # jxlp - partial JXL codestream
     jxlc => {
         Name => 'JXLCodestream',
         Format => 'undef',
@@ -930,7 +934,7 @@ sub ProcessJpeg2000Box($$$)
     my $raf = $$dirInfo{RAF};
     my $outfile = $$dirInfo{OutFile};
     my $dirEnd = $dirStart + $dirLen;
-    my ($err, $outBuff, $verbose, $doColour);
+    my ($err, $outBuff, $verbose, $doColour, $md5);
 
     if ($outfile) {
         unless ($raf) {
@@ -948,6 +952,8 @@ sub ProcessJpeg2000Box($$$)
         # (must not set verbose flag when writing!)
         $verbose = $$et{OPTIONS}{Verbose};
         $et->VerboseDir($$dirInfo{DirName}) if $verbose;
+        # do MD5 if requested, but only for top-level image data
+        $md5 = $$et{ImageDataMD5} if $raf;
     }
     # loop through all contained boxes
     my ($pos, $boxLen, $lastBox);
@@ -971,6 +977,11 @@ sub ProcessJpeg2000Box($$$)
         }
         $boxLen = unpack("x$pos N",$$dataPt);   # (length includes header and data)
         $boxID = substr($$dataPt, $pos+4, 4);
+        # (ftbl box contains flst boxes with absolute file offsets, not currently handled)
+        if ($outfile and $boxID eq 'ftbl') {
+            $et->Error("Can't yet handle fragmented JPX files");
+            return -1;
+        }
         # remove old colr boxes if necessary
         if ($doColour and $boxID eq 'colr') {
             if ($doColour == 1) { # did we successfully write the new colr box?
@@ -1007,9 +1018,14 @@ sub ProcessJpeg2000Box($$$)
                     while ($raf->Read($buff, 65536)) {
                         Write($outfile, $buff) or $err = 1;
                     }
-                } elsif ($verbose) {
-                    my $msg = sprintf("offset 0x%.4x to end of file", $dataPos + $base + $pos);
-                    $et->VPrint(0, "$$et{INDENT}- Tag '${boxID}' ($msg)\n");
+                } else {
+                    if ($verbose) {
+                        my $msg = sprintf("offset 0x%.4x to end of file", $dataPos + $base + $pos);
+                        $et->VPrint(0, "$$et{INDENT}- Tag '${boxID}' ($msg)\n");
+                    }
+                    if ($md5 and $isImageData{$boxID}) {
+                        $et->ImageDataMD5($raf, undef, $boxID);
+                    }
                 }
                 last;   # (ignore the rest of the file when reading)
             }
@@ -1026,6 +1042,8 @@ sub ProcessJpeg2000Box($$$)
                     Write($outfile, $$dataPt) or $err = 1;
                     $raf->Read($buff,$boxLen) == $boxLen or $err = '', last;
                     Write($outfile, $buff) or $err = 1;
+                } elsif ($md5 and $isImageData{$boxID}) {
+                    $et->ImageDataMD5($raf, $boxLen, $boxID);
                 } else {
                     $raf->Seek($boxLen, 1) or $err = 'Seek error', last;
                 }
@@ -1038,6 +1056,10 @@ sub ProcessJpeg2000Box($$$)
             # read the box data
             $dataPos = $raf->Tell() - $base;
             $raf->Read($buff,$boxLen) == $boxLen or $err = '', last;
+            if ($md5 and $isImageData{$boxID}) {
+                $md5->add($buff);
+                $et->VPrint(0, "$$et{INDENT}(ImageDataMD5: $boxLen bytes of $boxID data)\n");
+            }
             $valuePtr = 0;
             $dataLen = $boxLen;
         } elsif ($pos + $boxLen > $dirEnd) {
@@ -1311,7 +1333,7 @@ sub ProcessJP2($$)
 }
 
 #------------------------------------------------------------------------------
-# Read meta information from a JPEG XL image
+# Read/write meta information in a JPEG XL image
 # Inputs: 0) ExifTool object reference, 1) dirInfo reference
 # Returns: 1 on success, 0 if this wasn't a valid JPEG XL file, -1 on write error
 sub ProcessJXL($$)
@@ -1340,6 +1362,9 @@ sub ProcessJXL($$)
             $$dirInfo{RAF} = new File::RandomAccess(\$buff);
         } else {
             $et->SetFileType('JXL Codestream','image/jxl', 'jxl');
+            if ($$et{ImageDataMD5} and $raf->Seek(0,0)) {
+                $et->ImageDataMD5($raf, undef, 'JXL');
+            }
             return ProcessJXLCodestream($et, \$hdr);
         }
     } else {

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

@@ -17,7 +17,7 @@ use vars qw($VERSION);
 use Image::ExifTool qw(:DataAccess :Utils);
 use Image::ExifTool::Minolta;
 
-$VERSION = '1.17';
+$VERSION = '1.18';
 
 sub ProcessMRW($$;$);
 sub WriteMRW($$;$);
@@ -489,7 +489,7 @@ sub ProcessMRW($$;$)
         $err and $et->Error("MRW format error", $$et{TIFF_TYPE} eq 'ARW');
     } else {
         $err and $et->Warn("MRW format error");
-        $et->ImageDataMD5($raf, undef, 'raw');
+        $et->ImageDataMD5($raf, undef, 'raw') unless $$et{A100DataOffset};
     }
     return $rtnVal;
 }

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

@@ -64,7 +64,7 @@ use Image::ExifTool::Exif;
 use Image::ExifTool::GPS;
 use Image::ExifTool::XMP;
 
-$VERSION = '4.21';
+$VERSION = '4.22';
 
 sub LensIDConv($$$);
 sub ProcessNikonAVI($$$);
@@ -2300,8 +2300,8 @@ my %base64coord = (
             },
         },
         { # (Z6_2 firmware version 1.00 and Z7II firmware versions 1.00 & 1.01, ref 28)
-            # 0800=Z6/Z7  0801=Z50  0802=Z5   0803=Z6II/Z7II  0804=Zfc
-            Condition => '$$valPt =~ /^080[01234]/',
+            # 0800=Z6/Z7  0801=Z50  0802=Z5   0803=Z6II/Z7II  0804=Zfc  0807=Z30
+            Condition => '$$valPt =~ /^080[012347]/',
             Name => 'ShotInfoZ7II',
             SubDirectory => {
                 TagTable => 'Image::ExifTool::Nikon::ShotInfoZ7II',