exiftool-vendored.exe 12.33.0 → 12.40.0

package/bin/exiftool_files/exiftool.pl

@@ -10,15 +10,15 @@
 use strict;
 require 5.004;
 
-my $version = '12.33';
+my $version = '12.40';
 
 # add our 'lib' directory to the include list BEFORE 'use Image::ExifTool'
-my $exeDir;
+my $exePath;
 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;
+    $exePath = @ARGV && lc($ARGV[0]) eq '-xpath' && shift() ? $^X : $0;
     # get exe directory
-    $exeDir = ($Image::ExifTool::exePath =~ /(.*)[\\\/]/) ? $1 : '.';
+    $Image::ExifTool::exeDir = ($exePath =~ /(.*)[\\\/]/) ? $1 : '.';
     # (no link following for Windows exe version)
     # add lib directory at start of include path
     unshift @INC, ($0 =~ /(.*)[\\\/]/) ? "$1/lib" : './lib';
@@ -350,7 +350,7 @@ sub Cleanup() {
 #
 
 # add arguments embedded in filename (Windows .exe version only)
-if ($Image::ExifTool::exePath =~ /\(([^\\\/]+)\)(.exe|.pl)?$/i) {
+if ($exePath =~ /\(([^\\\/]+)\)(.exe|.pl)?$/i) {
     my $argstr = $1;
     # divide into separate quoted or whitespace-delineated arguments
     my (@args, $arg, $quote);
@@ -773,7 +773,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
@@ -1251,7 +1251,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
@@ -1967,6 +1967,7 @@ sub GetImageInfo($$)
             } else {
                 $pipe = qq{bzip2 -dc "$file" |};
             }
+            $$et{TRUST_PIPE} = 1;
         }
     }
     # evaluate -if expression for conditional processing
@@ -2237,12 +2238,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};
@@ -2365,7 +2367,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 +3064,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";
@@ -3462,18 +3467,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;
 }
@@ -3801,7 +3814,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 ();
@@ -3941,7 +3954,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') {
@@ -3993,14 +4006,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
@@ -4014,9 +4028,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);
@@ -4179,7 +4193,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;
@@ -4455,7 +4469,7 @@ SYNOPSIS
     exiftool [*OPTIONS*] -*TAG*[+-<]=[*VALUE*]... *FILE*...
 
   Copying
-    exiftool [*OPTIONS*] -tagsFromFile *SRCFILE* [-*SRCTAG*[>*DSTTAG*]...]
+    exiftool [*OPTIONS*] -tagsFromFile *SRCFILE* [-[*DSTTAG*<]*SRCTAG*...]
     *FILE*...
 
   Other
@@ -4494,48 +4508,48 @@ DESCRIPTION
 
       File Types
       ------------+-------------+-------------+-------------+------------
-      360   r/w   | DR4   r/w/c | JNG   r/w   | ODP   r     | RIFF  r
-      3FR   r     | DSS   r     | JP2   r/w   | ODS   r     | RSRC  r
-      3G2   r/w   | DV    r     | JPEG  r/w   | ODT   r     | RTF   r
-      3GP   r/w   | DVB   r/w   | JSON  r     | OFR   r     | RW2   r/w
-      A     r     | DVR-MS r    | JXL   r     | OGG   r     | RWL   r/w
-      AA    r     | DYLIB r     | K25   r     | OGV   r     | RWZ   r
-      AAE   r     | EIP   r     | KDC   r     | ONP   r     | RM    r
-      AAX   r/w   | EPS   r/w   | KEY   r     | OPUS  r     | SEQ   r
-      ACR   r     | EPUB  r     | LA    r     | ORF   r/w   | SKETCH r
-      AFM   r     | ERF   r/w   | LFP   r     | ORI   r/w   | SO    r
-      AI    r/w   | EXE   r     | LIF   r     | OTF   r     | SR2   r/w
-      AIFF  r     | EXIF  r/w/c | LNK   r     | PAC   r     | SRF   r
-      APE   r     | EXR   r     | LRV   r/w   | PAGES r     | SRW   r/w
-      ARQ   r/w   | EXV   r/w/c | M2TS  r     | PBM   r/w   | SVG   r
-      ARW   r/w   | F4A/V r/w   | M4A/V r/w   | PCD   r     | SWF   r
-      ASF   r     | FFF   r/w   | MACOS r     | PCX   r     | THM   r/w
-      AVI   r     | FITS  r     | MAX   r     | PDB   r     | TIFF  r/w
-      AVIF  r/w   | FLA   r     | MEF   r/w   | PDF   r/w   | TORRENT r
-      AZW   r     | FLAC  r     | MIE   r/w/  | PEF   r/w   | TTC   r
-      BMP   r     | FLIF  r/w   | MIFF  r   c | PFA   r     | TTF   r
-      BPG   r     | FLV   r     | MKA   r     | PFB   r     | TXT   r
-      BTF   r     | FPF   r     | MKS   r     | PFM   r     | VCF   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
-      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
-      CZI   r     | HTML  r     | MP4   r/w   | PPTX  r     | WTV   r
-      DCM   r     | ICC   r/w/c | MPC   r     | PS    r/w   | WV    r
-      DCP   r/w   | ICS   r     | MPG   r     | PSB   r/w   | X3F   r/w
-      DCR   r     | IDML  r     | MPO   r/w   | PSD   r/w   | XCF   r
-      DFONT r     | IIQ   r/w   | MQV   r/w   | PSP   r     | XLS   r
-      DIVX  r     | IND   r/w   | MRC   r     | QTIF  r/w   | XLSX  r
-      DJVU  r     | INSP  r/w   | MRW   r/w   | R3D   r     | XMP   r/w/c
-      DLL   r     | INSV  r     | MXF   r     | RA    r     | ZIP   r
-      DNG   r/w   | INX   r     | NEF   r/w   | RAF   r/w   |
-      DOC   r     | ISO   r     | NRW   r/w   | RAM   r     |
-      DOCX  r     | ITC   r     | NUMBERS r   | RAR   r     |
-      DPX   r     | J2C   r     | O     r     | RAW   r/w   |
+      360   r/w   | DR4   r/w/c | JNG   r/w   | O     r     | RAW   r/w
+      3FR   r     | DSS   r     | JP2   r/w   | ODP   r     | RIFF  r
+      3G2   r/w   | DV    r     | JPEG  r/w   | ODS   r     | RSRC  r
+      3GP   r/w   | DVB   r/w   | JSON  r     | ODT   r     | RTF   r
+      A     r     | DVR-MS r    | JXL   r     | OFR   r     | RW2   r/w
+      AA    r     | DYLIB r     | K25   r     | OGG   r     | RWL   r/w
+      AAE   r     | EIP   r     | KDC   r     | OGV   r     | RWZ   r
+      AAX   r/w   | EPS   r/w   | KEY   r     | ONP   r     | RM    r
+      ACR   r     | EPUB  r     | LA    r     | OPUS  r     | SEQ   r
+      AFM   r     | ERF   r/w   | LFP   r     | ORF   r/w   | SKETCH r
+      AI    r/w   | EXE   r     | LIF   r     | ORI   r/w   | SO    r
+      AIFF  r     | EXIF  r/w/c | LNK   r     | OTF   r     | SR2   r/w
+      APE   r     | EXR   r     | LRV   r/w   | PAC   r     | SRF   r
+      ARQ   r/w   | EXV   r/w/c | M2TS  r     | PAGES r     | SRW   r/w
+      ARW   r/w   | F4A/V r/w   | M4A/V r/w   | PBM   r/w   | SVG   r
+      ASF   r     | FFF   r/w   | MACOS r     | PCD   r     | SWF   r
+      AVI   r     | FITS  r     | MAX   r     | PCX   r     | THM   r/w
+      AVIF  r/w   | FLA   r     | MEF   r/w   | PDB   r     | TIFF  r/w
+      AZW   r     | FLAC  r     | MIE   r/w/  | PDF   r/w   | TORRENT r
+      BMP   r     | FLIF  r/w   | MIFF  r   c | PEF   r/w   | TTC   r
+      BPG   r     | FLV   r     | MKA   r     | PFA   r     | TTF   r
+      BTF   r     | FPF   r     | MKS   r     | PFB   r     | TXT   r
+      CHM   r     | FPX   r     | MKV   r     | PFM   r     | VCF   r
+      COS   r     | GIF   r/w   | MNG   r/w   | PGF   r     | VRD   r/w/c
+      CR2   r/w   | GPR   r/w   | MOBI  r     | PGM   r/w   | VSD   r
+      CR3   r/w   | GZ    r     | MODD  r     | PLIST r     | WAV   r
+      CRM   r/w   | HDP   r/w   | MOI   r     | PICT  r     | WDP   r/w
+      CRW   r/w   | HDR   r     | MOS   r/w   | PMP   r     | WEBP  r
+      CS1   r/w   | HEIC  r/w   | MOV   r/w   | PNG   r/w   | WEBM  r
+      CSV   r     | HEIF  r/w   | MP3   r     | PPM   r/w   | WMA   r
+      CZI   r     | HTML  r     | MP4   r/w   | PPT   r     | WMV   r
+      DCM   r     | ICC   r/w/c | MPC   r     | PPTX  r     | WTV   r
+      DCP   r/w   | ICS   r     | MPG   r     | PS    r/w   | WV    r
+      DCR   r     | IDML  r     | MPO   r/w   | PSB   r/w   | X3F   r/w
+      DFONT r     | IIQ   r/w   | MQV   r/w   | PSD   r/w   | XCF   r
+      DIVX  r     | IND   r/w   | MRC   r     | PSP   r     | XLS   r
+      DJVU  r     | INSP  r/w   | MRW   r/w   | QTIF  r/w   | XLSX  r
+      DLL   r     | INSV  r     | MXF   r     | R3D   r     | XMP   r/w/c
+      DNG   r/w   | INX   r     | NEF   r/w   | RA    r     | ZIP   r
+      DOC   r     | ISO   r     | NKSC  r/w   | RAF   r/w   |
+      DOCX  r     | ITC   r     | NRW   r/w   | RAM   r     |
+      DPX   r     | J2C   r     | NUMBERS r   | RAR   r     |
 
       Meta Information
       ----------------------+----------------------+---------------------
@@ -4724,6 +4738,15 @@ OPTIONS
          4 below). Instead, individual tags may be recovered using the
          -tagsFromFile option (eg. "-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, "--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. "--xmp-crs:dabs"). Also, "XMP-all" may be
+         used to to indicate any XMP namespace (eg. <C--xmp-all:dabs>).
+
     -*TAG*[+-^]=[*VALUE*]
          Write a new value for the specified tag (eg. "-comment=wow"), or
          delete the tag if no *VALUE* is given (eg. "-comment="). "+=" and
@@ -4734,7 +4757,8 @@ OPTIONS
          may be used to conditionally delete or replace a tag (see "WRITING
          EXAMPLES" for examples). "^=" is used to write an empty string
          instead of deleting the tag when no *VALUE* is given, but otherwise
-         it is equivalent to "=".
+         it is equivalent to "=", but note that the caret must be quoted on
+         the Windows command line.
 
          *TAG* may contain one or more leading family 0, 1, 2 or 7 group
          names, prefixed by optional family numbers, and separated colons.
@@ -5190,7 +5214,10 @@ OPTIONS
          "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 -d option may be used per command. Requires
+         present. ExifTool adds a %f format code to represent fractional
+         seconds, and supports an optional width to specify the number of
+         digits after the decimal point (eg. %3f would give something like
+         .437). Only one -d option may be used per command. Requires
          POSIX::strptime or Time::Piece for the inversion conversion when
          writing.
 
@@ -5419,7 +5446,8 @@ OPTIONS
          beginning with "#" are output for each processed file. Lines
          beginning with "#[IF]" are not output, but all BODY lines are
          skipped if any tag on an IF line doesn't exist. Other lines
-         beginning with "#" are ignored. For example, this format file:
+         beginning with "#" are ignored. (To output a line beginning with
+         "#", use "#[BODY]#".) For example, this format file:
 
              # this is a comment line
              #[HEAD]-- Generated by ExifTool $exifToolVersion --
@@ -5433,7 +5461,7 @@ OPTIONS
 
          produces output like this:
 
-             -- Generated by ExifTool 12.33 --
+             -- Generated by ExifTool 12.40 --
              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
@@ -5690,13 +5718,15 @@ OPTIONS
 
          1) With -W, a new output file is created for each extracted tag.
 
-         2) -W supports three additional format codes: %t, %g and %s
+         2) -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). 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.
+         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 -W is interpreted as a file name if it contains
          no format codes. (For -w, this would be a file extension.) This
@@ -5718,7 +5748,7 @@ OPTIONS
          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 -W+ with an output file *FMT* that does not
-         contain %t, $g or %s.)
+         contain %t, %g, %s or %o.)
 
          5) Individual list items are stored in separate files when -W is
          combined with -b, but note that for separate files to be created %c
@@ -7114,7 +7144,7 @@ EXIT STATUS
     the commands if -execute was used).
 
 AUTHOR
-    Copyright 2003-2021, Phil Harvey
+    Copyright 2003-2022, Phil Harvey
 
     This is free software; you can redistribute it and/or modify it under
     the same terms as Perl itself.
@@ -7127,9 +7157,9 @@ __HELP__
 
     my $dir = $ENV{PAR_GLOBAL_TEMP} || $ENV{PAR_TEMP} || $ENV{TMP} || $ENV{TEMP} || '/tmp';
     my $docFile = "$dir/exiftool_${version}_doc.txt";
+    # try backslashes first if it seems we may be running in cmd.exe
+    $docFile =~ tr/\//\\/ if $ENV{ComSpec} or $docFile =~ /\\/;
     unless (-e $docFile) {
-        # try backslashes first if it seems we may be running in cmd.exe
-        $docFile =~ tr/\//\\/ if $ENV{ComSpec} or $docFile =~ /\\/;
         unless (open(TEMP, ">$docFile") or
             ($docFile =~ tr/\/\\/\\\// and open(TEMP, ">$docFile")) or  # try forward slash
             (CreateDirectory($docFile) and open(TEMP, ">$docFile")))    # try creating dir

package/bin/exiftool_files/lib/File/RandomAccess.pm

@@ -25,7 +25,7 @@
 #
 #               May also be used for string i/o (just pass a scalar reference)
 #
-# Legal:        Copyright (c) 2003-2021 Phil Harvey (philharvey66 at gmail.com)
+# Legal:        Copyright (c) 2003-2022 Phil Harvey (philharvey66 at gmail.com)
 #               This library is free software; you can redistribute it and/or
 #               modify it under the same terms as Perl itself.
 #------------------------------------------------------------------------------

package/bin/exiftool_files/lib/File/RandomAccess.pod

@@ -3,7 +3,7 @@
 #
 # Description:  Buffer to support random access reading of sequential file
 #
-# Legal:        Copyright (c) 2003-2021 Phil Harvey (philharvey66 at gmail.com)
+# Legal:        Copyright (c) 2003-2022 Phil Harvey (philharvey66 at gmail.com)
 #               This library is free software; you can redistribute it and/or
 #               modify it under the same terms as Perl itself.
 #------------------------------------------------------------------------------
@@ -236,7 +236,7 @@ the end of file is not allowed.
 
 =head1 AUTHOR
 
-Copyright 2003-2021 Phil Harvey (philharvey66 at gmail.com)
+Copyright 2003-2022 Phil Harvey (philharvey66 at gmail.com)
 
 This library is free software; you can redistribute it and/or modify it
 under the same terms as Perl itself.

package/bin/exiftool_files/lib/Image/ExifTool/AES.pm

@@ -477,7 +477,7 @@ main purpose of encryption, so this really can't be considered a bug.
 
 =head1 AUTHOR
 
-Copyright 2003-2021, Phil Harvey (philharvey66 at gmail.com)
+Copyright 2003-2022, Phil Harvey (philharvey66 at gmail.com)
 
 This library is free software; you can redistribute it and/or modify it
 under the same terms as Perl itself.

package/bin/exiftool_files/lib/Image/ExifTool/AFCP.pm

@@ -259,7 +259,7 @@ scanning for AFCP information.
 
 =head1 AUTHOR
 
-Copyright 2003-2021, Phil Harvey (philharvey66 at gmail.com)
+Copyright 2003-2022, Phil Harvey (philharvey66 at gmail.com)
 
 This library is free software; you can redistribute it and/or modify it
 under the same terms as Perl itself.

package/bin/exiftool_files/lib/Image/ExifTool/AIFF.pm

@@ -287,7 +287,7 @@ information from AIFF (Audio Interchange File Format) audio files.
 
 =head1 AUTHOR
 
-Copyright 2003-2021, Phil Harvey (philharvey66 at gmail.com)
+Copyright 2003-2022, Phil Harvey (philharvey66 at gmail.com)
 
 This library is free software; you can redistribute it and/or modify it
 under the same terms as Perl itself.

package/bin/exiftool_files/lib/Image/ExifTool/APE.pm

@@ -263,7 +263,7 @@ Currently doesn't parse MAC header unless it is at the start of the file.
 
 =head1 AUTHOR
 
-Copyright 2003-2021, Phil Harvey (philharvey66 at gmail.com)
+Copyright 2003-2022, Phil Harvey (philharvey66 at gmail.com)
 
 This library is free software; you can redistribute it and/or modify it
 under the same terms as Perl itself.

package/bin/exiftool_files/lib/Image/ExifTool/APP12.pm

@@ -305,7 +305,7 @@ APP12 meta information.
 
 =head1 AUTHOR
 
-Copyright 2003-2021, Phil Harvey (philharvey66 at gmail.com)
+Copyright 2003-2022, Phil Harvey (philharvey66 at gmail.com)
 
 This library is free software; you can redistribute it and/or modify it
 under the same terms as Perl itself.

package/bin/exiftool_files/lib/Image/ExifTool/ASF.pm

@@ -876,7 +876,7 @@ Windows Media Audio (WMA) and Windows Media Video (WMV) files.
 
 =head1 AUTHOR
 
-Copyright 2003-2021, Phil Harvey (philharvey66 at gmail.com)
+Copyright 2003-2022, Phil Harvey (philharvey66 at gmail.com)
 
 This library is free software; you can redistribute it and/or modify it
 under the same terms as Perl itself.

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

@@ -149,7 +149,7 @@ Apple maker notes in EXIF information.
 
 =head1 AUTHOR
 
-Copyright 2003-2021, Phil Harvey (philharvey66 at gmail.com)
+Copyright 2003-2022, Phil Harvey (philharvey66 at gmail.com)
 
 This library is free software; you can redistribute it and/or modify it
 under the same terms as Perl itself.

package/bin/exiftool_files/lib/Image/ExifTool/Audible.pm

@@ -291,7 +291,7 @@ information from Audible audio books.
 
 =head1 AUTHOR
 
-Copyright 2003-2021, Phil Harvey (philharvey66 at gmail.com)
+Copyright 2003-2022, Phil Harvey (philharvey66 at gmail.com)
 
 This library is free software; you can redistribute it and/or modify it
 under the same terms as Perl itself.

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

@@ -335,7 +335,7 @@ This module contains definitions required by Image::ExifTool to read BMP
 
 =head1 AUTHOR
 
-Copyright 2003-2021, Phil Harvey (philharvey66 at gmail.com)
+Copyright 2003-2022, Phil Harvey (philharvey66 at gmail.com)
 
 This library is free software; you can redistribute it and/or modify it
 under the same terms as Perl itself.

package/bin/exiftool_files/lib/Image/ExifTool/BPG.pm

@@ -231,7 +231,7 @@ This module contains definitions required by Image::ExifTool to read BPG
 
 =head1 AUTHOR
 
-Copyright 2003-2021, Phil Harvey (philharvey66 at gmail.com)
+Copyright 2003-2022, Phil Harvey (philharvey66 at gmail.com)
 
 This library is free software; you can redistribute it and/or modify it
 under the same terms as Perl itself.

package/bin/exiftool_files/lib/Image/ExifTool/BZZ.pm

@@ -445,7 +445,7 @@ compression ability).
 
 =head1 AUTHOR
 
-Copyright 2003-2021, Phil Harvey (philharvey66 at gmail.com)
+Copyright 2003-2022, Phil Harvey (philharvey66 at gmail.com)
 Copyright 2002, Leon Bottou and Yann Le Cun
 Copyright 2001, AT&T
 Copyright 1999-2001, LizardTech Inc.

package/bin/exiftool_files/lib/Image/ExifTool/BigTIFF.pm

@@ -275,7 +275,7 @@ information in BigTIFF images.
 
 =head1 AUTHOR
 
-Copyright 2003-2021, Phil Harvey (philharvey66 at gmail.com)
+Copyright 2003-2022, Phil Harvey (philharvey66 at gmail.com)
 
 This library is free software; you can redistribute it and/or modify it
 under the same terms as Perl itself.

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

@@ -35,7 +35,7 @@ use Image::ExifTool::Sony;
 use Image::ExifTool::Validate;
 use Image::ExifTool::MacOS;
 
-$VERSION = '3.45';
+$VERSION = '3.47';
 @ISA = qw(Exporter);
 
 sub NumbersFirst($$);
@@ -469,6 +469,11 @@ the PrintConv option is enabled and no time zone is specified.  This is
 because Apple software may display crazy values if the time zone is missing
 for some tags.
 
+By default ExifTool will remove null padding from some QuickTime containers
+in Canon CR3 files when writing, but the
+L<QuickTimePad|../ExifTool.html#QuickTimePad> option may be used to preserve
+the original size by padding with nulls if necessary.
+
 See
 L<https://developer.apple.com/library/archive/documentation/QuickTime/QTFF/>
 for the official specification.
@@ -664,7 +669,7 @@ L<Image::ExifTool::BuildTagLookup|Image::ExifTool::BuildTagLookup>.
 
 ~head1 AUTHOR
 
-Copyright 2003-2021, Phil Harvey (philharvey66 at gmail.com)
+Copyright 2003-2022, Phil Harvey (philharvey66 at gmail.com)
 
 This library is free software; you can redistribute it and/or modify it
 under the same terms as Perl itself.
@@ -752,7 +757,7 @@ sub new
     my (%tagNameInfo, %id, %longID, %longName, %shortName, %tableNum,
         %tagLookup, %tagExists, %noLookup, %tableWritable, %sepTable, %case,
         %structs, %compositeModules, %isPlugin, %flattened, %structLookup,
-        @writePseudo);
+        @writePseudo, %dupXmpTag);
     $self->{TAG_NAME_INFO} = \%tagNameInfo;
     $self->{ID_LOOKUP} = \%id;
     $self->{LONG_ID} = \%longID;
@@ -900,6 +905,12 @@ TagID:  foreach $tagID (@keys) {
                 foreach (@grps) {
                     warn "Group name starts with 'ID-' for $short $name\n" if /^ID-/i;
                 }
+                if ($isXMP and not $$tagInfo{Avoid} and not $$tagInfo{Struct} and
+                    ($$tagInfo{Writable} or $$table{WRITABLE}))
+                {
+                    $dupXmpTag{$name} and warn "Duplicate writable XMP tag $name\n";
+                    $dupXmpTag{$name} = 1;
+                }
                 # validate Name (must not start with a digit or else XML output will not be valid;
                 # must not start with a dash or exiftool command line may get confused)
                 if ($name !~ /^[_A-Za-z][-\w]+$/ and
@@ -2751,7 +2762,7 @@ Returned list of writable pseudo tags.
 
 =head1 AUTHOR
 
-Copyright 2003-2021, Phil Harvey (philharvey66 at gmail.com)
+Copyright 2003-2022, Phil Harvey (philharvey66 at gmail.com)
 
 This library is free software; you can redistribute it and/or modify it
 under the same terms as Perl itself.

package/bin/exiftool_files/lib/Image/ExifTool/CBOR.pm

@@ -307,7 +307,7 @@ specification.
 
 =head1 AUTHOR
 
-Copyright 2003-2021, Phil Harvey (philharvey66 at gmail.com)
+Copyright 2003-2022, Phil Harvey (philharvey66 at gmail.com)
 
 This library is free software; you can redistribute it and/or modify it
 under the same terms as Perl itself.