exiftool_vendored 13.40.0 → 13.41.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9dfd10c8fad46a346537837a7eb4d95f6abf124bb6b3a9ca65479e447b6f4bac
-  data.tar.gz: 9ac3a94f1fa80f10cab26c6c595499b32431e39e1fa31d33255a45454b2c1465
+  metadata.gz: 2b44cbb111004a5ad11908f51cc4df6fdb3408e89fe85601272c4a842be84530
+  data.tar.gz: 9fb67bb8d2dc211216e00bfc588ea0da0eead4ca9580feeb4b8dd8a92b7fbec6
 SHA512:
-  metadata.gz: 064efdbb744ee1a1e25c1df084286c86ecf791c85479e95d73c10b5aad589b2355068a19e1757ebc88bd26349af0550750b1c48cc0e945e833ac392583642559
-  data.tar.gz: 6e5d5cec5577836228ab18975639d2b7e2d27cd1a161bae004ebdb472ec7f1e669155589e2e0fb83873bf7a1bc3c592df6196e98afb7cc872b676b70564c3fea
+  metadata.gz: f572f1cc80a9d132fce1708b51c4f644518df142874e852cf26ff828d8f3840ad9bd130a7d788690d9a682ecd38d703ce732940ee3147bc712094c92928c6714
+  data.tar.gz: 87ba2fe582b1808334ad6e0a8581eef8153a91c50cad28f9374cd2aee6507aa6c07d0ea0a74769f2e8a87f5f2feca5f5767967d2ca200e2f5b7469fb4e1ab94a

data/bin/Changes

@@ -7,13 +7,32 @@ 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. 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.41",
    "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.41'
 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.41.tar.gz | tar -xf -
+  cd Image-ExifTool-13.41
   ./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.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";
@@ -3250,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
@@ -3278,39 +3290,51 @@ 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
+                        $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,
@@ -3318,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");
@@ -5758,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
@@ -5951,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
@@ -6095,7 +6130,7 @@ with this command:
 
 produces output like this:
 
-    -- Generated by ExifTool 13.40 --
+    -- 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

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',

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

@@ -57,7 +57,7 @@ use vars qw($VERSION $AUTOLOAD @formatSize @formatName %formatNumber %intFormat
 use Image::ExifTool qw(:DataAccess :Utils);
 use Image::ExifTool::MakerNotes;
 
-$VERSION = '4.60';
+$VERSION = '4.61';
 
 sub ProcessExif($$$);
 sub WriteExif($$$);
@@ -6191,10 +6191,15 @@ sub ProcessExif($$$)
     my $isExif = ($tagTablePtr eq \%Image::ExifTool::Exif::Main);
 
     # warn for incorrect maker notes in CR3 files
-    if ($$dirInfo{DirName} eq 'MakerNotes' and $$et{FileType} eq 'CR3' and
-        $$dirInfo{Parent} and $$dirInfo{Parent} eq 'ExifIFD')
-    {
-        $et->Warn("MakerNotes shouldn't exist ExifIFD of CR3 image", 1);
+    if ($dirName eq 'MakerNotes') {
+        if ($$et{FileType} eq 'CR3' and $$dirInfo{Parent} and $$dirInfo{Parent} eq 'ExifIFD') {
+            $et->Warn("MakerNotes shouldn't exist ExifIFD of CR3 image", 1);
+        }
+        if ($$dirInfo{TagInfo} and $$dirInfo{TagInfo}{MakerNotes} and
+            $$et{ExifByteOrder} and $$et{ExifByteOrder} ne GetByteOrder())
+        {
+            $et->FoundTag(MakerNoteByteOrder => GetByteOrder());
+        }
     }
     # set flag to calculate image data hash if requested
     $doHash = 1 if $$et{ImageDataHash} and (($$et{FILE_TYPE} eq 'TIFF' and not $base and not $inMakerNotes) or
@@ -6281,7 +6286,7 @@ sub ProcessExif($$$)
         $dirSize = 2 + 12 * $numEntries;
         $dirEnd = $dirStart + $dirSize;
     }
-    $verbose > 0 and $et->VerboseDir($dirName, $numEntries);
+    $verbose > 0 and $et->VerboseDir($dirName, $numEntries, undef, GetByteOrder());
     my $bytesFromEnd = $dataLen - $dirEnd;
     if ($bytesFromEnd < 4) {
         unless ($bytesFromEnd==2 or $bytesFromEnd==0) {

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

@@ -184,7 +184,7 @@ my %ttCharset = (
   Custom  => { },
 );
 
-# codes for the 63 known WOFF2 tags
+# the 63 known WOFF2 tags
 my @knownTags = (
     'cmap', 'head', 'hhea', 'hmtx', 'maxp', 'name', 'OS/2', 'post', 'cvt',
     'fpgm', 'glyf', 'loca', 'prep', 'CFF',  'VORG', 'EBDT', 'EBLC', 'gasp',
@@ -891,9 +891,8 @@ This module is used by Image::ExifTool
 
 This module contains the routines required by Image::ExifTool to read meta
 information from various format font files.  Currently recognized font file
-types are OTF, TTF, TTC, DFONT, PFA, PFB, PFM, AFM, ACFM and AMFM.  As well,
-WOFF and WOFF2 font files are identified, but metadata is not currently
-extracted from these formats.
+types are OTF, TTF, TTC, DFONT, PFA, PFB, PFM, AFM, ACFM, AMFM, WOFF and
+WOFF2.
 
 =head1 AUTHOR
 

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

@@ -26,7 +26,7 @@ use strict;
 use vars qw($VERSION);
 use Image::ExifTool qw(:DataAccess :Utils);
 
-$VERSION = '1.41';
+$VERSION = '1.42';
 
 sub ProcessICC($$);
 sub ProcessICC_Profile($$$);
@@ -330,6 +330,7 @@ my %manuSig = ( #6
     'WTG2' => 'Ware To Go',
     'WYSE' => 'WYSE Technology',
     'XERX' => 'Xerox Corporation',
+    'XM  ' => 'Xiaomi',
     'XRIT' => 'X-Rite',
     'yxym' => 'YxyMaster GmbH',
     'Z123' => "Lavanya's test Company",

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

@@ -18,7 +18,7 @@ use vars qw($VERSION);
 use Image::ExifTool qw(:DataAccess :Utils);
 use Image::ExifTool::Microsoft;
 
-$VERSION = '1.12';
+$VERSION = '1.13';
 
 sub ProcessItemID($$$);
 sub ProcessLinkInfo($$$);
@@ -191,7 +191,7 @@ sub ProcessLinkInfo($$$);
     },
     0xa0000001 => {
         Name => 'EnvVarData',
-        SubDirectory => { TagTable => 'Image::ExifTool::LNK::UnknownData' },
+        SubDirectory => { TagTable => 'Image::ExifTool::LNK::EnvVarData' },
     },
     0xa0000002 => {
         Name => 'ConsoleData',
@@ -448,6 +448,19 @@ sub ProcessLinkInfo($$$);
     },
 );
 
+%Image::ExifTool::LNK::EnvVarData = (
+    PROCESS_PROC => \&Image::ExifTool::ProcessBinaryData,
+    GROUPS => { 2 => 'Other' },
+    8 => {
+        Name => 'EnvironmentTarget',
+        Format => 'string[260]',
+    },
+    268 => {
+        Name => 'EnvironmentTargetUnicode',
+        Format => 'unicode[260]',
+    },
+);
+
 %Image::ExifTool::LNK::INI = (
     GROUPS => { 2 => 'Document' },
     VARS => { ID_FMT => 'none' },

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

@@ -42,7 +42,7 @@ use Image::ExifTool qw(:DataAccess :Utils);
 use Image::ExifTool::Exif;
 use Image::ExifTool::APP12;
 
-$VERSION = '2.92';
+$VERSION = '2.93';
 
 sub PrintLensInfo($$$);
 
@@ -201,8 +201,9 @@ my %olympusLensTypes = (
   # '65535 07 40' - Seen for LUMIX S 16-35/F4 on Panasonic DC-S1H (ref PH)
     # Other makes
     '24 01 10' => 'Venus Optics Laowa 50mm F2.8 2x Macro', #DonKomarechka
-    'f7 03 10' => 'LAOWA C&D-Dreamer MFT 7.5mm F2.0', #forum3833
-    'f7 10 10' => 'LAOWA C&D-Dreamer MFT 6.0mm F2.0', #KG
+    '247 03 10' => 'LAOWA C&D-Dreamer MFT 7.5mm F2.0', #forum3833
+    '247 10 10' => 'LAOWA C&D-Dreamer MFT 6.0mm F2.0', #KG
+    '65522 02 10' => 'Xiaoyi 42.5mm F1.8', #github363
 );
 
 # lookup for Olympus camera types (ref PH)

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

@@ -49,7 +49,7 @@ use Image::ExifTool qw(:DataAccess :Utils);
 use Image::ExifTool::Exif;
 use Image::ExifTool::GPS;
 
-$VERSION = '3.22';
+$VERSION = '3.23';
 
 sub ProcessMOV($$;$);
 sub ProcessKeys($$$);
@@ -578,11 +578,29 @@ my %userDefined = (
                 return substr($val, 8, $len-8);
             },
             Binary => 1,
+        },{
+            Name => 'HighlightMarkers',
+            # (DJI Action 4, forum17700)
+            Notes => 'written by some DJI models',
+            Condition => '$$valPt =~ /^data.{4}hglg.{5}/s',
+            RawConv => q{
+                my $len = unpack 'x4N', $val;
+                return undef if $len < 13 or $len + 4 > length($val);
+                my $n = int(($len - 13) / 5);
+                my @a = map $_/1000, unpack "x17(xV)$n", $val;
+                return \@a;
+            },
         },{
             Unknown => 1,
             Binary => 1,
         },
-        # (also Samsung WB750 uncompressed thumbnail data starting with "SDIC\0")
+        # DJI videos also have block of offset/size of various atoms, eg)
+        #        Atom name   ????        Offset      Size
+        #  0000: 63 6f 76 72 00 00 00 00 00 ed 6f da 00 0a 46 e0 [covr......o...F.]
+        #  0010: 73 6e 61 6c 00 00 00 00 00 f7 b6 d2 00 0a 46 e0 [snal..........F.]
+        #  0020: 68 67 6c 67 00 00 00 00 01 02 0a a2 00 00 00 21 [hglg...........!]
+        #  0030: 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 [................]
+        # (also Samsung WB750 uncompressed thumbnail data starting with "SDIC\0")        
     ],
     # fre1 - 4 bytes: "june" (Kodak PixPro SP360)
     frea => {

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

@@ -14,7 +14,7 @@ use strict;
 use vars qw($VERSION);
 use Image::ExifTool qw(:DataAccess :Utils);
 
-$VERSION = '1.01';
+$VERSION = '1.02';
 
 sub ProcessR3D($$);
 
@@ -45,7 +45,8 @@ my $errTrunc = 'Truncated R3D file';
     RED2 => { Name => 'Red2Header', SubDirectory => { TagTable => 'Image::ExifTool::Red::RED2' } },
 
     # (upper 4 bits of tag ID are the format code)
-    # ---- format 1 ----
+    # ---- format 0 (int8u) ----
+    # ---- format 1 (string) ----
     0x1000 => 'StartEdgeCode', #1
     0x1001 => { Name => 'StartTimecode', Groups => { 2 => 'Time' } }, #1
     0x1002 => { #1
@@ -104,6 +105,7 @@ my $errTrunc = 'Truncated R3D file';
   # 0x1041 - seen 'NA'
     0x1042 => 'Revision', # ? (seen "TODO, rev EPIC-1.0" and "MYSTERIUM X, rev EPIC-1.0")
   # 0x1051 - seen 'C', 'L'
+  # 0x1052 - seen 'E9'
     0x1056 => 'OriginalFileName',
     0x106e => 'LensMake',
     0x106f => 'LensNumber', # (last 2 hex digits are LensType)
@@ -120,7 +122,8 @@ my $errTrunc = 'Truncated R3D file';
     0x1096 => 'Filter', # optical low-pass filter
     0x10a0 => 'Brain',
     0x10a1 => 'Sensor',
-    # ---- format 2 ----
+    0x10be => 'Quality',
+    # ---- format 2 (float) ----
     0x200d => 'ColorTemperature',
   # 0x200e - (sometimes this is frame rate)
   # 0x2015 - seen '1 1 1' (RGBGain or RGBGamma?)
@@ -130,7 +133,8 @@ my $errTrunc = 'Truncated R3D file';
         Groups => { 2 => 'Video' },
         PrintConv => 'int($val * 1000 + 0.5) / 1000',
     },
-    # ---- format 4 ----
+    # ---- format 3 (int8u?) ----
+    # ---- format 4 (int16u) ----
     0x4037 => { Name => 'CropArea' }, # (NC)
     0x403b => 'ISO',
   # 0x404e - related to CropArea (or "0 0 0 0")
@@ -138,8 +142,12 @@ my $errTrunc = 'Truncated R3D file';
     0x406b => 'FocalLength',
   # 0x4084 - related to ISO?
   # 0x4087 - related to ISO?
-    # ---- format 6 ----
+    # ---- format 5 (int8s?) ----
+    # ---- format 6 (int32s) ----
     0x606c => { Name => 'FocusDistance', ValueConv => '$val/1000', PrintConv => '"$val m"' },
+    # ---- format 7 (undef? structure?) ----
+    # ---- format 8 (int32u?) ----
+    # ---- format 9 (undef?) ----
 );
 
 # RED1 file header (ref PH)
@@ -240,9 +248,11 @@ sub ProcessR3D($$)
         $pos = 0x22;    # directory starts at offset 0x22
     } else {
         # calculate position of Red directory start
-        length($buff) < 0x41 and return $et->Warn($errTrunc);
-        my $n = Get8u(\$buff, 0x40);    # number of "rdi" records
-        $pos = 0x44 + $n * 0x18;
+        $pos = 0x44;
+        length($buff) < $pos and return $et->Warn($errTrunc);
+        $pos += Get8u(\$buff, 0x40) * 0x18;   # skip "rdi" records
+        $pos += Get8u(\$buff, 0x41) * 0x14;   # skip "rda" records
+        $pos += Get8u(\$buff, 0x42) * 0x10;   # skip "rdx" records
     }
     if ($pos + 8 > length $buff) {
         $dirLen = 0;    # find directory the hard way
@@ -253,7 +263,7 @@ sub ProcessR3D($$)
     # do sanity check on the directory size (in case our assumptions were wrong)
     if ($dirLen < 300 or $dirLen >= 2048 or $pos + $dirLen > length $buff) {
         # tag 0x1000 with length 0x000f should be near the directory start
-        $buff =~ /\0\x0f\x10\0/g or return $et->Warn("Can't find Red directory");
+        $buff =~ /\0\x0f\x10[\0\x06]/g or return $et->Warn("Can't find Red directory. Please submit sample for testing");
         $pos = pos($buff) - 4;
         $dirEnd = length $buff;
         undef $dirLen;

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

@@ -9475,6 +9475,8 @@ my %tagExists = (
 	'entrypoint' => 1,
 	'entrytype' => 1,
 	'environmentmap' => 1,
+	'environmenttarget' => 1,
+	'environmenttargetunicode' => 1,
 	'envvardata' => 1,
 	'eppim' => 1,
 	'eprint' => 1,
@@ -10143,6 +10145,7 @@ my %tagExists = (
 	'highisomode' => 1,
 	'highlightdata' => 1,
 	'highlightendpoints' => 1,
+	'highlightmarkers' => 1,
 	'highnote' => 1,
 	'highvelocity' => 1,
 	'hindsightsettings' => 1,
@@ -10827,6 +10830,7 @@ my %tagExists = (
 	'maininfoifd' => 1,
 	'makeandmodel' => 1,
 	'makemodel' => 1,
+	'makernotebyteorder' => 1,
 	'makernotepentax5a' => 1,
 	'makernotepentax5b' => 1,
 	'makernotepentax5c' => 1,

data/bin/lib/Image/ExifTool/TagNames.pod

@@ -12,7 +12,7 @@ meta information extracted from or written to a file.
 =head1 TAG TABLES
 
 The tables listed below give the names of all tags recognized by ExifTool.
-They contain a total of 28853 tags, with 17925 unique tag names.
+They contain a total of 28858 tags, with 17929 unique tag names.
 
 B<Tag ID>, B<Index#> or B<Sequence> is given in the first column of each
 table.  A B<Tag ID> is the computer-readable equivalent of a tag name, and
@@ -9541,7 +9541,7 @@ These tags are used by the R5, R5 and EOS 1DXmkIII.
 
 =head3 Canon ColorData11 Tags
 
-These tags are used by the EOS R3, R7 and R6mkII
+These tags are used by the EOS R3, R7, R50 and R6mkII
 
   Index2   Tag Name                             Writable
   ------   --------                             --------
@@ -9630,7 +9630,7 @@ These tags are used by the EOS R3, R7 and R6mkII
 
 =head3 Canon ColorData12 Tags
 
-These tags are used by the EOS R1 and R5mkII
+These tags are used by the EOS R1, R5mkII and R50V
 
   Index2   Tag Name                             Writable
   ------   --------                             --------
@@ -30720,6 +30720,7 @@ for the official QuickTime specification.
   'free'               KodakFree                Kodak Free
                        Pittasoft                QuickTime Pittasoft
                        ThumbnailImage           no
+                       HighlightMarkers         no
                        Free?                    no
   'ftyp'               FileType                 QuickTime FileType
   'gdat'               GPSData                  QuickTime Stream
@@ -36442,6 +36443,7 @@ Tags extracted from Redcode R3D video files.
   0x1096   Filter                               no
   0x10a0   Brain                                no
   0x10a1   Sensor                               no
+  0x10be   Quality                              no
   0x200d   ColorTemperature                     no
   0x204b   RGBCurves                            no
   0x2066   OriginalFrameRate                    no
@@ -40696,7 +40698,7 @@ Information extracted from MS Shell Link (Windows shortcut) files.
   0x30020      CommandLineArguments             no
   0x30040      IconFileName                     no
   0xa0000000   UnknownData                      LNK UnknownData
-  0xa0000001   EnvVarData                       LNK UnknownData
+  0xa0000001   EnvVarData                       LNK EnvVarData
   0xa0000002   ConsoleData                      LNK ConsoleData
   0xa0000003   TrackerData                      LNK TrackerData
   0xa0000004   ConsoleFEData                    LNK ConsoleFEData
@@ -40741,6 +40743,13 @@ Information extracted from MS Shell Link (Windows shortcut) files.
   ------   --------                             --------
   [no tags known]
 
+=head3 LNK EnvVarData Tags
+
+  Index1   Tag Name                             Writable
+  ------   --------                             --------
+      8    EnvironmentTarget                    no
+    268    EnvironmentTargetUnicode             no
+
 =head3 LNK ConsoleData Tags
 
   Index1   Tag Name                             Writable
@@ -41690,6 +41699,7 @@ FileName.
   JPEGQualityEstimate        File               no
   JUMBF                      JUMBF              no
   MIMEType                   File               no
+  MakerNoteByteOrder         File               no
   MaxVal                     File               no
   NewGUID                    ExifTool           no
   Now                        ExifTool           no

data/bin/lib/Image/ExifTool.pm

@@ -29,7 +29,7 @@ use vars qw($VERSION $RELEASE @ISA @EXPORT_OK %EXPORT_TAGS $AUTOLOAD @fileTypes
             %jpegMarker %specialTags %fileTypeLookup $testLen $exeDir
             %static_vars $advFmtSelf $configFile @configFiles $noConfig);
 
-$VERSION = '13.40';
+$VERSION = '13.41';
 $RELEASE = '';
 @ISA = qw(Exporter);
 %EXPORT_TAGS = (
@@ -392,6 +392,7 @@ my %createTypes = map { $_ => 1 } qw(XMP ICC MIE VRD DR4 EXIF EXV);
     LFR  =>  'LFP', # (Light Field RAW)
     LIF  => ['LIF',  'Leica Image File'],
     LNK  => ['LNK',  'Windows shortcut'],
+    LRF  => ['MOV',  'Low-Resolution video File'],
     LRI  => ['LRI',  'Light RAW'],
     LRV  => ['MOV',  'Low-Resolution Video'],
     M2T  =>  'M2TS',
@@ -1818,6 +1819,13 @@ my %systemTagsNotes = (
             MM => 'Big-endian (Motorola, MM)',
         },
     },
+    MakerNoteByteOrder => {
+        Notes => 'byte order of maker notes.  Generated only if different from ExifByteOrder',
+        PrintConv => {
+            II => 'Little-endian (Intel, II)',
+            MM => 'Big-endian (Motorola, MM)',
+        },
+    },
     ExifUnicodeByteOrder => {
         Writable => 1,
         WriteOnly => 1,
@@ -8626,6 +8634,7 @@ sub DoProcessTIFF($$;$)
     my $ifdName = ($$dirInfo{DirName} and $$dirInfo{DirName} =~ /^(ExifIFD|GPS)$/) ? $1 : 'IFD0';
     if (not $tagTablePtr or $$tagTablePtr{GROUPS}{0} eq 'EXIF') {
         $self->FoundTag('ExifByteOrder', $byteOrder) unless $outfile;
+        $$self{ExifByteOrder} = $byteOrder;
     } elsif ($$tagTablePtr{GROUPS}{0} eq 'MakerNotes') { # (for writing CR3 maker notes)
         $ifdName = $$tagTablePtr{GROUPS}{0};
     } else {
@@ -9685,10 +9694,10 @@ sub VPrint($$@)
 # Print verbose directory information
 # Inputs: 0) ExifTool object reference, 1) directory name or dirInfo ref
 #         2) number of entries in directory (or 0 if unknown)
-#         3) optional size of directory in bytes
-sub VerboseDir($$;$$)
+#         3) optional size of directory in bytes, 4) optional byte order for -v3 output
+sub VerboseDir($$;$$$)
 {
-    my ($self, $name, $entries, $size) = @_;
+    my ($self, $name, $entries, $size, $byteOrder) = @_;
     return unless $$self{OPTIONS}{Verbose};
     if (ref $name eq 'HASH') {
         $size = $$name{DirLen} unless $size;
@@ -9698,6 +9707,9 @@ sub VerboseDir($$;$$)
     my $out = $$self{OPTIONS}{TextOut};
     my $str = ($entries or defined $entries and not $size) ? " with $entries entries" : '';
     $str .= ", $size bytes" if $size;
+    if ($byteOrder and $$self{OPTIONS}{Verbose} > 2) {
+        $str .= ', ' . (GetByteOrder() eq 'II' ? 'Little-endian' : 'Big-endian');
+    }
     print $out "$indent+ [$name directory$str]\n";
 }
 
@@ -9820,7 +9832,7 @@ sub ProcessBinaryData($$$)
         # extract known tags in numerical order
         @tags = sort { ($a < 0 ? $a + 1e9 : $a) <=> ($b < 0 ? $b + 1e9 : $b) } TagTableKeys($tagTablePtr);
     }
-    $self->VerboseDir('BinaryData', undef, $size) if $verbose;
+    $self->VerboseDir('BinaryData', undef, $size, GetByteOrder()) if $verbose;
     # avoid creating unknown tags for tags that fail condition if Unknown is 1
     $$self{NO_UNKNOWN} = 1 if $unknown < 2;
     my ($index, %val);

data/bin/perl-Image-ExifTool.spec

@@ -1,6 +1,6 @@
 Summary: perl module for image data extraction
 Name: perl-Image-ExifTool
-Version: 13.40
+Version: 13.41
 Release: 1
 License: Artistic/GPL
 Group: Development/Libraries/Perl

data/lib/exiftool_vendored/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ExiftoolVendored
-  VERSION = Gem::Version.new('13.40.0')
+  VERSION = Gem::Version.new('13.41.0')
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: exiftool_vendored
 version: !ruby/object:Gem::Version
-  version: 13.40.0
+  version: 13.41.0
 platform: ruby
 authors:
 - Matthew McEachen