exiftool-vendored.exe 13.41.0 → 13.42.0

package/bin/exiftool_files/exiftool.pl

@@ -11,7 +11,7 @@ use strict;
 use warnings;
 require 5.004;
 
-my $version = '13.41';
+my $version = '13.42';
 
 $^W = 1;    # enable global warnings
 
@@ -144,9 +144,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
@@ -498,7 +498,7 @@ undef $binSep;
 undef $binTerm;
 undef $comma;
 undef $csv;
-undef $csvAdd;
+undef $dbAdd;
 undef $deleteOrig;
 undef $diff;
 undef $disableOutput;
@@ -563,7 +563,7 @@ $countGoodWr = 0;
 $countNewDir = 0;
 $countSameWr = 0;
 $csvDelim = ',';
-$csvSaveCount = 0;
+$dbSaveCount = 0;
 $fileTrailer = '';
 $filterFlag = 0;
 $html = 0;
@@ -593,7 +593,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 $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);
@@ -828,7 +828,7 @@ for (;;) {
         }
         # create necessary lists, etc for this new -tagsFromFile file
         AddSetTagsFile($setTagsFile, { Replace => ($1 and lc($1) eq 'add') ? 0 : 1 } );
-        $tagsFrom = 'file';
+        $tagsFrom = 'File';
         next;
     }
     if ($a eq '@') {
@@ -936,36 +936,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;
-                $tagsFrom = 'csv';
-            }
+            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) {
@@ -1128,42 +1142,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;
-                $tagsFrom = 'csv';
-                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;
@@ -1386,7 +1364,7 @@ for (;;) {
         $tag =~ s/\ball\b/\*/ig;    # replace 'all' with '*' in tag names
         if (not $tagsFrom) {
             push @exclude, $tag;
-        } elsif ($tagsFrom eq 'csv') {
+        } elsif ($tagsFrom eq 'CSV') {
             push @csvExclude, $tag;
         } else {
             push @{$setTags{$setTagsFile}}, "-$tag";
@@ -1433,11 +1411,11 @@ for (;;) {
     } else {
         # assume '-tagsFromFile @' if tags are being redirected
         # and not from CSV and -tagsFromFile hasn't already been specified
-        if (not $setTagsFile and $tagsFrom ne 'csv' and /(<|>)/) {
+        if (not $setTagsFile and $tagsFrom ne 'CSV' and /(<|>)/) {
             AddSetTagsFile($setTagsFile = '@');
-            $tagsFrom = 'file';
+            $tagsFrom = 'File';
         }
-        if ($tagsFrom eq 'csv') {
+        if ($tagsFrom eq 'CSV') {
             my $lst = s/^-// ? \@csvExclude : \@tags;
             push @$lst, $_;
         } elsif ($setTagsFile) {
@@ -1733,7 +1711,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;
         }
@@ -3263,7 +3241,7 @@ sub SetImageInfo($$$)
                 next;
             } elsif (ref $dyFile eq 'SCALAR') {
                 # set new values from CSV or JSON database
-                my ($f, $found, $csvTag, $tg, $csvExifTool);
+                my ($f, $found, $csvTag, $tg, $csvEtPrt, $csvEtVal);
                 undef $evalWarning;
                 local $SIG{'__WARN__'} = sub { $evalWarning = $_[0] };
                 # force UTF-8 if the database was JSON
@@ -3295,13 +3273,19 @@ sub SetImageInfo($$$)
                     }
                     if (@tags) {
                         # prepare a dummy ExifTool object to hold appropriate tags from the database
-                        $csvExifTool = Image::ExifTool->new unless $csvExifTool;
+                        $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, 'Unknown' while @grps < 2;
-                            $csvExifTool->FoundTag($name, $$csvInfo{$csvTag}, @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;
                     }                    
@@ -3338,15 +3322,20 @@ ExclMatch:                  foreach $exclTag (@exclTags) {
                             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 ($csvExifTool) {
+                if ($csvEtPrt) {
                     my @excl = map "-$_", @csvExclude;  # add back leading dashes
-                    $et->SetNewValuesFromFile($csvExifTool, @tags, @excl);
+                    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) {

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

@@ -88,7 +88,7 @@ sub ProcessCTMD($$$);
 sub ProcessExifInfo($$$);
 sub SwapWords($);
 
-$VERSION = '4.98';
+$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)
@@ -643,6 +643,7 @@ $VERSION = '4.98';
    '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',
 );
 
@@ -1009,10 +1010,11 @@ $VERSION = '4.98';
     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)
 );
@@ -7053,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
         },
     },

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

@@ -14,9 +14,9 @@ use vars qw($VERSION);
 use Image::ExifTool qw(:DataAccess :Utils);
 use Image::ExifTool::Import;
 
-$VERSION = '1.10';
+$VERSION = '1.11';
 
-sub ProcessJSON($$);
+sub ProcessJSON($$;$);
 sub ProcessTag($$$$%);
 
 %Image::ExifTool::JSON::Main = (
@@ -71,6 +71,7 @@ sub FoundTag($$$$%)
         $name = Image::ExifTool::MakeTagName($name);
         my $desc = Image::ExifTool::MakeDescription($name);
         $desc =~ s/^C2 PA/C2PA/;    # hack to get "C2PA" correct
+        $et->VPrint(0, $$et{INDENT}, "[adding $tag]\n");
         AddTagToTable($tagTablePtr, $tag, {
             Name => $name,
             Description => $desc,
@@ -112,12 +113,12 @@ sub ProcessTag($$$$%)
 
 #------------------------------------------------------------------------------
 # Extract meta information from a JSON file
-# Inputs: 0) ExifTool object reference, 1) dirInfo reference
+# Inputs: 0) ExifTool object reference, 1) dirInfo reference, 2) tag table ref
 # Returns: 1 on success, 0 if this wasn't a recognized JSON file
-sub ProcessJSON($$)
+sub ProcessJSON($$;$)
 {
     local $_;
-    my ($et, $dirInfo) = @_;
+    my ($et, $dirInfo, $tagTablePtr) = @_;
     my $raf = $$dirInfo{RAF};
     my $structOpt = $et->Options('Struct');
     my (%database, $key, $tag, $dataPt);
@@ -149,7 +150,7 @@ sub ProcessJSON($$)
 
     $et->SetFileType() unless $dataPt;
 
-    my $tagTablePtr = GetTagTable('Image::ExifTool::JSON::Main');
+    $tagTablePtr or $tagTablePtr = GetTagTable('Image::ExifTool::JSON::Main');
 
     # remove any old tag definitions in case they change flags
     foreach $key (TagTableKeys($tagTablePtr)) {

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

@@ -2833,6 +2833,7 @@ my %userDefined = (
    'xml ' => {
         Name => 'XML',
         Flags => [ 'Binary', 'Protected' ],
+        BlockExtract => 1,
         SubDirectory => {
             TagTable => 'Image::ExifTool::XMP::XML',
             IgnoreProp => { NonRealTimeMeta => 1 }, # ignore container for Sony 'nrtm'
@@ -2883,6 +2884,7 @@ my %userDefined = (
     },
     idat => {
         Name => 'MetaImageSize', #PH (NC)
+        Condition => '$$self{FileType} eq "HEIC"',
         Format => 'int16u',
         # (don't know what the first two numbers are for)
         PrintConv => '$val =~ s/^(\d+) (\d+) (\d+) (\d+)/${3}x$4/; $val',

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

@@ -21,8 +21,9 @@ use strict;
 use vars qw($VERSION %samsungLensTypes);
 use Image::ExifTool qw(:DataAccess :Utils);
 use Image::ExifTool::Exif;
+use Image::ExifTool::JSON;
 
-$VERSION = '1.58';
+$VERSION = '1.59';
 
 sub WriteSTMN($$$);
 sub ProcessINFO($$$);
@@ -1277,7 +1278,15 @@ my %formatMinMax = (
    # 0x0b51-name - seen 'Intelligent_PhotoEditor_Data' #forum16086
    # 0x0b60-name - seen 'UltraWide_PhotoEditor_Data' #forum16086
    # 0x0b90-name - seen 'Document_Scan_Info' #forum16086
-   # 0x0ba1-name - seen 'Original_Path_Hash_Key', 'PhotoEditor_Re_Edit_Data', 'deco_doodle_bitmap', 'deco_sticker_bitmap', 'deco_text_bitmap'
+   # 0x0ba1-name - seen 'Original_Path_Hash_Key', 'PhotoEditor_Re_Edit_Data', 'deco_doodle_bitmap', 'deco_sticker_bitmap', 'deco_text_bitmap','PhotoEditor_Re_Edit_Data'
+    '0x0ba1' => [{
+        Name => 'ReEditData',
+        Condition => '$$self{SamsungTagName} eq "PhotoEditor_Re_Edit_Data"',
+        SubDirectory => { TagTable => 'Image::ExifTool::Samsung::ReEditData' },
+    },{
+        Name => 'OriginalPathHashKey',
+        Condition => '$$self{SamsungTagName} eq "Original_Path_Hash_Key"',
+    }],
    # 0x0ba2-name - seen 'Copy_Available_Edit_Info' #forum16086
    # 0x0bc0-name - seen 'Single_Relighting_Bokeh_Info' #forum16086
    # 0x0bd0-name - seen 'Dual_Relighting_Bokeh_Info' #forum16086
@@ -1300,7 +1309,7 @@ my %formatMinMax = (
     '0x0d91' => { #forum16086/16242
         Name => 'PEg_Info',
         Description => 'PEg Info',
-        SubDirectory => { TagTable => 'Image::ExifTool::JSON::Main' },
+        SubDirectory => { TagTable => 'Image::ExifTool::Samsung::PEgInfo' },
     },
    # 0x0da1-name - seen 'Captured_App_Info' #forum16086
    # 0xa050-name - seen 'Jpeg360_2D_Info' (Samsung Gear 360)
@@ -1380,6 +1389,113 @@ my %formatMinMax = (
     perfMode            => { },
 );
 
+%Image::ExifTool::Samsung::ReEditData = (
+    GROUPS => { 0 => 'JSON', 2 => 'Image' },
+    PROCESS_PROC => \&Image::ExifTool::JSON::ProcessJSON,
+    VARS => { LONG_TAGS => 2 },
+    originalPath        => { },
+    representativeFrameLoc => { },
+    startMotionVideo    => { },
+    endMotionVideo      => { },
+    isMotionVideoMute   => { },
+    isTrimMotionVideo   => { },
+    clipInfoValue       => { SubDirectory => { TagTable => 'Image::ExifTool::Samsung::ClipInfo' } },
+    toneValue           => { SubDirectory => { TagTable => 'Image::ExifTool::Samsung::ToneInfo' } },
+    effectValue         => { SubDirectory => { TagTable => 'Image::ExifTool::Samsung::EffectInfo' } },
+    portraitEffectValue => { SubDirectory => { TagTable => 'Image::ExifTool::Samsung::PortraitEffect' }  },
+    isBlending          => { },
+    isNotReEdit         => { },
+    sepVersion          => { Name => 'SEPVersion' },
+    ndeVersion          => { Name => 'NDEVersion' },
+    reSize              => { },
+    isScaleAI           => { },
+    rotation            => { },
+    adjustmentValue     => { },
+    isApplyShapeCorrection => { },
+    isNewReEditOnly     => { },
+    isDecoReEditOnly    => { },
+    isAIFilterReEditOnly=> { },
+);
+
+%Image::ExifTool::Samsung::ClipInfo = (
+    GROUPS => { 0 => 'JSON', 2 => 'Image' },
+    PROCESS_PROC => \&Image::ExifTool::JSON::ProcessJSON,
+    mCenterX        => { Name => 'ClipCenterX' },
+    mCenterY        => { Name => 'ClipCenterY' },
+    mWidth          => { Name => 'ClipWidth' },
+    mHeight         => { Name => 'ClipHeight' },
+    mRotation       => { Name => 'ClipRotation' },
+    mRotate         => { Name => 'ClipRotate' },
+    mHFlip          => { Name => 'ClipHFlip' },
+    mVFlip          => { Name => 'ClipVFlip' },
+    mRotationEffect => { Name => 'ClipRotationEffect' },
+    mRotateEffect   => { Name => 'ClipRotateEffect' },
+    mHFlipEffect    => { Name => 'ClipHFlipEffect' },
+    mVFlipEffect    => { Name => 'ClipVFlipEffect' },
+    mHozPerspective => { Name => 'ClipHozPerspective' },
+    mVerPerspective => { Name => 'ClipVerPerspective' },
+);
+
+%Image::ExifTool::Samsung::ToneInfo = (
+    GROUPS => { 0 => 'JSON', 2 => 'Image' },
+    PROCESS_PROC => \&Image::ExifTool::JSON::ProcessJSON,
+    brightness      => { },
+    exposure        => { },
+    contrast        => { },
+    saturation      => { },
+    hue             => { },
+    wbMode          => { Name => 'WBMode' },
+    wbTemperature   => { Name => 'WBTemperature' },
+    tint            => { },
+    shadow          => { },
+    highlight       => { },
+    lightbalance    => { },
+    sharpness       => { },
+    definition      => { },
+    isBrightnessIPE => { },
+    isExposureIPE   => { },
+    isContrastIPE   => { },
+    isSaturationIPE => { },
+);
+
+%Image::ExifTool::Samsung::EffectInfo = (
+    GROUPS => { 0 => 'JSON', 2 => 'Image' },
+    PROCESS_PROC => \&Image::ExifTool::JSON::ProcessJSON,
+    filterIndication=> { },
+    alphaValue      => { },
+    filterType      => { },
+);
+
+%Image::ExifTool::Samsung::PortraitEffect = (
+    GROUPS => { 0 => 'JSON', 2 => 'Image' },
+    PROCESS_PROC => \&Image::ExifTool::JSON::ProcessJSON,
+    VARS => { LONG_TAGS => 1 },
+    effectId        => { Name => 'PortraitEffectID' },
+    effectLevel     => { Name => 'PortraitEffectLevel' },
+    exifRotation    => { Name => 'PortraitExifRotation' },
+    lightLevel      => { Name => 'PortraitLightLevel' },
+    touchX          => { Name => 'PortraitTouchX' },
+    touchY          => { Name => 'PortraitTouchY' },
+    refocusX        => { Name => 'PortraitRefocusX' },
+    refocusY        => { Name => 'PortraitRefocusY' },
+    effectIdOriginal    => { Name => 'PortraitEffectIDOriginal' },
+    effectLevelOriginal => { Name => 'EffectLevelOriginal' },
+    lightLevelOriginal  => { Name => 'LightLevelOriginal' },
+    touchXOriginal  => { },
+    touchYOriginal  => { },
+    refocusXOriginal=> { },
+    refocusYOriginal=> { },
+    waterMarkRemoved=> { Name => 'WaterMarkRemoved' },
+    waterMarkRemovedOriginal => { Name => 'WaterMarkRemovedOriginal' },
+);
+
+%Image::ExifTool::Samsung::PEgInfo = (
+    GROUPS => { 0 => 'JSON', 2 => 'Image' },
+    PROCESS_PROC => \&Image::ExifTool::JSON::ProcessJSON,
+    genImageVersion => { },
+    connectorType   => { },
+);
+
 # Samsung composite tags
 %Image::ExifTool::Samsung::Composite = (
     GROUPS => { 2 => 'Image' },
@@ -1625,7 +1741,14 @@ SamBlock:
             }
             next;
         }
-        last unless $buff =~ /^SEFH/ and $len >= 12;   # validate SEFH header
+        # validate SEFH header
+        unless ($buff =~ /^SEFH/ and $len >= 12) {
+            # tolerate extra junk written by Samsung Gallery
+            last unless $buff =~ /\0\0SEFT/g;
+            $et->Warn('Trailer likely corrupted by Samsung Gallery');
+            $blockEnd += pos($buff);
+            next;
+        }
         my $dirPos = $raf->Tell() - $len;
         # my $ver = Get32u(\$buff, 0x04);  # version (=101)
         my $count = Get32u(\$buff, 0x08);

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

@@ -34,7 +34,7 @@ use Image::ExifTool qw(:DataAccess :Utils);
 use Image::ExifTool::Exif;
 use Image::ExifTool::Minolta;
 
-$VERSION = '3.79';
+$VERSION = '3.80';
 
 sub ProcessSRF($$$);
 sub ProcessSR2($$$);
@@ -10656,7 +10656,7 @@ my %isoSetting2010 = (
     0x8101 => { Name => 'Sony_rtmd_0x8101', Format => 'int8u',  %hidUnk }, # seen: 0,1,2
     0x8104 => { Name => 'Sony_rtmd_0x8104', Format => 'int16u', %hidUnk }, # seen: 35616
     0x8105 => { Name => 'Sony_rtmd_0x8105', Format => 'int16u', %hidUnk }, # seen: 20092
-    0x8106 => { Name => 'Sony_rtmd_0x8106', Format => 'int32u', %hidUnk }, # seen: "25 1","24000 1001" frame rate?
+    0x8106 => { Name => 'FrameRate', Format => 'rational64u', PrintConv => 'sprintf("%.2f",$val)' },
     0x8109 => { #forum12218
         Name => 'ExposureTime',
         Format => 'rational64u',
@@ -10674,7 +10674,9 @@ my %isoSetting2010 = (
         Format => 'int16u',
     },
     0x810d => { Name => 'Sony_rtmd_0x810d', Format => 'int8u',  %hidUnk }, # seen: 0,1
+    0x8114 => { Name => 'SerialNumber', Format => 'string' }, # (and model, eg. "ILCE-7SM3 5072108")
     0x8115 => { Name => 'Sony_rtmd_0x8115', Format => 'int16u', %hidUnk }, # seen: 100 - ISO
+  # 0x8119 - seen "P" (same as 0x811e?)
   # 0x8300 - container for other tags in this format
     0x8500 => {
         Name => 'GPSVersionID',

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

@@ -7840,6 +7840,7 @@ my %tagExists = (
 	'adjustedtbnimagewidth' => 1,
 	'adjustmentdata' => 1,
 	'adjustmentssettingsstatisticslightmap' => 1,
+	'adjustmentvalue' => 1,
 	'adobe_cm' => 1,
 	'adobecmtype' => 1,
 	'adobecrw' => 1,
@@ -7948,6 +7949,7 @@ my %tagExists = (
 	'alphaoffset' => 1,
 	'alphapreprocessing' => 1,
 	'alphasample' => 1,
+	'alphavalue' => 1,
 	'alternatealtitude' => 1,
 	'alternateduotonecolors' => 1,
 	'alternateellipsoidheight' => 1,
@@ -8719,11 +8721,26 @@ my %tagExists = (
 	'cleanfaxdata' => 1,
 	'clientid' => 1,
 	'clipboundary' => 1,
+	'clipcenterx' => 1,
+	'clipcentery' => 1,
+	'clipheight' => 1,
+	'cliphflip' => 1,
+	'cliphflipeffect' => 1,
+	'cliphozperspective' => 1,
+	'clipinfovalue' => 1,
 	'clipobjects' => 1,
 	'clippath' => 1,
 	'clippingboundary' => 1,
 	'clippinglimit' => 1,
 	'clippingpathname' => 1,
+	'cliprotate' => 1,
+	'cliprotateeffect' => 1,
+	'cliprotation' => 1,
+	'cliprotationeffect' => 1,
+	'clipverperspective' => 1,
+	'clipvflip' => 1,
+	'clipvflipeffect' => 1,
+	'clipwidth' => 1,
 	'cloneid' => 1,
 	'cloneobject' => 1,
 	'clonetype' => 1,
@@ -8895,6 +8912,7 @@ my %tagExists = (
 	'confidencemapimage' => 1,
 	'confirmedobjectsize' => 1,
 	'connectionspaceilluminant' => 1,
+	'connectortype' => 1,
 	'consecutivebadfaxlines' => 1,
 	'consoledata' => 1,
 	'consolefedata' => 1,
@@ -9183,6 +9201,7 @@ my %tagExists = (
 	'defectlistpacked' => 1,
 	'defineobject' => 1,
 	'definequantizationtable' => 1,
+	'definition' => 1,
 	'delay' => 1,
 	'delaycols' => 1,
 	'delaytime' => 1,
@@ -9420,9 +9439,11 @@ my %tagExists = (
 	'ef' => 1,
 	'effect' => 1,
 	'effectivebw' => 1,
+	'effectleveloriginal' => 1,
 	'effectstrength' => 1,
 	'effectsvisible' => 1,
 	'effecttype' => 1,
+	'effectvalue' => 1,
 	'eighteenpercentpoint' => 1,
 	'eighthlanguage' => 1,
 	'electricalextendermagnification' => 1,
@@ -9469,6 +9490,7 @@ my %tagExists = (
 	'encryption' => 1,
 	'enddate' => 1,
 	'endianness' => 1,
+	'endmotionvideo' => 1,
 	'endpoints' => 1,
 	'endtime' => 1,
 	'endtimecode' => 1,
@@ -9702,6 +9724,7 @@ my %tagExists = (
 	'filmrollnumber' => 1,
 	'filmsize' => 1,
 	'filter' => 1,
+	'filterindication' => 1,
 	'filterinfo' => 1,
 	'filtering' => 1,
 	'filtermodel' => 1,
@@ -9710,6 +9733,7 @@ my %tagExists = (
 	'filterparametersexportexportdata' => 1,
 	'filterpartnumber' => 1,
 	'filterserialnumber' => 1,
+	'filtertype' => 1,
 	'finalflushsequence' => 1,
 	'finalframeblocks' => 1,
 	'finetune' => 1,
@@ -9920,6 +9944,7 @@ my %tagExists = (
 	'genericflagdata01' => 1,
 	'genflags' => 1,
 	'gengraphicsmode' => 1,
+	'genimageversion' => 1,
 	'genmediaheader' => 1,
 	'genmediainfo' => 1,
 	'genmediaversion' => 1,
@@ -10428,15 +10453,25 @@ my %tagExists = (
 	'irwindowtransmission' => 1,
 	'is_protected' => 1,
 	'is_trusted' => 1,
+	'isaifilterreeditonly' => 1,
+	'isapplyshapecorrection' => 1,
 	'isartbokeh' => 1,
 	'isattachment' => 1,
 	'isbasefont' => 1,
+	'isblending' => 1,
+	'isbrightnessipe' => 1,
 	'iscompleted' => 1,
+	'iscontrastipe' => 1,
+	'isdecoreeditonly' => 1,
 	'isdeleted' => 1,
+	'isexposureipe' => 1,
 	'isfixedpitch' => 1,
 	'isfixedv' => 1,
 	'isinfoa100' => 1,
+	'ismotionvideomute' => 1,
 	'isnetworkfeed' => 1,
+	'isnewreeditonly' => 1,
+	'isnotreedit' => 1,
 	'isoautooffset' => 1,
 	'isocalibrationgaintable' => 1,
 	'isoinfo' => 1,
@@ -10449,6 +10484,9 @@ my %tagExists = (
 	'isprotected' => 1,
 	'isrcnumber' => 1,
 	'isrecurring' => 1,
+	'issaturationipe' => 1,
+	'isscaleai' => 1,
+	'istrimmotionvideo' => 1,
 	'isvbr' => 1,
 	'it8header' => 1,
 	'italic' => 1,
@@ -10716,7 +10754,9 @@ my %tagExists = (
 	'licenseedir' => 1,
 	'licenseinfourl' => 1,
 	'licenseurl' => 1,
+	'lightbalance' => 1,
 	'lightingopt' => 1,
+	'lightleveloriginal' => 1,
 	'lightness' => 1,
 	'lightroomworkflow' => 1,
 	'lights' => 1,
@@ -11271,6 +11311,7 @@ my %tagExists = (
 	'nativeyresolution' => 1,
 	'nbcd' => 1,
 	'ncc' => 1,
+	'ndeversion' => 1,
 	'nemoblurkernel' => 1,
 	'nemodarklimit' => 1,
 	'nemogainfactors' => 1,
@@ -11508,6 +11549,8 @@ my %tagExists = (
 	'originalmedia' => 1,
 	'originalmediatype' => 1,
 	'originalmedium' => 1,
+	'originalpath' => 1,
+	'originalpathhashkey' => 1,
 	'originalpayloadframecount' => 1,
 	'originalrawcreator' => 1,
 	'originalrawfiletype' => 1,
@@ -11759,9 +11802,19 @@ my %tagExists = (
 	'popularimeter' => 1,
 	'popupfillattributes' => 1,
 	'popupflash' => 1,
+	'portraiteffectid' => 1,
+	'portraiteffectidoriginal' => 1,
+	'portraiteffectlevel' => 1,
+	'portraiteffectvalue' => 1,
+	'portraitexifrotation' => 1,
+	'portraitlightlevel' => 1,
 	'portraitmatrix' => 1,
 	'portraitoffset' => 1,
+	'portraitrefocusx' => 1,
+	'portraitrefocusy' => 1,
 	'portraittonescaletable' => 1,
+	'portraittouchx' => 1,
+	'portraittouchy' => 1,
 	'poseyawdegrees' => 1,
 	'position' => 1,
 	'postertime' => 1,
@@ -12096,6 +12149,7 @@ my %tagExists = (
 	'redtrc' => 1,
 	'redx' => 1,
 	'redy' => 1,
+	'reeditdata' => 1,
 	'reelnumber' => 1,
 	'reeltimecode' => 1,
 	'reference' => 1,
@@ -12106,6 +12160,8 @@ my %tagExists = (
 	'reflection' => 1,
 	'reflectionhardcopyorigcolorimetry' => 1,
 	'reflectionprintoutputcolorimetry' => 1,
+	'refocusxoriginal' => 1,
+	'refocusyoriginal' => 1,
 	'refresh' => 1,
 	'regionxformtackpoint' => 1,
 	'registerreadtiming' => 1,
@@ -12148,6 +12204,7 @@ my %tagExists = (
 	'replyto' => 1,
 	'representativedisparityfar' => 1,
 	'representativedisparitynear' => 1,
+	'representativeframeloc' => 1,
 	'representativeimage' => 1,
 	'requestid' => 1,
 	'requeststate' => 1,
@@ -12164,6 +12221,7 @@ my %tagExists = (
 	'reservedblob7' => 1,
 	'reservedblob8' => 1,
 	'reservedblob9' => 1,
+	'resize' => 1,
 	'resolutioninfo' => 1,
 	'resolutionxlengthunit' => 1,
 	'resolutionxunit' => 1,
@@ -12440,6 +12498,7 @@ my %tagExists = (
 	'sensorrightborder' => 1,
 	'sensorvelocityeast' => 1,
 	'sensorvelocitynorth' => 1,
+	'sepversion' => 1,
 	'seqcount' => 1,
 	'seqfinal' => 1,
 	'seqframeinfo' => 1,
@@ -12668,6 +12727,7 @@ my %tagExists = (
 	'starring' => 1,
 	'startdate' => 1,
 	'startedgecode' => 1,
+	'startmotionvideo' => 1,
 	'startofframe' => 1,
 	'startreading' => 1,
 	'starttime' => 1,
@@ -13048,6 +13108,7 @@ my %tagExists = (
 	'tonescale9' => 1,
 	'tonescale9spline' => 1,
 	'tonespaceflow' => 1,
+	'tonevalue' => 1,
 	'tonscaletable' => 1,
 	'tool_name' => 1,
 	'tool_version' => 1,
@@ -13070,6 +13131,8 @@ my %tagExists = (
 	'totalparts' => 1,
 	'totalsamples' => 1,
 	'totalsize' => 1,
+	'touchxoriginal' => 1,
+	'touchyoriginal' => 1,
 	'toycamerafilter' => 1,
 	'trackaperture' => 1,
 	'trackcategory' => 1,
@@ -13379,6 +13442,8 @@ my %tagExists = (
 	'watched' => 1,
 	'watercolorfilter' => 1,
 	'watermark' => 1,
+	'watermarkremoved' => 1,
+	'watermarkremovedoriginal' => 1,
 	'watermarktype' => 1,
 	'watermarkurl' => 1,
 	'wave' => 1,
@@ -13432,6 +13497,7 @@ my %tagExists = (
 	'wbredtungsten' => 1,
 	'wbsettings' => 1,
 	'wbsettings2' => 1,
+	'wbtemperature' => 1,
 	'wcsprofiles' => 1,
 	'weaponfired' => 1,
 	'weaponload' => 1,

package/bin/exiftool_files/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 28858 tags, with 17929 unique tag names.
+They contain a total of 28932 tags, with 17990 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
@@ -21924,7 +21924,9 @@ HEIC images from models such as the S10+.
   EmbeddedVideoFile                             no
   EmbeddedVideoType                             no
   MCCData                                       no
-  PEg_Info                                      JSON
+  PEg_Info                                      Samsung PEgInfo
+  ReEditData                                    Samsung ReEditData
+  OriginalPathHashKey                           no
   RemasterInfo                                  no
   SamsungCaptureInfo                            no
   SingleShotDepthMap                            no
@@ -21940,6 +21942,114 @@ HEIC images from models such as the S10+.
      16    DepthMapWidth                        no
      17    DepthMapHeight                       no
 
+=head3 Samsung PEgInfo Tags
+
+  Tag ID               Tag Name                 Writable
+  ------               --------                 --------
+  'connectorType'      ConnectorType            no
+  'genImageVersion'    GenImageVersion          no
+
+=head3 Samsung ReEditData Tags
+
+  Tag ID                 Tag Name               Writable
+  ------                 --------               --------
+  'adjustmentValue'      AdjustmentValue        no
+  'clipInfoValue'        ClipInfoValue          Samsung ClipInfo
+  'effectValue'          EffectValue            Samsung EffectInfo
+  'endMotionVideo'       EndMotionVideo         no
+  'isAIFilterReEditOnly' IsAIFilterReEditOnly   no
+  'isApplyShapeCorrection'
+                         IsApplyShapeCorrection no
+  'isBlending'           IsBlending             no
+  'isDecoReEditOnly'     IsDecoReEditOnly       no
+  'isMotionVideoMute'    IsMotionVideoMute      no
+  'isNewReEditOnly'      IsNewReEditOnly        no
+  'isNotReEdit'          IsNotReEdit            no
+  'isScaleAI'            IsScaleAI              no
+  'isTrimMotionVideo'    IsTrimMotionVideo      no
+  'ndeVersion'           NDEVersion             no
+  'originalPath'         OriginalPath           no
+  'portraitEffectValue'  PortraitEffectValue    Samsung PortraitEffect
+  'reSize'               ReSize                 no
+  'representativeFrameLoc'
+                         RepresentativeFrameLoc no
+  'rotation'             Rotation               no
+  'sepVersion'           SEPVersion             no
+  'startMotionVideo'     StartMotionVideo       no
+  'toneValue'            ToneValue              Samsung ToneInfo
+
+=head3 Samsung ClipInfo Tags
+
+  Tag ID               Tag Name                 Writable
+  ------               --------                 --------
+  'mCenterX'           ClipCenterX              no
+  'mCenterY'           ClipCenterY              no
+  'mHFlip'             ClipHFlip                no
+  'mHFlipEffect'       ClipHFlipEffect          no
+  'mHeight'            ClipHeight               no
+  'mHozPerspective'    ClipHozPerspective       no
+  'mRotate'            ClipRotate               no
+  'mRotateEffect'      ClipRotateEffect         no
+  'mRotation'          ClipRotation             no
+  'mRotationEffect'    ClipRotationEffect       no
+  'mVFlip'             ClipVFlip                no
+  'mVFlipEffect'       ClipVFlipEffect          no
+  'mVerPerspective'    ClipVerPerspective       no
+  'mWidth'             ClipWidth                no
+
+=head3 Samsung EffectInfo Tags
+
+  Tag ID               Tag Name                 Writable
+  ------               --------                 --------
+  'alphaValue'         AlphaValue               no
+  'filterIndication'   FilterIndication         no
+  'filterType'         FilterType               no
+
+=head3 Samsung PortraitEffect Tags
+
+  Tag ID               Tag Name                 Writable
+  ------               --------                 --------
+  'effectId'           PortraitEffectID         no
+  'effectIdOriginal'   PortraitEffectIDOriginal no
+  'effectLevel'        PortraitEffectLevel      no
+  'effectLevelOriginal' EffectLevelOriginal     no
+  'exifRotation'       PortraitExifRotation     no
+  'lightLevel'         PortraitLightLevel       no
+  'lightLevelOriginal' LightLevelOriginal       no
+  'refocusX'           PortraitRefocusX         no
+  'refocusXOriginal'   RefocusXOriginal         no
+  'refocusY'           PortraitRefocusY         no
+  'refocusYOriginal'   RefocusYOriginal         no
+  'touchX'             PortraitTouchX           no
+  'touchXOriginal'     TouchXOriginal           no
+  'touchY'             PortraitTouchY           no
+  'touchYOriginal'     TouchYOriginal           no
+  'waterMarkRemoved'   WaterMarkRemoved         no
+  'waterMarkRemovedOriginal'
+                       WaterMarkRemovedOriginal no
+
+=head3 Samsung ToneInfo Tags
+
+  Tag ID               Tag Name                 Writable
+  ------               --------                 --------
+  'brightness'         Brightness               no
+  'contrast'           Contrast                 no
+  'definition'         Definition               no
+  'exposure'           Exposure                 no
+  'highlight'          Highlight                no
+  'hue'                Hue                      no
+  'isBrightnessIPE'    IsBrightnessIPE          no
+  'isContrastIPE'      IsContrastIPE            no
+  'isExposureIPE'      IsExposureIPE            no
+  'isSaturationIPE'    IsSaturationIPE          no
+  'lightbalance'       Lightbalance             no
+  'saturation'         Saturation               no
+  'shadow'             Shadow                   no
+  'sharpness'          Sharpness                no
+  'tint'               Tint                     no
+  'wbMode'             WBMode                   no
+  'wbTemperature'      WBTemperature            no
+
 =head3 Samsung SingleShotMeta Tags
 
   Tag ID               Tag Name                 Writable
@@ -24074,10 +24184,12 @@ some models when the ExtractEmbedded option is used.
   Tag ID   Tag Name                             Writable
   ------   --------                             --------
   0x8000   FNumber                              no
+  0x8106   FrameRate                            no
   0x8109   ExposureTime                         no
   0x810a   MasterGainAdjustment                 no
   0x810b   ISO                                  no
   0x810c   ElectricalExtenderMagnification      no
+  0x8114   SerialNumber                         no
   0x8500   GPSVersionID                         no
   0x8501   GPSLatitudeRef                       no
   0x8502   GPSLatitude                          no

package/bin/exiftool_files/lib/Image/ExifTool/WriteQuickTime.pl

@@ -1731,7 +1731,14 @@ ItemID2:    foreach $id (reverse sort { $a <=> $b } keys %$items) {
         # (note that $tag may be a binary Keys index here)
         foreach $tag (@addTags) {
             my $tagInfo = $$dirs{$tag} || $$newTags{$tag};
-            next unless ref $tagInfo eq 'HASH'; # (shouldn't happen, but somehow there is forum17260)
+            unless (ref $tagInfo eq 'HASH') { # (shouldn't happen, but somehow there is forum17260)
+                # (also can happen if Meta exists but Keys does not since 'keys' is an array ref.
+                #  SonyPMW-EX1R.mp4 has a Movie-Meta atom with XML and no Keys that triggers this
+                #  issue.  Note that in this case the Meta HandlerType is 'meta' instead of 'mdta',
+                #  which isn't a problem for ExifTool, but may be for other software?)
+                next unless ref $tagInfo eq 'ARRAY';
+                $tagInfo = $et->GetTagInfo($tagTablePtr, $tag) or next;
+            }
             next if defined $$tagInfo{CanCreate} and not $$tagInfo{CanCreate};
             next if defined $$tagInfo{MediaType} and $$et{MediaType} ne $$tagInfo{MediaType};
             my $subdir = $$tagInfo{SubDirectory};

package/bin/exiftool_files/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.41';
+$VERSION = '13.42';
 $RELEASE = '';
 @ISA = qw(Exporter);
 %EXPORT_TAGS = (
@@ -392,9 +392,9 @@ 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'],
+    LRF  => ['MOV',  'Low-Resolution video File'], # (DJI)
     LRI  => ['LRI',  'Light RAW'],
-    LRV  => ['MOV',  'Low-Resolution Video'],
+    LRV  => ['MOV',  'Low-Resolution Video'], # (GoPro)
     M2T  =>  'M2TS',
     M2TS => ['M2TS', 'MPEG-2 Transport Stream'],
     M2V  => ['MPEG', 'MPEG-2 Video'],

package/bin/exiftool_files/windows_exiftool.txt

@@ -744,12 +744,14 @@ OPTIONS
          Specific tags may be imported from the CSV database by adding
          -*TAG* options to the command after -csv=*CSVFILE*, or excluded
          with --*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
-         -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).
+         wildcards in tag names are allowed, but the group name must match
+         exactly the group in the CSV file (eg. a "XMP-dc:Subject" column in
+         the CSV file won't match "-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 -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 -g or -G option adds group names to
          the tag headings. If the -a option is used to allow duplicate tag
@@ -774,8 +776,8 @@ OPTIONS
          importing.
 
          Special feature: -csv+=*CSVFILE* may be used to add items to
-         existing lists. This affects only list-type tags. Also applies to
-         the -j option.
+         existing lists in the file. This affects only list-type tags. Also
+         applies to the -j option.
 
          Note that this and the -plot options are fundamentally different
          than all other output format options because they require
@@ -944,19 +946,21 @@ OPTIONS
          Specific tags may be imported from the JSON database by adding
          -*TAG* options to the command after -j=*JSONFILE*, or excluded with
          --*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
-         -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).
+         in tag names are allowed, but the group name must match exactly the
+         group in the JSON file (eg. a "XMP-dc:Subject" entry in the JSON
+         file won't match "-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 -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 -f option and setting the tag
          value to "-" (or to the MissingTagValue setting if this API option
          was used). Importing with -j+=*JSONFILE* causes new values to be
-         added to existing lists.
+         added to existing lists in the target file.
 
     -l (-long)
          Use long 2-line Canon-style output format. Adds a description and
@@ -1094,7 +1098,7 @@ OPTIONS
 
          produces output like this:
 
-             -- Generated by ExifTool 13.41 --
+             -- 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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "exiftool-vendored.exe",
-  "version": "13.41.0",
+  "version": "13.42.0",
   "description": "Vendored win32 ExifTool for Node.js",
   "main": "./index.js",
   "homepage": "https://github.com/photostructure/exiftool-vendored.exe#readme",
@@ -51,11 +51,11 @@
   },
   "devDependencies": {
     "cross-zip": "^4.0.1",
-    "mocha": "^11.7.4",
-    "npm-check-updates": "^19.1.1",
+    "mocha": "^11.7.5",
+    "npm-check-updates": "^19.1.2",
     "npm-run-all": "4.1.5",
     "prettier": "^3.6.2",
-    "release-it": "^19.0.5",
+    "release-it": "^19.0.6",
     "xml2js": "^0.6.2"
   }
 }