exiftool-vendored.exe 12.34.0 → 12.38.0

package/bin/exiftool_files/Changes

@@ -7,11 +7,67 @@ 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
+    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)
@@ -19,7 +75,7 @@ Oct. 27, 2021 - Version 12.34
   - 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)
+    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:
@@ -153,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
@@ -635,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

package/bin/exiftool_files/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.34.tar.gz | tar -xf -
-  cd Image-ExifTool-12.34
+  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/exiftool_files/exiftool.pl

@@ -10,15 +10,15 @@
 use strict;
 require 5.004;
 
-my $version = '12.34';
+my $version = '12.38';
 
 # 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;
                 }
@@ -3464,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;
 }
@@ -3803,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 ();
@@ -3943,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') {
@@ -3995,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
@@ -4016,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);
@@ -4181,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;
@@ -4726,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
@@ -4736,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.
@@ -5192,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.
 
@@ -5421,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 --
@@ -5435,7 +5461,7 @@ OPTIONS
 
          produces output like this:
 
-             -- Generated by ExifTool 12.34 --
+             -- 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
@@ -5692,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
@@ -5720,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

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.46';
+$VERSION = '3.47';
 @ISA = qw(Exporter);
 
 sub NumbersFirst($$);
@@ -757,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;
@@ -905,6 +905,10 @@ 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}) {
+                    $dupXmpTag{$name} and warn "Duplicate 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

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

@@ -88,7 +88,7 @@ sub ProcessCTMD($$$);
 sub ProcessExifInfo($$$);
 sub SwapWords($);
 
-$VERSION = '4.53';
+$VERSION = '4.55';
 
 # Note: Removed 'USM' from 'L' lenses since it is redundant - PH
 # (or is it?  Ref 32 shows 5 non-USM L-type lenses)
@@ -954,6 +954,7 @@ $VERSION = '4.53';
     0x80000435 => 'EOS Rebel T8i / 850D / X10i', #JR/PH
     0x80000436 => 'EOS SL3 / 250D / Kiss X10', #25
     0x80000437 => 'EOS 90D', #IB
+    0x80000450 => 'EOS R3', #42
     0x80000453 => 'EOS R6', #PH
     0x80000467 => 'PowerShot ZOOM',
     0x80000468 => 'EOS M50 Mark II / Kiss M2', #IB
@@ -1918,6 +1919,11 @@ my %offOn = ( 0 => 'Off', 1 => 'On' );
             Name => 'ColorData10',
             SubDirectory => { TagTable => 'Image::ExifTool::Canon::ColorData10' },
         },
+        {   # (int16u[3973]) - R3 ref IB
+            Condition => '$count == 3973',
+            Name => 'ColorData11',
+            SubDirectory => { TagTable => 'Image::ExifTool::Canon::ColorData11' },
+        },
         {
             Name => 'ColorDataUnknown',
             SubDirectory => { TagTable => 'Image::ExifTool::Canon::ColorDataUnknown' },
@@ -7719,7 +7725,10 @@ my %ciMaxFocal = (
 # Color data (MakerNotes tag 0x4001, count=1312,1313,1316) (ref PH)
 %Image::ExifTool::Canon::ColorData7 = (
     %binaryDataAttrs,
-    NOTES => 'These tags are used by the EOS 1DX, 5DmkIII, 6D, 100D, 650D, 700D, M and 7DmkII.',
+    NOTES => q{
+        These tags are used by the EOS 1DX, 5DmkIII, 6D, 7DmkII, 100D, 650D, 700D,
+        8000D, M and M2.
+    },
     FORMAT => 'int16s',
     FIRST_ENTRY => 0,
     GROUPS => { 0 => 'MakerNotes', 2 => 'Camera' },
@@ -7730,8 +7739,8 @@ my %ciMaxFocal = (
         DataMember => 'ColorDataVersion',
         RawConv => '$$self{ColorDataVersion} = $val',
         PrintConv => {
-            10 => '10 (1DX/5DmkIII/6D/70D/100D/650D/700D/M)',
-            11 => '11 (7DmkII/750D/760D)',
+            10 => '10 (1DX/5DmkIII/6D/70D/100D/650D/700D/M/M2)',
+            11 => '11 (7DmkII/750D/760D/8000D)',
         },
     },
     # not really sure about the AsShot, Auto and Measured values any more - PH
@@ -7866,6 +7875,10 @@ my %ciMaxFocal = (
 # Color data (MakerNotes tag 0x4001, count=1560,etc) (ref IB)
 %Image::ExifTool::Canon::ColorData8 = (
     %binaryDataAttrs,
+    NOTES => q{
+        These tags are used by the EOS 1DXmkII, 5DS, 5DSR, 5DmkIV, 6DmkII, 77D, 80D,
+        200D, 800D, 1300D, 2000D, 4000D and 9000D.
+    },
     FORMAT => 'int16s',
     FIRST_ENTRY => 0,
     GROUPS => { 0 => 'MakerNotes', 2 => 'Camera' },
@@ -7876,10 +7889,10 @@ my %ciMaxFocal = (
         DataMember => 'ColorDataVersion',
         RawConv => '$$self{ColorDataVersion} = $val',
         PrintConv => {
-            12 => '12 (5DS/5DSR)',
-            13 => '13 (80D)', #PH
+            12 => '12 (1DXmkII/5DS/5DSR)',
+            13 => '13 (80D/5DmkIV)', #PH
             14 => '14 (1300D/2000D/4000D)', #IB
-            15 => '15 (6DmkII/77D/200D/800D)', #IB
+            15 => '15 (6DmkII/77D/200D/800D,9000D)', #IB
         },
     },
     0x3f => { Name => 'WB_RGGBLevelsAsShot',     Format => 'int16s[4]' },
@@ -8026,6 +8039,7 @@ my %ciMaxFocal = (
 # Color data (MakerNotes tag 0x4001, count=1820,etc) (ref PH)
 %Image::ExifTool::Canon::ColorData9 = (
     %binaryDataAttrs,
+    NOTES => 'These tags are used by the M6mkII, M50, M200, EOS R, RP, 90D, 250D and 850D',
     FORMAT => 'int16s',
     FIRST_ENTRY => 0,
     GROUPS => { 0 => 'MakerNotes', 2 => 'Camera' },
@@ -8038,8 +8052,8 @@ my %ciMaxFocal = (
         PrintConv => {
             16 => '16 (M50)',
             17 => '17 (EOS R)',     # (and PowerShot SX740HS)
-            18 => '18 (EOS RP)',    # (and PowerShot SX70HS)
-            19 => '19 (90D/M6mkII/M200)',# (and PowerShot G7XmkIII)
+            18 => '18 (EOS RP/250D)',    # (and PowerShot SX70HS)
+            19 => '19 (90D/850D/M6mkII/M200)',# (and PowerShot G7XmkIII)
         },
     },
     0x47 => { Name => 'WB_RGGBLevelsAsShot',     Format => 'int16s[4]' },
@@ -8150,6 +8164,7 @@ my %ciMaxFocal = (
 # (same as ColorData9 but shifted up by 0x0e, ref PH)
 %Image::ExifTool::Canon::ColorData10 = (
     %binaryDataAttrs,
+    NOTES => 'These tags are used by the R5, R5 and EOS 1DXmkIII.',
     FORMAT => 'int16s',
     FIRST_ENTRY => 0,
     GROUPS => { 0 => 'MakerNotes', 2 => 'Camera' },
@@ -8268,6 +8283,125 @@ my %ciMaxFocal = (
     },
 );
 
+# Color data (MakerNotes tag 0x4001, count=3973, ref IB)
+%Image::ExifTool::Canon::ColorData11 = (
+    %binaryDataAttrs,
+    NOTES => 'These tags are used by the EOS R3',
+    FORMAT => 'int16s',
+    FIRST_ENTRY => 0,
+    GROUPS => { 0 => 'MakerNotes', 2 => 'Camera' },
+    DATAMEMBER => [ 0 ],
+    IS_SUBDIR => [ 0x12c ],
+    0x00 => {
+        Name => 'ColorDataVersion',
+        DataMember => 'ColorDataVersion',
+        RawConv => '$$self{ColorDataVersion} = $val',
+        PrintConv => {
+            34 => '34 (R3)', #IB
+        },
+    },
+    0x69 => { Name => 'WB_RGGBLevelsAsShot',     Format => 'int16s[4]' },
+    0x6d => 'ColorTempAsShot',
+    0x6e => { Name => 'WB_RGGBLevelsAuto',       Format => 'int16s[4]' },
+    0x72 => 'ColorTempAuto',
+    0x73 => { Name => 'WB_RGGBLevelsMeasured',   Format => 'int16s[4]' },
+    0x77 => 'ColorTempMeasured',
+    0x78 => { Name => 'WB_RGGBLevelsUnknown',   Format => 'int16s[4]', Unknown => 1 },
+    0x7c => { Name => 'ColorTempUnknown',  Unknown => 1 },
+    0x7d => { Name => 'WB_RGGBLevelsUnknown2',  Format => 'int16s[4]', Unknown => 1 },
+    0x81 => { Name => 'ColorTempUnknown2', Unknown => 1 },
+    0x82 => { Name => 'WB_RGGBLevelsUnknown3',  Format => 'int16s[4]', Unknown => 1 },
+    0x86 => { Name => 'ColorTempUnknown3', Unknown => 1 },
+    0x87 => { Name => 'WB_RGGBLevelsUnknown4',  Format => 'int16s[4]', Unknown => 1 },
+    0x8b => { Name => 'ColorTempUnknown4', Unknown => 1 },
+    0x8c => { Name => 'WB_RGGBLevelsUnknown5',  Format => 'int16s[4]', Unknown => 1 },
+    0x90 => { Name => 'ColorTempUnknown5', Unknown => 1 },
+    0x91 => { Name => 'WB_RGGBLevelsUnknown6',  Format => 'int16s[4]', Unknown => 1 },
+    0x95 => { Name => 'ColorTempUnknown6', Unknown => 1 },
+    0x96 => { Name => 'WB_RGGBLevelsUnknown7',  Format => 'int16s[4]', Unknown => 1 },
+    0x9a => { Name => 'ColorTempUnknown7', Unknown => 1 },
+    0x9b => { Name => 'WB_RGGBLevelsUnknown8',  Format => 'int16s[4]', Unknown => 1 },
+    0x9f => { Name => 'ColorTempUnknown8', Unknown => 1 },
+    0xa0 => { Name => 'WB_RGGBLevelsUnknown9',  Format => 'int16s[4]', Unknown => 1 },
+    0xa4 => { Name => 'ColorTempUnknown9', Unknown => 1 },
+    0xa5 => { Name => 'WB_RGGBLevelsUnknown10',  Format => 'int16s[4]', Unknown => 1 },
+    0xa9 => { Name => 'ColorTempUnknown10', Unknown => 1 },
+    0xaa => { Name => 'WB_RGGBLevelsUnknown11',  Format => 'int16s[4]', Unknown => 1 },
+    0xae => { Name => 'ColorTempUnknown11', Unknown => 1 },
+    0xaf => { Name => 'WB_RGGBLevelsUnknown11',  Format => 'int16s[4]', Unknown => 1 },
+    0xb3 => { Name => 'ColorTempUnknown11', Unknown => 1 },
+    0xb4 => { Name => 'WB_RGGBLevelsUnknown12',  Format => 'int16s[4]', Unknown => 1 },
+    0xb8 => { Name => 'ColorTempUnknown12', Unknown => 1 },
+    0xb9 => { Name => 'WB_RGGBLevelsUnknown13',  Format => 'int16s[4]', Unknown => 1 },
+    0xbd => { Name => 'ColorTempUnknown13', Unknown => 1 },
+    0xbe => { Name => 'WB_RGGBLevelsUnknown14',  Format => 'int16s[4]', Unknown => 1 },
+    0xc2 => { Name => 'ColorTempUnknown14', Unknown => 1 },
+    0xc3 => { Name => 'WB_RGGBLevelsUnknown15',  Format => 'int16s[4]', Unknown => 1 },
+    0xc7 => { Name => 'ColorTempUnknown15', Unknown => 1 },
+    0xc8 => { Name => 'WB_RGGBLevelsUnknown16',  Format => 'int16s[4]', Unknown => 1 },
+    0xcc => { Name => 'ColorTempUnknown16', Unknown => 1 },
+    0xcd => { Name => 'WB_RGGBLevelsDaylight',   Format => 'int16s[4]' },
+    0xd1 => 'ColorTempDaylight',
+    0xd2 => { Name => 'WB_RGGBLevelsShade',      Format => 'int16s[4]' },
+    0xd6 => 'ColorTempShade',
+    0xd7 => { Name => 'WB_RGGBLevelsCloudy',     Format => 'int16s[4]' },
+    0xdb => 'ColorTempCloudy',
+    0xdc => { Name => 'WB_RGGBLevelsTungsten',   Format => 'int16s[4]' },
+    0xe0 => 'ColorTempTungsten',
+    0xe1 => { Name => 'WB_RGGBLevelsFluorescent',Format => 'int16s[4]' },
+    0xe5 => 'ColorTempFluorescent',
+    0xe6 => { Name => 'WB_RGGBLevelsKelvin',     Format => 'int16s[4]' },
+    0xea => 'ColorTempKelvin',
+    0xeb => { Name => 'WB_RGGBLevelsFlash',      Format => 'int16s[4]' },
+    0xef => 'ColorTempFlash',
+    0xf0 => { Name => 'WB_RGGBLevelsUnknown17',  Format => 'int16s[4]', Unknown => 1 },
+    0xf4 => { Name => 'ColorTempUnknown17', Unknown => 1 },
+    0xf5 => { Name => 'WB_RGGBLevelsUnknown18',  Format => 'int16s[4]', Unknown => 1 },
+    0xf9 => { Name => 'ColorTempUnknown18', Unknown => 1 },
+    0xfa => { Name => 'WB_RGGBLevelsUnknown19',  Format => 'int16s[4]', Unknown => 1 },
+    0xfe => { Name => 'ColorTempUnknown19', Unknown => 1 },
+    0xff => { Name => 'WB_RGGBLevelsUnknown20',  Format => 'int16s[4]', Unknown => 1 },
+    0x103 => { Name => 'ColorTempUnknown20', Unknown => 1 },
+    0x104 => { Name => 'WB_RGGBLevelsUnknown21',  Format => 'int16s[4]', Unknown => 1 },
+    0x108 => { Name => 'ColorTempUnknown21', Unknown => 1 },
+    0x109 => { Name => 'WB_RGGBLevelsUnknown22',  Format => 'int16s[4]', Unknown => 1 },
+    0x10d => { Name => 'ColorTempUnknown22', Unknown => 1 },
+    0x10e => { Name => 'WB_RGGBLevelsUnknown23',  Format => 'int16s[4]', Unknown => 1 },
+    0x112 => { Name => 'ColorTempUnknown23', Unknown => 1 },
+    0x113 => { Name => 'WB_RGGBLevelsUnknown24',  Format => 'int16s[4]', Unknown => 1 },
+    0x117 => { Name => 'ColorTempUnknown24', Unknown => 1 },
+    0x118 => { Name => 'WB_RGGBLevelsUnknown25',  Format => 'int16s[4]', Unknown => 1 },
+    0x11c => { Name => 'ColorTempUnknown25', Unknown => 1 },
+    0x11d => { Name => 'WB_RGGBLevelsUnknown26',  Format => 'int16s[4]', Unknown => 1 },
+    0x121 => { Name => 'ColorTempUnknown26', Unknown => 1 },
+    0x122 => { Name => 'WB_RGGBLevelsUnknown27',  Format => 'int16s[4]', Unknown => 1 },
+    0x126 => { Name => 'ColorTempUnknown27', Unknown => 1 },
+    0x12c => {
+        Name => 'ColorCalib',
+        Format => 'undef[120]',
+        Unknown => 1,
+        SubDirectory => { TagTable => 'Image::ExifTool::Canon::ColorCalib' }
+    },
+    0x16b => {
+        Name => 'PerChannelBlackLevel',
+        Format => 'int16u[4]',
+    },
+    # 0x27c - PerChannelBlackLevel again
+    0x280 => {
+        Name => 'NormalWhiteLevel',
+        Format => 'int16u',
+        RawConv => '$val || undef',
+    },
+    0x281 => {
+        Name => 'SpecularWhiteLevel',
+        Format => 'int16u',
+    },
+    0x282 => {
+        Name => 'LinearityUpperMargin',
+        Format => 'int16u',
+    },
+);
+
 # Unknown color data (MakerNotes tag 0x4001)
 %Image::ExifTool::Canon::ColorDataUnknown = (
     PROCESS_PROC => \&Image::ExifTool::ProcessBinaryData,

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

@@ -1290,9 +1290,19 @@ my %convPFn = ( PrintConv => \&ConvertPfn, PrintConvInv => \&ConvertPfnInv );
         },
     },
     0x0106 => [{
+        Name => 'AEBShotCount',
+        Condition => '$$self{Model} =~ /\b90D\b/',
+        Notes => 'EOS 90D', # (and who knows what others?)
+        PrintConv => {
+            2 => '2 shots',
+            3 => '3 shots',
+            5 => '5 shots',
+            7 => '7 shots',
+        },
+    },{
         Name => 'AEBShotCount',
         Condition => '$count == 1',
-        Notes => 'one value for some models...',
+        Notes => 'other models storing a single value',
         PrintConv => {
             0 => '3 shots',
             1 => '2 shots',
@@ -1302,7 +1312,7 @@ my %convPFn = ( PrintConv => \&ConvertPfn, PrintConvInv => \&ConvertPfnInv );
     },{
         Name => 'AEBShotCount',
         Count => 2,
-        Notes => 'two values for others',
+        Notes => 'models storing two values',
         PrintConv => {
             '3 0' => '3 shots',
             '2 1' => '2 shots',