exiftool_vendored 13.40.0 → 13.42.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9dfd10c8fad46a346537837a7eb4d95f6abf124bb6b3a9ca65479e447b6f4bac
-  data.tar.gz: 9ac3a94f1fa80f10cab26c6c595499b32431e39e1fa31d33255a45454b2c1465
+  metadata.gz: 769a367333375cb7b0796e2b334c49c8eaed8da6ca289b2de271f9a1a5499b6f
+  data.tar.gz: 7e7044a2d8044fe48f633c11b2812ed752e5091c5d19db7153fc415cec06bb95
 SHA512:
-  metadata.gz: 064efdbb744ee1a1e25c1df084286c86ecf791c85479e95d73c10b5aad589b2355068a19e1757ebc88bd26349af0550750b1c48cc0e945e833ac392583642559
-  data.tar.gz: 6e5d5cec5577836228ab18975639d2b7e2d27cd1a161bae004ebdb472ec7f1e669155589e2e0fb83873bf7a1bc3c592df6196e98afb7cc872b676b70564c3fea
+  metadata.gz: 18a51166538f3a2de6aaf41f8d896b30ff5baba653051eb77f16f91b35502c52e7d7c251081a3ee95c8f7efad8c5dcc1731afc284dfc67b1a6f79b879d1b049b
+  data.tar.gz: cb7a7f441bd277e0b96ee7caecc3d65dc424eb035fdc6fc6d1a7c9c128d23040ee5d512fc66d0245d3857a9b5c14d38a21e95aa9a55dbd72c426e8711d67b8ab

data/bin/Changes

@@ -7,13 +7,47 @@ RSS feed: https://exiftool.org/rss.xml
 Note: The most recent production release is Version 13.36. (Other versions are
 considered development releases, and are not uploaded to MetaCPAN.)
 
+Nov. 17, 2025 - Version 13.42
+
+  - Added warning if tag arguments come before -csv= or -json= in a command
+  - Added a new CanonModelID and RFLensType (thanks Norbert Wasser)
+  - Added ability to read XML as a block from Sony MP4 videos
+  - Added "EOS" to the R5 Mark II CanonModelID string
+  - Decode ReEditData in Samsung trailer
+  - Decode a couple more Sony rtmd tags from MP4 videos
+  - Tolerate some types of trailer corruption as caused by Samsung Gallery
+  - Restrict decoding of MetaImageSize to HEIC files only
+  - Fixed issue writing Keys tags to Sony PMW-EX1R videos
+  - Fixed behaviour of CSV/JSON import when specifying tags to import into an
+    existing list, or when importing ValueConv values (ie. "TAG#"), or when
+    specifying a group name of "All"
+
+Nov. 5, 2025 - Version 13.41
+
+  - Added a new Canon LensType
+  - Added Extra MakerNoteByteOrder tag
+  - Added byte-order indication to the -v3 output for EXIF and BinaryData
+    directories
+  - Added a new Panasonic/Olympus LensType (github #363)
+  - Added a new ProfileCMMType value (thanks Herb)
+  - Extract EnvironmentTarget from LNK files (github #362)
+  - Extract HighlightMarkers from DJI videos
+  - Decode another Red tag
+  - Recognize LRF file extension
+  - Updated CanonColorData decoding for the R50V
+  - Enhanced -csv= and -json= database import options to support full
+    redirection and advanced formatting expressions
+  - Require tags to be specified after the corresponding -csv= or -json= option
+    when importing specific tags from a database
+  - Fixed problem reading R3D images from the Red Komodo
+
 Oct. 24, 2025 - Version 13.40
 
   - Added read support for WOFF and WOFF2 font files (github #358)
   - Added read support for Windows .URL files
   - Added new XMP-iptcExt generative AI tags (thanks IPTC)
   - Added config_files/local_time.config to the full distribution
-  - Enhanced CSV import allow SourceFile entries with a different case
+  - Enhanced CSV import to allow SourceFile entries with a different case
 
 Oct. 15, 2025 - Version 13.39
 

data/bin/META.json

@@ -50,6 +50,6 @@
       }
    },
    "release_status" : "stable",
-   "version" : "13.40",
+   "version" : "13.42",
    "x_serialization_backend" : "JSON::PP version 4.06"
 }

data/bin/META.yml

@@ -31,5 +31,5 @@ recommends:
   Time::HiRes: '0'
 requires:
   perl: '5.004'
-version: '13.40'
+version: '13.42'
 x_serialization_backend: 'CPAN::Meta::YAML version 0.018'

data/bin/README

@@ -111,8 +111,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-13.40.tar.gz | tar -xf -
-  cd Image-ExifTool-13.40
+  gzip -dc Image-ExifTool-13.42.tar.gz | tar -xf -
+  cd Image-ExifTool-13.42
   ./exiftool t/images/ExifTool.jpg
 
 Note:  These commands extract meta information from one of the test images. 

data/bin/exiftool

@@ -11,7 +11,7 @@ use strict;
 use warnings;
 require 5.004;
 
-my $version = '13.40';
+my $version = '13.42';
 
 $^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
@@ -151,9 +152,9 @@ my $countNewDir;    # count of directories created
 my $countSameWr;    # count files written OK but not changed
 my $critical;       # flag for critical operations (disable CTRL-C)
 my $csv;            # flag for CSV option (set to "CSV", or maybe "JSON" when writing)
-my $csvAdd;         # flag to add CSV information to existing lists
 my $csvDelim;       # delimiter for CSV files
-my $csvSaveCount;   # save counter for last CSV file loaded
+my $dbAdd;          # flag to add CSV/JSON information to existing lists
+my $dbSaveCount;    # save counter for last CSV/JSON file loaded
 my $deleteOrig;     # 0=restore original files, 1=delete originals, 2=delete w/o asking
 my $diff;           # file name for comparing differences
 my $disableOutput;  # flag to disable normal output
@@ -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;
@@ -483,7 +485,7 @@ undef $binSep;
 undef $binTerm;
 undef $comma;
 undef $csv;
-undef $csvAdd;
+undef $dbAdd;
 undef $deleteOrig;
 undef $diff;
 undef $disableOutput;
@@ -548,7 +550,7 @@ $countGoodWr = 0;
 $countNewDir = 0;
 $countSameWr = 0;
 $csvDelim = ',';
-$csvSaveCount = 0;
+$dbSaveCount = 0;
 $fileTrailer = '';
 $filterFlag = 0;
 $html = 0;
@@ -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 '@') {
@@ -919,35 +923,50 @@ for (;;) {
         next;
     }
     /^config$/i and Warn("Ignored -config option (not first on command line)\n"), shift, next;
-    if (/^csv(\+?=.*)?$/i) {
-        my $csvFile = $1;
+    if (/^(csv|j(son)?)(\+?=.*)?$/i) {
+        my $dbFile = $3;
+        my $dbType = lc($1) eq 'csv' ? 'CSV' : 'JSON';
+        unless ($dbFile) {
+            if ($dbType eq 'CSV') {
+                $csv = $dbType;
+            } else {
+                $json = 1;
+                $html = $xml = 0;
+                $mt->Options(Duplicates => 1);
+                require Image::ExifTool::XMP;   # for FixUTF8()
+            }
+            next;
+        }
         # must process on 2nd pass so -f and -charset options are available
         unless ($pass) {
+            @tags and Warn("Tag arguments should come after the -$1= option\n");
             push @nextPass, "-$_";
-            if ($csvFile) {
-                push @newValues, { SaveCount => ++$saveCount }; # marker to save new values now
-                $csvSaveCount = $saveCount;
-            }
+            push @newValues, { SaveCount => ++$saveCount }; # marker to save new values now
+            $dbSaveCount = $saveCount;
+            $tagsFrom = 'CSV';
             next;
         }
-        if ($csvFile) {
-            $csvFile =~ s/^(\+?=)//;
-            $csvAdd = 2 if $1 eq '+=';
-            $vout = \*STDERR if $srcStdin;
-            $verbose and print $vout "Reading CSV file $csvFile\n";
-            my $msg;
-            if ($mt->Open(\*CSVFILE, $csvFile)) {
-                binmode CSVFILE;
-                require Image::ExifTool::Import;
+        $dbFile =~ s/^(\+?=)//;
+        $dbAdd = 2 if $1 eq '+=';
+        $vout = \*STDERR if $srcStdin;
+        $verbose and print $vout "Reading $dbType file $dbFile\n";
+        my $msg;
+        if ($mt->Open(\*CSVFILE, $dbFile)) {
+            binmode CSVFILE;
+            require Image::ExifTool::Import;
+            if ($dbType eq 'CSV') {
                 $msg = Image::ExifTool::Import::ReadCSV(\*CSVFILE, \%database, $forcePrint, $csvDelim);
-                close(CSVFILE);
             } else {
-                $msg = "Error opening CSV file '${csvFile}'";
+                my $chset = $mt->Options('Charset');
+                $msg = Image::ExifTool::Import::ReadJSON(\*CSVFILE, \%database, $forcePrint, $chset);
             }
-            $msg and Warn("$msg\n");
-            $isWriting = 1;
+            close(CSVFILE);
+        } else {
+            $msg = "Error opening $dbType file '${dbFile}'";
         }
-        $csv = 'CSV';
+        $msg and Warn("$msg\n");
+        $isWriting = 1;
+        $csv = $dbType;
         next;
     }
     if (/^csvdelim$/i) {
@@ -1110,41 +1129,6 @@ for (;;) {
         push @condition, $cond;
         next;
     }
-    if (/^j(son)?(\+?=.*)?$/i) {
-        if ($2) {
-            # must process on 2nd pass because we need -f and -charset options
-            unless ($pass) {
-                push @nextPass, "-$_";
-                push @newValues, { SaveCount => ++$saveCount }; # marker to save new values now
-                $csvSaveCount = $saveCount;
-                next;
-            }
-            my $jsonFile = $2;
-            $jsonFile =~ s/^(\+?=)//;
-            $csvAdd = 2 if $1 eq '+=';
-            $vout = \*STDERR if $srcStdin;
-            $verbose and print $vout "Reading JSON file $jsonFile\n";
-            my $chset = $mt->Options('Charset');
-            my $msg;
-            if ($mt->Open(\*JSONFILE, $jsonFile)) {
-                binmode JSONFILE;
-                require Image::ExifTool::Import;
-                $msg = Image::ExifTool::Import::ReadJSON(\*JSONFILE, \%database, $forcePrint, $chset);
-                close(JSONFILE);
-            } else {
-                $msg = "Error opening JSON file '${jsonFile}'";
-            }
-            $msg and Warn("$msg\n");
-            $isWriting = 1;
-            $csv = 'JSON';
-        } else {
-            $json = 1;
-            $html = $xml = 0;
-            $mt->Options(Duplicates => 1);
-            require Image::ExifTool::XMP;   # for FixUTF8()
-        }
-        next;
-    }
     /^(k|pause)$/i and $pause = 1, next;
     (/^l$/ or $a eq 'long') and --$outFormat, next;
     (/^L$/ or $a eq 'latin') and $mt->Options(Charset => 'Latin'), next;
@@ -1365,10 +1349,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 +1397,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;
@@ -1718,7 +1710,7 @@ if (@newValues) {
                 $saveCount = $mt->SaveNewValues();
                 $needSave = 0;
                 # insert marker to load values from CSV file now if this was the CSV file
-                push @dynamicFiles, \$csv if $$_{SaveCount} == $csvSaveCount;
+                push @dynamicFiles, \$csv if $$_{SaveCount} == $dbSaveCount;
             }
             next;
         }
@@ -1794,11 +1786,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";
@@ -3250,7 +3240,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, $csvEtPrt, $csvEtVal);
                 undef $evalWarning;
                 local $SIG{'__WARN__'} = sub { $evalWarning = $_[0] };
                 # force UTF-8 if the database was JSON
@@ -3278,46 +3268,74 @@ sub SetImageInfo($$$)
                     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
+                        $csvEtPrt = Image::ExifTool->new unless $csvEtPrt;
+                        foreach $csvTag (OrderedKeys($csvInfo)) {
+                            next if $csvTag =~ /^([-_0-9A-Z]+:)*(SourceFile|Directory|FileName)$/i;
+                            my @grps = split /:/, $csvTag;
+                            my $name = pop @grps;
+                            unshift @grps, 'All' while @grps < 2;
+                            if ($name =~ s/#$//) {
+                                # handle ValueConv tags separately
+                                $csvEtVal = Image::ExifTool->new unless $csvEtVal;
+                                $csvEtVal->FoundTag($name, $$csvInfo{$csvTag}, @grps);
+                            } else {
+                                $csvEtPrt->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,
-                                          ProtectSaved => $csvSaveCount);
+                                          Protected => 1, AddValue => $dbAdd,
+                                          ProtectSaved => $dbSaveCount);
                         $wrn and Warn "$wrn\n" if $verbose;
                     }
                 }
+                # set specified tags now
+                if ($csvEtPrt) {
+                    my @excl = map "-$_", @csvExclude;  # add back leading dashes
+                    my $opts = { AddValue => $dbAdd, Replace => 0 };
+                    $et->SetNewValuesFromFile($csvEtPrt, $opts, @tags, @excl);
+                    if ($csvEtVal) {
+                        $$opts{Type} = 'ValueConv';
+                        $et->SetNewValuesFromFile($csvEtVal, $opts, @tags, @excl);
+                    }
+                }
                 $et->Options(Charset => $old) if $csv eq 'JSON';
                 unless ($found) {
                     Warn("No SourceFile '${file}' in imported $csv database\n");
@@ -5758,10 +5776,16 @@ 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 in
+tag names are allowed, but the group name must match exactly the group in
+the CSV file (eg. a C<XMP-dc:Subject> column in the CSV file won't match
+C<-XMP:Subject> on the command line.  Also, 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
@@ -5783,7 +5807,8 @@ List-type tags are stored as simple strings in a CSV file, but the B<-sep>
 option may be used to split them back into separate items when importing.
 
 Special feature:  B<-csv>+=I<CSVFILE> may be used to add items to existing
-lists.  This affects only list-type tags.  Also applies to the B<-j> option.
+lists in the file.  This affects only list-type tags.  Also applies to the
+B<-j> option.
 
 Note that this and the B<-plot> options are fundamentally different than all
 other output format options because they require information from all input
@@ -5951,16 +5976,23 @@ 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 in
+tag names are allowed, but the group name must match exactly the group in
+the JSON file (eg. a C<XMP-dc:Subject> entry in the JSON file won't match
+C<-XMP:Subject> on the command line.  Also, 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
 deleted by using the B<-f> option and setting the tag value to "-" (or to
 the MissingTagValue setting if this API option was used).  Importing with
-B<-j>+=I<JSONFILE> causes new values to be added to existing lists.
+B<-j>+=I<JSONFILE> causes new values to be added to existing lists in the
+target file.
 
 =item B<-l> (B<-long>)
 
@@ -6095,7 +6127,7 @@ with this command:
 
 produces output like this:
 
-    -- Generated by ExifTool 13.40 --
+    -- Generated by ExifTool 13.42 --
     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

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

@@ -88,7 +88,7 @@ sub ProcessCTMD($$$);
 sub ProcessExifInfo($$$);
 sub SwapWords($);
 
-$VERSION = '4.97';
+$VERSION = '4.99';
 
 # 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
@@ -642,6 +643,7 @@ $VERSION = '4.97';
    '61182.63' => 'Canon RF 24mm F1.4 L VCM', #42
    '61182.64' => 'Canon RF 20mm F1.4 L VCM', #42
    '61182.65' => 'Canon RF 85mm F1.4 L VCM', #github350
+   '61182.66' => 'Canon RF 45mm F1.2 STM', #42
     65535 => 'n/a',
 );
 
@@ -1008,10 +1010,11 @@ $VERSION = '4.97';
     0x80000487 => 'EOS R8', #42
     0x80000491 => 'PowerShot V10', #25
     0x80000495 => 'EOS R1', #PH
-    0x80000496 => 'R5 Mark II', #forum16406
+    0x80000496 => 'EOS R5 Mark II', #forum16406
     0x80000497 => 'PowerShot V1', #PH
     0x80000498 => 'EOS R100', #25
     0x80000516 => 'EOS R50 V', #42
+    0x80000518 => 'EOS R6 Mark III', #42
     0x80000520 => 'EOS D2000C', #IB
     0x80000560 => 'EOS D6000C', #PH (guess)
 );
@@ -1995,12 +1998,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' },
         },
@@ -7052,6 +7055,7 @@ my %ciMaxFocal = (
             326 => 'Canon RF 24mm F1.4 L VCM', #42
             327 => 'Canon RF 20mm F1.4 L VCM', #42
             328 => 'Canon RF 85mm F1.4 L VCM', #42/github350
+            330 => 'Canon RF 45mm F1.2 STM', #42
             # Note: add new RF lenses to %canonLensTypes with ID 61182
         },
     },
@@ -8321,8 +8325,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 +8557,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 +8572,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 +8677,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 +8691,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 +8783,7 @@ my %ciMaxFocal = (
         Name => 'PerChannelBlackLevel',
         Format => 'int16u[4]',
     },
+    # 0x290 - PerChannelBlackLevel again
     0x294 => {
         Name => 'NormalWhiteLevel',
         Format => 'int16u',