exiftool_vendored 13.38.0 → 13.41.0

data/bin/exiftool

@@ -11,7 +11,7 @@ use strict;
 use warnings;
 require 5.004;
 
-my $version = '13.38';
+my $version = '13.41';
 
 $^W = 1;    # enable global warnings
 
@@ -97,6 +97,7 @@ END {
 # declare all static file-scope variables
 my @commonArgs;     # arguments common to all commands
 my @condition;      # conditional processing of files
+my @csvExclude;     # list of tags excluded from CSV import
 my @csvFiles;       # list of files when reading with CSV option (in ExifTool Charset)
 my @csvTags;        # order of tags for first file with CSV option (lower case)
 my @delFiles;       # list of files to delete
@@ -441,6 +442,7 @@ if ($stayOpen >= 2) {
 # (not done: @commonArgs, @moreArgs, $critical, $binaryStdout, $helped,
 #  $interrupted, $mt, $pause, $rtnValApp, $rtnValPrev, $stayOpen, $stayOpenBuff, $stayOpenFile)
 undef @condition;
+undef @csvExclude;
 undef @csvFiles;
 undef @csvTags;
 undef @delFiles;
@@ -578,6 +580,7 @@ my $escapeXML;      # flag to escape printed values for xml
 my $setTagsFile;    # filename for last TagsFromFile option
 my $sortOpt;        # sort option is used
 my $srcStdin;       # one of the source files is STDIN
+my $tagsFrom = '';  # tags on command line come from 'csv' or 'file'
 my $useMWG;         # flag set if we are using any MWG tag
 
 my ($argsLeft, @nextPass, $badCmd);
@@ -812,6 +815,7 @@ for (;;) {
         }
         # create necessary lists, etc for this new -tagsFromFile file
         AddSetTagsFile($setTagsFile, { Replace => ($1 and lc($1) eq 'add') ? 0 : 1 } );
+        $tagsFrom = 'file';
         next;
     }
     if ($a eq '@') {
@@ -927,6 +931,7 @@ for (;;) {
             if ($csvFile) {
                 push @newValues, { SaveCount => ++$saveCount }; # marker to save new values now
                 $csvSaveCount = $saveCount;
+                $tagsFrom = 'csv';
             }
             next;
         }
@@ -1117,6 +1122,7 @@ for (;;) {
                 push @nextPass, "-$_";
                 push @newValues, { SaveCount => ++$saveCount }; # marker to save new values now
                 $csvSaveCount = $saveCount;
+                $tagsFrom = 'csv';
                 next;
             }
             my $jsonFile = $2;
@@ -1365,10 +1371,12 @@ for (;;) {
         my $tag = shift;
         defined $tag or Error("Expecting tag name for -x option\n"), $badCmd=1, next;
         $tag =~ s/\ball\b/\*/ig;    # replace 'all' with '*' in tag names
-        if ($setTagsFile) {
-            push @{$setTags{$setTagsFile}}, "-$tag";
-        } else {
+        if (not $tagsFrom) {
             push @exclude, $tag;
+        } elsif ($tagsFrom eq 'csv') {
+            push @csvExclude, $tag;
+        } else {
+            push @{$setTags{$setTagsFile}}, "-$tag";
         }
         next;
     }
@@ -1411,9 +1419,15 @@ for (;;) {
         }
     } else {
         # assume '-tagsFromFile @' if tags are being redirected
-        # and -tagsFromFile hasn't already been specified
-        AddSetTagsFile($setTagsFile = '@') if not $setTagsFile and /(<|>)/;
-        if ($setTagsFile) {
+        # and not from CSV and -tagsFromFile hasn't already been specified
+        if (not $setTagsFile and $tagsFrom ne 'csv' and /(<|>)/) {
+            AddSetTagsFile($setTagsFile = '@');
+            $tagsFrom = 'file';
+        }
+        if ($tagsFrom eq 'csv') {
+            my $lst = s/^-// ? \@csvExclude : \@tags;
+            push @$lst, $_;
+        } elsif ($setTagsFile) {
             push @{$setTags{$setTagsFile}}, $_;
             if ($1 eq '>') {
                 $useMWG = 1 if /^(.*>\s*)?([-_0-9A-Z]+:)*1?mwg:/si;
@@ -1794,11 +1808,9 @@ if (@newValues) {
         $wrn and Warning($mt, $wrn);
     }
     # exclude specified tags
-    unless ($csv) {
-        foreach (@exclude) {
-            $mt->SetNewValue($_, undef, Replace => 2);
-            $needSave = 1;
-        }
+    foreach (@exclude) {
+        $mt->SetNewValue($_, undef, Replace => 2);
+        $needSave = 1;
     }
     unless ($isWriting or $outOpt or @tags) {
         Error "Nothing to do.\n";
@@ -1935,7 +1947,7 @@ if (@fileOrder) {
 # set file count for progress message
 $progressMax = scalar @files if defined $progress;
 
-# store duplicate database information under absolute path
+# store duplicate database information under absolute path and with standardized case
 my @dbKeys = keys %database;
 if (@dbKeys) {
     if (eval { require Cwd }) {
@@ -1944,6 +1956,7 @@ if (@dbKeys) {
         foreach (@dbKeys) {
             my $db = $database{$_};
             tr/\\/\// and $database{$_} = $db;  # allow for backslashes in SourceFile
+            $database{lc} = $db unless $database{lc};   # duplicate entry with lower case
             # (punt on using ConvertFileName here, so $absPath may be a mix of encodings)
             my $absPath = AbsPath($_);
             if (defined $absPath) {
@@ -1951,6 +1964,7 @@ if (@dbKeys) {
                 if ($verbose and $verbose > 1) {
                     print $vout "Imported entry for '${_}' (full path: '${absPath}')\n";
                 }
+                $database{lc $absPath} = $db unless $database{lc $absPath};
             } elsif ($verbose and $verbose > 1) {
                 print $vout "Imported entry for '${_}' (no full path)\n";
             }
@@ -3248,7 +3262,7 @@ sub SetImageInfo($$$)
                 next;
             } elsif (ref $dyFile eq 'SCALAR') {
                 # set new values from CSV or JSON database
-                my ($f, $found, $csvTag, $tryTag, $tg);
+                my ($f, $found, $csvTag, $tg, $csvExifTool);
                 undef $evalWarning;
                 local $SIG{'__WARN__'} = sub { $evalWarning = $_[0] };
                 # force UTF-8 if the database was JSON
@@ -3259,48 +3273,68 @@ sub SetImageInfo($$$)
                     my $csvInfo = $database{$f};
                     unless ($csvInfo) {
                         next if $f eq '*';
-                        # check absolute path
+                        # check absolute path and case-insensitive name
                         # (punt on using ConvertFileName here, so $absPath may be a mix of encodings)
                         my $absPath = AbsPath($f);
-                        next unless defined $absPath and $csvInfo = $database{$absPath};
+                        if (defined $absPath and $database{$absPath}) {
+                            $csvInfo = $database{$absPath};
+                        } elsif ($database{lc $f}) {
+                            $csvInfo = $database{lc $f};
+                        } elsif (defined $absPath and $database{lc $absPath}) {
+                            $csvInfo = $database{lc $absPath};
+                        } else {
+                            next;
+                        }
                     }
                     $found = 1;
                     if ($verbose) {
                         print $vout "Setting new values from $csv database\n";
                         print $vout 'Including tags: ',join(' ',@tags),"\n" if @tags;
-                        print $vout 'Excluding tags: ',join(' ',@exclude),"\n" if @exclude;
+                        print $vout 'Excluding tags: ',join(' ',@csvExclude),"\n" if @csvExclude;
                     }
-                    my @tryTags = (@exclude, @tags); # (exclude first because it takes priority)
-                    foreach (@tryTags) {
+                    if (@tags) {
+                        # prepare a dummy ExifTool object to hold appropriate tags from the database
+                        $csvExifTool = Image::ExifTool->new unless $csvExifTool;
+                        foreach $csvTag (OrderedKeys($csvInfo)) {
+                            next if $csvTag =~ /^([-_0-9A-Z]+:)*(SourceFile|Directory|FileName)$/i;
+                            my @grps = split /:/, $csvTag;
+                            my $name = pop @grps;
+                            unshift @grps, 'Unknown' while @grps < 2;
+                            $csvExifTool->FoundTag($name, $$csvInfo{$csvTag}, @grps);
+                        }
+                        next;
+                    }                    
+                    my @exclTags = @csvExclude;
+                    foreach (@exclTags) {
                         tr/-0-9a-zA-Z_:#?*//dc;     # remove illegal characters
                         s/(^|:)(all:)+/$1/ig;       # remove 'all' group names
                         s/(^|:)all(#?)$/$1*$2/i;    # convert 'all' tag name to '*'
                         tr/?/./;  s/\*/.*/g;        # convert wildcards for regex
                     }
+                    # run through tags in database order
                     foreach $csvTag (OrderedKeys($csvInfo)) {
                         # don't write SourceFile, Directory or FileName
                         next if $csvTag =~ /^([-_0-9A-Z]+:)*(SourceFile|Directory|FileName)$/i;
-                        if (@tryTags) {
-                            my ($i, $tryGrp, $matched);
-TryMatch:                   for ($i=0; $i<@tryTags; ++$i) {
-                                $tryTag = $tryTags[$i];
-                                if ($tryTag =~ /:/) {
+                        if (@exclTags) {
+                            my ($exclTag, $exclGrp, $excluded);
+ExclMatch:                  foreach $exclTag (@exclTags) {
+                                if ($exclTag =~ /:/) {
                                     next unless $csvTag =~ /:/;     # db entry must also specify group
                                     my @csvGrps = split /:/, $csvTag;
-                                    my @tryGrps = split /:/, $tryTag;
-                                    my $tryName = pop @tryGrps;
-                                    next unless pop(@csvGrps) =~ /^$tryName$/i; # tag name must match
-                                    foreach $tryGrp (@tryGrps) {
+                                    my @exclGrps = split /:/, $exclTag;
+                                    my $exclName = pop @exclGrps;
+                                    next unless pop(@csvGrps) =~ /^$exclName$/i; # tag name must match
+                                    foreach $exclGrp (@exclGrps) {
                                         # each specified group name must match db entry
-                                        next TryMatch unless grep /^$tryGrp$/i, @csvGrps;
+                                        next ExclMatch unless grep /^$exclGrp$/i, @csvGrps;
                                     }
-                                    $matched = 1;
+                                    $excluded = 1;
                                     last;
                                 }
                                 # no group specified, so match by tag name only
-                                $csvTag =~ /^([-_0-9A-Z]+:)*$tryTag$/i and $matched = 1, last;
+                                $csvTag =~ /^([-_0-9A-Z]+:)*$exclTag$/i and $excluded = 1, last;
                             }
-                            next if $matched ? $i < @exclude : @tags;
+                            next if $excluded;
                         }
                         my ($rtn, $wrn) = $et->SetNewValue($csvTag, $$csvInfo{$csvTag},
                                           Protected => 1, AddValue => $csvAdd,
@@ -3308,6 +3342,11 @@ TryMatch:                   for ($i=0; $i<@tryTags; ++$i) {
                         $wrn and Warn "$wrn\n" if $verbose;
                     }
                 }
+                # set specified tags now
+                if ($csvExifTool) {
+                    my @excl = map "-$_", @csvExclude;  # add back leading dashes
+                    $et->SetNewValuesFromFile($csvExifTool, @tags, @excl);
+                }
                 $et->Options(Charset => $old) if $csv eq 'JSON';
                 unless ($found) {
                     Warn("No SourceFile '${file}' in imported $csv database\n");
@@ -5079,51 +5118,52 @@ supported by ExifTool (r = read, w = write, c = create):
 
   File Types
   ------------+-------------+-------------+-------------+------------
-  360   r/w   | DPX   r     | J2C   r     | O     r     | RIFF  r
-  3FR   r     | DR4   r/w/c | JNG   r/w   | ODP   r     | RSRC  r
-  3G2   r/w   | DSF   r     | JP2   r/w   | ODS   r     | RTF   r
-  3GP   r/w   | DSS   r     | JPEG  r/w   | ODT   r     | RW2   r/w
-  7Z    r     | DV    r     | JSON  r     | OFR   r     | RWL   r/w
-  A     r     | DVB   r/w   | JXL   r/w   | OGG   r     | RWZ   r
-  AA    r     | DVR-MS r    | K25   r     | OGV   r     | RM    r
-  AAC   r     | DYLIB r     | KDC   r     | ONP   r     | SEQ   r
-  AAE   r     | EIP   r     | KEY   r     | OPUS  r     | SKETCH r
-  AAX   r/w   | EPS   r/w   | LA    r     | ORF   r/w   | SO    r
-  ACR   r     | EPUB  r     | LFP   r     | ORI   r/w   | SR2   r/w
-  AFM   r     | ERF   r/w   | LIF   r     | OTF   r     | SRF   r
-  AI    r/w   | EXE   r     | LNK   r     | PAC   r     | SRW   r/w
-  AIFF  r     | EXIF  r/w/c | LRV   r/w   | PAGES r     | SVG   r
-  APE   r     | EXR   r     | M2TS  r     | PBM   r/w   | SWF   r
-  ARQ   r/w   | EXV   r/w/c | M4A/V r/w   | PCAP  r     | THM   r/w
-  ARW   r/w   | F4A/V r/w   | MACOS r     | PCAPNG r    | TIFF  r/w
-  ASF   r     | FFF   r/w   | MAX   r     | PCD   r     | TNEF  r
-  AVI   r     | FITS  r     | MEF   r/w   | PCX   r     | TORRENT r
-  AVIF  r/w   | FLA   r     | MIE   r/w/c | PDB   r     | TTC   r
-  AZW   r     | FLAC  r     | MIFF  r     | PDF   r/w   | TTF   r
-  BMP   r     | FLIF  r/w   | MKA   r     | PEF   r/w   | TXT   r
-  BPG   r     | FLV   r     | MKS   r     | PFA   r     | VCF   r
-  BTF   r     | FPF   r     | MKV   r     | PFB   r     | VNT   r
-  C2PA  r     | FPX   r     | MNG   r/w   | PFM   r     | VRD   r/w/c
-  CHM   r     | GIF   r/w   | MOBI  r     | PGF   r     | VSD   r
-  COS   r     | GLV   r/w   | MODD  r     | PGM   r/w   | WAV   r
-  CR2   r/w   | GPR   r/w   | MOI   r     | PLIST r     | WDP   r/w
-  CR3   r/w   | GZ    r     | MOS   r/w   | PICT  r     | WEBP  r/w
-  CRM   r/w   | HDP   r/w   | MOV   r/w   | PMP   r     | WEBM  r
-  CRW   r/w   | HDR   r     | MP3   r     | PNG   r/w   | WMA   r
-  CS1   r/w   | HEIC  r/w   | MP4   r/w   | PPM   r/w   | WMV   r
-  CSV   r     | HEIF  r/w   | MPC   r     | PPT   r     | WPG   r
-  CUR   r     | HTML  r     | MPG   r     | PPTX  r     | WTV   r
-  CZI   r     | ICC   r/w/c | MPO   r/w   | PS    r/w   | WV    r
-  DCM   r     | ICO   r     | MQV   r/w   | PSB   r/w   | X3F   r/w
-  DCP   r/w   | ICS   r     | MRC   r     | PSD   r/w   | XCF   r
-  DCR   r     | IDML  r     | MRW   r/w   | PSP   r     | XISF  r
-  DFONT r     | IIQ   r/w   | MXF   r     | QTIF  r/w   | XLS   r
-  DIVX  r     | IND   r/w   | NEF   r/w   | R3D   r     | XLSX  r
-  DJVU  r     | INSP  r/w   | NKA   r     | RA    r     | XMP   r/w/c
-  DLL   r     | INSV  r     | NKSC  r/w   | RAF   r/w   | ZIP   r
-  DNG   r/w   | INX   r     | NRW   r/w   | RAM   r     |
-  DOC   r     | ISO   r     | NUMBERS r   | RAR   r     |
-  DOCX  r     | ITC   r     | NXD   r     | RAW   r/w   |
+  360   r/w   | DR4   r/w/c | JP2   r/w   | ODT   r     | RWL   r/w
+  3FR   r     | DSF   r     | JPEG  r/w   | OFR   r     | RWZ   r
+  3G2   r/w   | DSS   r     | JSON  r     | OGG   r     | RM    r
+  3GP   r/w   | DV    r     | JXL   r/w   | OGV   r     | SEQ   r
+  7Z    r     | DVB   r/w   | K25   r     | ONP   r     | SKETCH r
+  A     r     | DVR-MS r    | KDC   r     | OPUS  r     | SO    r
+  AA    r     | DYLIB r     | KEY   r     | ORF   r/w   | SR2   r/w
+  AAC   r     | EIP   r     | LA    r     | ORI   r/w   | SRF   r
+  AAE   r     | EPS   r/w   | LFP   r     | OTF   r     | SRW   r/w
+  AAX   r/w   | EPUB  r     | LIF   r     | PAC   r     | SVG   r
+  ACR   r     | ERF   r/w   | LNK   r     | PAGES r     | SWF   r
+  AFM   r     | EXE   r     | LRV   r/w   | PBM   r/w   | THM   r/w
+  AI    r/w   | EXIF  r/w/c | M2TS  r     | PCAP  r     | TIFF  r/w
+  AIFF  r     | EXR   r     | M4A/V r/w   | PCAPNG r    | TNEF  r
+  APE   r     | EXV   r/w/c | MACOS r     | PCD   r     | TORRENT r
+  ARQ   r/w   | F4A/V r/w   | MAX   r     | PCX   r     | TTC   r
+  ARW   r/w   | FFF   r/w   | MEF   r/w   | PDB   r     | TTF   r
+  ASF   r     | FITS  r     | MIE   r/w/c | PDF   r/w   | TXT   r
+  AVI   r     | FLA   r     | MIFF  r     | PEF   r/w   | URL   r
+  AVIF  r/w   | FLAC  r     | MKA   r     | PFA   r     | VCF   r
+  AZW   r     | FLIF  r/w   | MKS   r     | PFB   r     | VNT   r
+  BMP   r     | FLV   r     | MKV   r     | PFM   r     | VRD   r/w/c
+  BPG   r     | FPF   r     | MNG   r/w   | PGF   r     | VSD   r
+  BTF   r     | FPX   r     | MOBI  r     | PGM   r/w   | VSDX  r
+  C2PA  r     | GIF   r/w   | MODD  r     | PLIST r     | WAV   r
+  CHM   r     | GLV   r/w   | MOI   r     | PICT  r     | WDP   r/w
+  COS   r     | GPR   r/w   | MOS   r/w   | PMP   r     | WEBP  r/w
+  CR2   r/w   | GZ    r     | MOV   r/w   | PNG   r/w   | WEBM  r
+  CR3   r/w   | HDP   r/w   | MP3   r     | PPM   r/w   | WMA   r
+  CRM   r/w   | HDR   r     | MP4   r/w   | PPT   r     | WMV   r
+  CRW   r/w   | HEIC  r/w   | MPC   r     | PPTX  r     | WOFF  r
+  CS1   r/w   | HEIF  r/w   | MPG   r     | PS    r/w   | WOFF2 r
+  CSV   r     | HTML  r     | MPO   r/w   | PSB   r/w   | WPG   r
+  CUR   r     | ICC   r/w/c | MQV   r/w   | PSD   r/w   | WTV   r
+  CZI   r     | ICO   r     | MRC   r     | PSP   r     | WV    r
+  DCM   r     | ICS   r     | MRW   r/w   | QTIF  r/w   | X3F   r/w
+  DCP   r/w   | IDML  r     | MXF   r     | R3D   r     | XCF   r
+  DCR   r     | IIQ   r/w   | NEF   r/w   | RA    r     | XISF  r
+  DFONT r     | IND   r/w   | NKA   r     | RAF   r/w   | XLS   r
+  DIVX  r     | INSP  r/w   | NKSC  r/w   | RAM   r     | XLSX  r
+  DJVU  r     | INSV  r     | NRW   r/w   | RAR   r     | XMP   r/w/c
+  DLL   r     | INX   r     | NUMBERS r   | RAW   r/w   | ZIP   r
+  DNG   r/w   | ISO   r     | NXD   r     | RIFF  r     |
+  DOC   r     | ITC   r     | O     r     | RSRC  r     |
+  DOCX  r     | J2C   r     | ODP   r     | RTF   r     |
+  DPX   r     | JNG   r/w   | ODS   r     | RW2   r/w   |
 
   Meta Information
   ----------------------+----------------------+---------------------
@@ -5747,10 +5787,13 @@ if this API option was used).  Multiple databases may be imported in a
 single command.
 
 Specific tags may be imported from the CSV database by adding B<->I<TAG>
-options to the command, or excluded with B<-->I<TAG>, with exclusions taking
-priority.  Group names and wildcards are allowed.  If no tags are specified,
-then all except FileName and Directory are used.  Tags are imported in the
-same order as the database entries.
+options to the command after B<-csv=>I<CSVFILE>, or excluded with
+B<-->I<TAG>, with exclusions taking priority.  Group names and wildcards are
+allowed, and tags from the CSV may be redirected and written to different
+tags in the target file with support for advanced-formatting expressions
+using the same syntax as the B<-tagsFromFile> feature.  If no tags are
+specified, then all tags except FileName, Directory and excluded tags are
+imported (in the same order as the database entries).
 
 When exporting a CSV file, the B<-g> or B<-G> option adds group names to the
 tag headings.  If the B<-a> option is used to allow duplicate tag names, the
@@ -5940,10 +5983,13 @@ compatible, and use B<-G> instead of B<-g>).  Additionally, tag names in the
 input JSON file may be suffixed with a C<#> to disable print conversion.
 
 Specific tags may be imported from the JSON database by adding B<->I<TAG>
-options to the command, or excluded with B<-->I<TAG>, with exclusions taking
-priority.  Group names and wildcards are allowed.  If no tags are specified,
-then all except FileName and Directory are used.  Tags are imported in the
-same order as the database entries.
+options to the command after B<-j=>I<JSONFILE>, or excluded with
+B<-->I<TAG>, with exclusions taking priority.  Group names and wildcards are
+allowed, and tags from JSON may be redirected and written to different tags
+in the target file with support for advanced-formatting expressions using
+the same syntax as the B<-tagsFromFile> feature.  If no tags are specified,
+then all tags except FileName, Directory and excluded tags are imported (in
+the same order as the database entries).
 
 Unlike CSV import, empty values are not ignored, and will cause an empty
 value to be written if supported by the specific metadata type.  Tags are
@@ -6084,7 +6130,7 @@ with this command:
 
 produces output like this:
 
-    -- Generated by ExifTool 13.38 --
+    -- Generated by ExifTool 13.41 --
     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
@@ -7337,7 +7383,7 @@ used in file names.)
 
 Note that function names are case sensitive.
 
-C<DateFmt>
+B<C<DateFmt>>
 
 Simplifies reformatting of individual date/time values.  This function acts
 on a standard EXIF-formatted date/time value in C<$_> and formats it
@@ -7348,7 +7394,7 @@ used.  For example:
 
     exiftool -p '${createdate#;DateFmt("%Y-%m-%d_%H%M%S")}' a.jpg
 
-C<ShiftTime>
+B<C<ShiftTime>>
 
 Shifts EXIF-formatted date/time string by a specified amount.  Start with a
 leading minus sign to shift backwards in time.  See
@@ -7357,7 +7403,7 @@ shift syntax.  For example, to shift a date/time value back by one year:
 
     exiftool -p '${createdate;ShiftTime("-1:0:0 0")}' a.jpg
 
-C<NoDups>
+B<C<NoDups>>
 
 Removes duplicate items from a list with a separator specified by the
 B<-sep> option.  This function is most useful when copying list-type tags. 
@@ -7382,7 +7428,7 @@ sources.  An equivalent to the above commands using this feature would be:
 
     exiftool -tagsfromfile @ -keywords -api nodups a.jpg
 
-C<SetTags>
+B<C<SetTags>>
 
 Used to set tags in extracted images.  With no arguments, copies all tags
 from the source file to the embedded image:

data/bin/lib/Image/ExifTool/Canon.pm

@@ -88,7 +88,7 @@ sub ProcessCTMD($$$);
 sub ProcessExifInfo($$$);
 sub SwapWords($);
 
-$VERSION = '4.97';
+$VERSION = '4.98';
 
 # Note: Removed 'USM' from 'L' lenses since it is redundant - PH
 # (or is it?  Ref 32 shows 5 non-USM L-type lenses)
@@ -562,6 +562,7 @@ $VERSION = '4.97';
     4160 => 'Canon EF-S 35mm f/2.8 Macro IS STM', #42
     4208 => 'Sigma 56mm f/1.4 DC DN | C or other Sigma Lens', #forum10603
     4208.1 => 'Sigma 30mm F1.4 DC DN | C', #github#83 (016)
+    4976 => 'Sigma 16-300mm F3.5-6.7 DC OS | C (025)', #50
     6512 => 'Sigma 12mm F1.4 DC | C', #github#352 (025)
     # (Nano USM lenses - 0x90xx)
     36910 => 'Canon EF 70-300mm f/4-5.6 IS II USM', #42
@@ -1995,12 +1996,12 @@ my %offOn = ( 0 => 'Off', 1 => 'On' );
             SubDirectory => { TagTable => 'Image::ExifTool::Canon::ColorData10' },
         },
         {   # (int16u[3973]) - R3 ref IB
-            Condition => '$count == 3973 or $count == 3778',
+            Condition => '($count == 3973 or $count == 3778) and $$valPt !~ /^\x41\0/',
             Name => 'ColorData11',
             SubDirectory => { TagTable => 'Image::ExifTool::Canon::ColorData11' },
         },
-        {   # (int16u[4528]) - R1/R5mkII ref forum16406
-            Condition => '$count == 4528',
+        {   # (int16u[4528]) - R1/R5mkII (4528) ref forum16406, R50V (3778) ref PH
+            Condition => '$count == 4528 or $count == 3778',
             Name => 'ColorData12',
             SubDirectory => { TagTable => 'Image::ExifTool::Canon::ColorData12' },
         },
@@ -8321,8 +8322,8 @@ my %ciMaxFocal = (
         RawConv => '$$self{ColorDataVersion} = $val',
         PrintConv => {
             16 => '16 (M50)',
-            17 => '17 (EOS R)',     # (and PowerShot SX740HS)
-            18 => '18 (EOS RP/250D)',    # (and PowerShot SX70HS)
+            17 => '17 (R)',         # (and PowerShot SX740HS)
+            18 => '18 (RP/250D)',   # (and PowerShot SX70HS)
             19 => '19 (90D/850D/M6mkII/M200)',# (and PowerShot G7XmkIII)
         },
     },
@@ -8553,10 +8554,10 @@ my %ciMaxFocal = (
     },
 );
 
-# Color data (MakerNotes tag 0x4001, count=3973, ref IB)
+# Color data (MakerNotes tag 0x4001, count=3973/3778, ref IB)
 %Image::ExifTool::Canon::ColorData11 = (
     %binaryDataAttrs,
-    NOTES => 'These tags are used by the EOS R3, R7 and R6mkII',
+    NOTES => 'These tags are used by the EOS R3, R7, R50 and R6mkII',
     FORMAT => 'int16s',
     FIRST_ENTRY => 0,
     GROUPS => { 0 => 'MakerNotes', 2 => 'Camera' },
@@ -8568,7 +8569,7 @@ my %ciMaxFocal = (
         RawConv => '$$self{ColorDataVersion} = $val',
         PrintConv => {
             34 => '34 (R3)', #IB
-            48 => '48 (R7, R10, R6 Mark II)', #IB
+            48 => '48 (R7/R10/R50/R6mkII)', #IB
         },
     },
     0x69 => { Name => 'WB_RGGBLevelsAsShot',     Format => 'int16s[4]' },
@@ -8673,10 +8674,10 @@ my %ciMaxFocal = (
     },
 );
 
-# Color data (MakerNotes tag 0x4001, count=4528, ref PH)
+# Color data (MakerNotes tag 0x4001, count=4528/3778, ref PH)
 %Image::ExifTool::Canon::ColorData12 = (
     %binaryDataAttrs,
-    NOTES => 'These tags are used by the EOS R1 and R5mkII',
+    NOTES => 'These tags are used by the EOS R1, R5mkII and R50V',
     FORMAT => 'int16s',
     FIRST_ENTRY => 0,
     GROUPS => { 0 => 'MakerNotes', 2 => 'Camera' },
@@ -8687,7 +8688,8 @@ my %ciMaxFocal = (
         DataMember => 'ColorDataVersion',
         RawConv => '$$self{ColorDataVersion} = $val',
         PrintConv => {
-            64 => '64 (R1, R5 Mark II)',
+            64 => '64 (R1/R5mkII)',
+            65 => '65 (R50V)',
         },
     },
     0x69 => { Name => 'WB_RGGBLevelsAsShot',    Format => 'int16s[4]' }, # (NC)
@@ -8778,6 +8780,7 @@ my %ciMaxFocal = (
         Name => 'PerChannelBlackLevel',
         Format => 'int16u[4]',
     },
+    # 0x290 - PerChannelBlackLevel again
     0x294 => {
         Name => 'NormalWhiteLevel',
         Format => 'int16u',