exiftool-vendored.pl 13.47.0 → 13.49.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/bin/Changes +19 -0
- package/bin/META.json +1 -1
- package/bin/META.yml +1 -1
- package/bin/README +2 -2
- package/bin/exiftool +2 -2
- package/bin/lib/Image/ExifTool/Canon.pm +1 -0
- package/bin/lib/Image/ExifTool/Geotag.pm +33 -7
- package/bin/lib/Image/ExifTool/Nikon.pm +4 -2
- package/bin/lib/Image/ExifTool/QuickTime.pm +3 -2
- package/bin/lib/Image/ExifTool/Samsung.pm +18 -2
- package/bin/lib/Image/ExifTool/TagLookup.pm +2 -0
- package/bin/lib/Image/ExifTool/TagNames.pod +3 -1
- package/bin/lib/Image/ExifTool.pm +22 -9
- package/bin/lib/Image/ExifTool.pod +5 -5
- package/bin/perl-Image-ExifTool.spec +1 -1
- package/package.json +1 -1
package/bin/Changes
CHANGED
|
@@ -7,11 +7,30 @@ RSS feed: https://exiftool.org/rss.xml
|
|
|
7
7
|
Note: The most recent production release is Version 13.44. (Other versions are
|
|
8
8
|
considered development releases, and are not uploaded to MetaCPAN.)
|
|
9
9
|
|
|
10
|
+
Feb. 3, 2026 - Version 13.49
|
|
11
|
+
|
|
12
|
+
- Decode a couple of new Samsung trailer tags
|
|
13
|
+
- Fixed problem where Google Photos had problems displaying ExifTool-edited
|
|
14
|
+
HEIC MotionPhoto images. Files written by older versions of ExifTool may be
|
|
15
|
+
repaired by re-writing with 13.49 or later
|
|
16
|
+
- Disable decoding of MenuSettings for the Nikon Z6III firmware 2.0 until the
|
|
17
|
+
changes can be worked through in detail
|
|
18
|
+
|
|
19
|
+
Jan. 31, 2026 - Version 13.48
|
|
20
|
+
|
|
21
|
+
- Added a new Nikon LensID (github #385)
|
|
22
|
+
- Added support for quoted entries in input -geotag CSV files
|
|
23
|
+
- Fixed decoding of Nikon Z6III menu settings for firmware 2.0 update
|
|
24
|
+
- Fixed -fast2 to avoid processing maker notes in some QuickTime-based files
|
|
25
|
+
- Fixed bug introduced in version 13.46 where some tags may be associated with
|
|
26
|
+
the next fix when geotagging from GPX files
|
|
27
|
+
|
|
10
28
|
Jan. 27, 2026 - Version 13.47
|
|
11
29
|
|
|
12
30
|
- Enhanced -fast option to avoid scanning QuickTime MediaData for metadata
|
|
13
31
|
(improves performance when reading CR3 files from slow media, github #384)
|
|
14
32
|
and -fast2 to avoid reading HDRP maker notes
|
|
33
|
+
- Fixed hang problem when reading HDRPMakerNotes from some Google phones
|
|
15
34
|
- API Changes:
|
|
16
35
|
- Added CSV support to GeoUserTag option
|
|
17
36
|
|
package/bin/META.json
CHANGED
package/bin/META.yml
CHANGED
package/bin/README
CHANGED
|
@@ -111,8 +111,8 @@ your home directory, then you would type the following commands in a
|
|
|
111
111
|
terminal window to extract and run ExifTool:
|
|
112
112
|
|
|
113
113
|
cd ~/Desktop
|
|
114
|
-
gzip -dc Image-ExifTool-13.
|
|
115
|
-
cd Image-ExifTool-13.
|
|
114
|
+
gzip -dc Image-ExifTool-13.49.tar.gz | tar -xf -
|
|
115
|
+
cd Image-ExifTool-13.49
|
|
116
116
|
./exiftool t/images/ExifTool.jpg
|
|
117
117
|
|
|
118
118
|
Note: These commands extract meta information from one of the test images.
|
package/bin/exiftool
CHANGED
|
@@ -11,7 +11,7 @@ use strict;
|
|
|
11
11
|
use warnings;
|
|
12
12
|
require 5.004;
|
|
13
13
|
|
|
14
|
-
my $version = '13.
|
|
14
|
+
my $version = '13.49';
|
|
15
15
|
|
|
16
16
|
$^W = 1; # enable global warnings
|
|
17
17
|
|
|
@@ -6136,7 +6136,7 @@ with this command:
|
|
|
6136
6136
|
|
|
6137
6137
|
produces output like this:
|
|
6138
6138
|
|
|
6139
|
-
-- Generated by ExifTool 13.
|
|
6139
|
+
-- Generated by ExifTool 13.49 --
|
|
6140
6140
|
File: a.jpg - 2003:10:31 15:44:19
|
|
6141
6141
|
(f/5.6, 1/60s, ISO 100)
|
|
6142
6142
|
File: b.jpg - 2006:05:23 11:57:38
|
|
@@ -36,7 +36,7 @@ use vars qw($VERSION);
|
|
|
36
36
|
use Image::ExifTool qw(:Public);
|
|
37
37
|
use Image::ExifTool::GPS;
|
|
38
38
|
|
|
39
|
-
$VERSION = '1.
|
|
39
|
+
$VERSION = '1.87';
|
|
40
40
|
|
|
41
41
|
sub JITTER() { return 2 } # maximum time jitter
|
|
42
42
|
|
|
@@ -137,6 +137,31 @@ my %otherConv = (
|
|
|
137
137
|
|
|
138
138
|
my $secPerDay = 24 * 3600; # a useful constant
|
|
139
139
|
|
|
140
|
+
#------------------------------------------------------------------------------
|
|
141
|
+
# Split a line of CSV
|
|
142
|
+
# Inputs: 0) line to split, 1) delimiter
|
|
143
|
+
# Returns: list of items
|
|
144
|
+
sub SplitCSV($$)
|
|
145
|
+
{
|
|
146
|
+
my ($line, $delim) = @_;
|
|
147
|
+
my @toks = split /\Q$delim/, $line;
|
|
148
|
+
my (@vals, $v);
|
|
149
|
+
while (@toks) {
|
|
150
|
+
($v = shift @toks) =~ s/^ +//; # remove leading spaces
|
|
151
|
+
if ($v =~ s/^"//) {
|
|
152
|
+
# quoted value must end in an odd number of quotes
|
|
153
|
+
while ($v !~ /("+)\s*$/ or not length($1) & 1) {
|
|
154
|
+
last unless @toks;
|
|
155
|
+
$v .= $delim . shift @toks;
|
|
156
|
+
}
|
|
157
|
+
$v =~ s/"\s*$//; # remove trailing quote and whitespace
|
|
158
|
+
$v =~ s/""/"/g; # un-escape quotes
|
|
159
|
+
}
|
|
160
|
+
push @vals, $v;
|
|
161
|
+
}
|
|
162
|
+
return @vals;
|
|
163
|
+
}
|
|
164
|
+
|
|
140
165
|
#------------------------------------------------------------------------------
|
|
141
166
|
# Load GPS track log file
|
|
142
167
|
# Inputs: 0) ExifTool ref, 1) track log data or file name
|
|
@@ -281,7 +306,7 @@ sub LoadTrackLog($$;$)
|
|
|
281
306
|
$format = 'Bramor';
|
|
282
307
|
} elsif (((/\b(GPS)?Date/i and /\b(GPS)?(Date)?Time/i) or /\bTime\(seconds\)/i) and /\Q$csvDelim/) {
|
|
283
308
|
chomp;
|
|
284
|
-
@csvHeadings =
|
|
309
|
+
@csvHeadings = SplitCSV($_, $csvDelim);
|
|
285
310
|
my $isColumbus = ($csvHeadings[0] and $csvHeadings[0] eq 'INDEX'); # (Columbus GPS logger)
|
|
286
311
|
$format = 'CSV';
|
|
287
312
|
# convert recognized headings to our parameter names
|
|
@@ -382,7 +407,8 @@ sub LoadTrackLog($$;$)
|
|
|
382
407
|
# parse attributes (eg. GPX 'lat' and 'lon')
|
|
383
408
|
# (note: ignore namespace prefixes if they exist)
|
|
384
409
|
if ($arg =~ /^(\w+:)?(\w+)=(['"])(.*?)\3/g) {
|
|
385
|
-
my $tag = $xmlTag{lc $2}
|
|
410
|
+
my $tag = $xmlTag{lc $2};
|
|
411
|
+
$tag = $userTag{lc $2} unless defined $tag;
|
|
386
412
|
if ($tag) {
|
|
387
413
|
$$fix{$tag} = $4;
|
|
388
414
|
if ($keyCategory{$tag}) {
|
|
@@ -399,7 +425,8 @@ sub LoadTrackLog($$;$)
|
|
|
399
425
|
# loop through XML elements
|
|
400
426
|
while ($arg =~ m{([^<>]*)<(/)?(\w+:)?(\w+)(>|$)}g) {
|
|
401
427
|
$tok = lc $4;
|
|
402
|
-
my $tag = $xmlTag{$tok}
|
|
428
|
+
my $tag = $xmlTag{$tok};
|
|
429
|
+
$tag = $userTag{$tok} unless defined $tag;
|
|
403
430
|
# parse as a simple property if this element has a value
|
|
404
431
|
if (defined $tag and not $tag) {
|
|
405
432
|
# a containing property was opened or closed
|
|
@@ -530,7 +557,7 @@ DoneFix: $isDate = 1;
|
|
|
530
557
|
goto DoneFix; # save this fix
|
|
531
558
|
} elsif ($format eq 'CSV') {
|
|
532
559
|
chomp;
|
|
533
|
-
my @vals =
|
|
560
|
+
my @vals = SplitCSV($_, $csvDelim);
|
|
534
561
|
#
|
|
535
562
|
# CSV format output of GPS/IMU POS system
|
|
536
563
|
# Date* - date in DD/MM/YYYY format
|
|
@@ -1557,8 +1584,7 @@ sub ConvertGeosync($$)
|
|
|
1557
1584
|
# Returns: UTC time string with fractional seconds
|
|
1558
1585
|
sub PrintFixTime($)
|
|
1559
1586
|
{
|
|
1560
|
-
my $time =
|
|
1561
|
-
my $fsec = int(($time - int($time)) * 1000);
|
|
1587
|
+
my $time = shift;
|
|
1562
1588
|
return Image::ExifTool::ConvertUnixTime($time, undef, 3) . ' UTC';
|
|
1563
1589
|
}
|
|
1564
1590
|
|
|
@@ -65,7 +65,7 @@ use Image::ExifTool::Exif;
|
|
|
65
65
|
use Image::ExifTool::GPS;
|
|
66
66
|
use Image::ExifTool::XMP;
|
|
67
67
|
|
|
68
|
-
$VERSION = '4.
|
|
68
|
+
$VERSION = '4.54';
|
|
69
69
|
|
|
70
70
|
sub LensIDConv($$$);
|
|
71
71
|
sub ProcessNikonAVI($$$);
|
|
@@ -576,6 +576,7 @@ sub GetAFPointGrid($$;$);
|
|
|
576
576
|
'00 40 2D 88 2C 40 00 06' => 'Tamron AF 18-250mm f/3.5-6.3 Di II LD Aspherical (IF) Macro (A18NII)', #JD
|
|
577
577
|
'F5 40 2C 8A 2C 40 40 0E' => 'Tamron AF 18-270mm f/3.5-6.3 Di II VC LD Aspherical (IF) Macro (B003)',
|
|
578
578
|
'F0 3F 2D 8A 2C 40 DF 0E' => 'Tamron AF 18-270mm f/3.5-6.3 Di II VC PZD (B008)',
|
|
579
|
+
'E0 40 2D 98 2C 41 DF 0E' => 'Tamron 18-400mm f/3.5-6.3 Di II VC HLD (B028)', #github385 (D90)
|
|
579
580
|
'E0 40 2D 98 2C 41 DF 4E' => 'Tamron 18-400mm f/3.5-6.3 Di II VC HLD (B028)', # (removed AF designation, ref 37)
|
|
580
581
|
'07 40 2F 44 2C 34 03 02' => 'Tamron AF 19-35mm f/3.5-4.5 (A10)',
|
|
581
582
|
'07 40 30 45 2D 35 03 02.1' => 'Tamron AF 19-35mm f/3.5-4.5 (A10)',
|
|
@@ -8672,8 +8673,9 @@ my %nikonFocalConversions = (
|
|
|
8672
8673
|
},
|
|
8673
8674
|
0x90 => {
|
|
8674
8675
|
Name => 'MenuOffset',
|
|
8675
|
-
Condition => '$$self{Model} =~ /^NIKON Z6_3\b/i',
|
|
8676
|
+
Condition => '$$self{Model} =~ /^NIKON Z6_3\b/i and $$self{FirmwareVersion} and $$self{FirmwareVersion} lt "02.00"',
|
|
8676
8677
|
Format => 'int32u',
|
|
8678
|
+
AlwaysDecrypt => 1, # (necessary because FirmwareVersion is extracted after decryption time)
|
|
8677
8679
|
SubDirectory => {
|
|
8678
8680
|
TagTable => 'Image::ExifTool::Nikon::MenuSettingsZ6III',
|
|
8679
8681
|
Start => '$val',
|
|
@@ -49,7 +49,7 @@ use Image::ExifTool qw(:DataAccess :Utils);
|
|
|
49
49
|
use Image::ExifTool::Exif;
|
|
50
50
|
use Image::ExifTool::GPS;
|
|
51
51
|
|
|
52
|
-
$VERSION = '3.
|
|
52
|
+
$VERSION = '3.28';
|
|
53
53
|
|
|
54
54
|
sub ProcessMOV($$;$);
|
|
55
55
|
sub ProcessKeys($$$);
|
|
@@ -972,6 +972,7 @@ my %userDefined = (
|
|
|
972
972
|
Binary => 1,
|
|
973
973
|
# note that this may be written and/or deleted, but can't currently be added back again
|
|
974
974
|
Writable => 'undef',
|
|
975
|
+
WriteLast => 1, # (must come after mdat according to https://developer.android.com/media/platform/motion-photo-format)
|
|
975
976
|
},
|
|
976
977
|
# '35AX'? - seen "AT" (Yada RoadCam Pro 4K dashcam)
|
|
977
978
|
cust => 'CustomInfo', # 70mai A810
|
|
@@ -10325,7 +10326,7 @@ ItemID: foreach $id (reverse sort { $a <=> $b } keys %$items) {
|
|
|
10325
10326
|
if ($tag eq 'ipco' and not $$et{IsItemProperty}) {
|
|
10326
10327
|
$$et{ItemPropertyContainer} = [ \%dirInfo, $subTable, $proc ];
|
|
10327
10328
|
$et->VPrint(0,"$$et{INDENT}\[Process ipco box later]");
|
|
10328
|
-
}
|
|
10329
|
+
} elsif ($fast < 2 or not $$tagInfo{MakerNotes}) {
|
|
10329
10330
|
$et->ProcessDirectory(\%dirInfo, $subTable, $proc);
|
|
10330
10331
|
}
|
|
10331
10332
|
}
|
|
@@ -23,7 +23,7 @@ use Image::ExifTool qw(:DataAccess :Utils);
|
|
|
23
23
|
use Image::ExifTool::Exif;
|
|
24
24
|
use Image::ExifTool::JSON;
|
|
25
25
|
|
|
26
|
-
$VERSION = '1.
|
|
26
|
+
$VERSION = '1.61';
|
|
27
27
|
|
|
28
28
|
sub WriteSTMN($$$);
|
|
29
29
|
sub ProcessINFO($$$);
|
|
@@ -1007,7 +1007,23 @@ my %formatMinMax = (
|
|
|
1007
1007
|
# the Google trailer, but keep this copy named as EmbeddedVideoFile
|
|
1008
1008
|
# for backward compatibility and to avoid confusion due to extracting
|
|
1009
1009
|
# multiple tags with the same name
|
|
1010
|
-
'0x0a30' => {
|
|
1010
|
+
'0x0a30' => [{
|
|
1011
|
+
Name => 'EmbeddedVideoOffsetSize',
|
|
1012
|
+
# (have seen 12-byte data starting with "mpv2" that contains
|
|
1013
|
+
# absolute file offset and size of embedded video)
|
|
1014
|
+
Condition => 'length $$valPt == 12',
|
|
1015
|
+
ValueConv => 'join(" ", unpack("x4N2", $val))',
|
|
1016
|
+
},{ #forum7161
|
|
1017
|
+
Name => 'EmbeddedVideoFile',
|
|
1018
|
+
Groups => { 2 => 'Video' },
|
|
1019
|
+
Binary => 1,
|
|
1020
|
+
}],
|
|
1021
|
+
# 0x0a31-name - seen MotionPhoto_Version
|
|
1022
|
+
'0x0a33' => { # seen MotionPhoto_AutoPlay
|
|
1023
|
+
Name => 'MotionPhotoAutoPlayVideo',
|
|
1024
|
+
Groups => { 2 => 'Video' },
|
|
1025
|
+
Binary => 1,
|
|
1026
|
+
},
|
|
1011
1027
|
# 0x0a41-name - seen 'BackupRestore_Data' #forum16086
|
|
1012
1028
|
# 0x0aa1-name - seen 'MCC_Data'
|
|
1013
1029
|
# 0x0aa1 - seen '204','222','234','302','429'
|
|
@@ -9491,6 +9491,7 @@ my %tagExists = (
|
|
|
9491
9491
|
'embeddedpng' => 1,
|
|
9492
9492
|
'embeddedvideo' => 1,
|
|
9493
9493
|
'embeddedvideofile' => 1,
|
|
9494
|
+
'embeddedvideooffsetsize' => 1,
|
|
9494
9495
|
'embeddedvideotype' => 1,
|
|
9495
9496
|
'emergencysos' => 1,
|
|
9496
9497
|
'emphasis' => 1,
|
|
@@ -11266,6 +11267,7 @@ my %tagExists = (
|
|
|
11266
11267
|
'moresettings' => 1,
|
|
11267
11268
|
'moresettingsoffset' => 1,
|
|
11268
11269
|
'mosaicpattern' => 1,
|
|
11270
|
+
'motionphotoautoplayvideo' => 1,
|
|
11269
11271
|
'mouthmodify' => 1,
|
|
11270
11272
|
'movableinfo' => 1,
|
|
11271
11273
|
'moveobjects' => 1,
|
|
@@ -12,7 +12,7 @@ meta information extracted from or written to a file.
|
|
|
12
12
|
=head1 TAG TABLES
|
|
13
13
|
|
|
14
14
|
The tables listed below give the names of all tags recognized by ExifTool.
|
|
15
|
-
They contain a total of
|
|
15
|
+
They contain a total of 29036 tags, with 18045 unique tag names.
|
|
16
16
|
|
|
17
17
|
B<Tag ID>, B<Index#> or B<Sequence> is given in the first column of each
|
|
18
18
|
table. A B<Tag ID> is the computer-readable equivalent of a tag name, and
|
|
@@ -21956,9 +21956,11 @@ HEIC images from models such as the S10+.
|
|
|
21956
21956
|
EmbeddedImage no
|
|
21957
21957
|
EmbeddedImage2 no
|
|
21958
21958
|
EmbeddedImageName no
|
|
21959
|
+
EmbeddedVideoOffsetSize no
|
|
21959
21960
|
EmbeddedVideoFile no
|
|
21960
21961
|
EmbeddedVideoType no
|
|
21961
21962
|
MCCData no
|
|
21963
|
+
MotionPhotoAutoPlayVideo no
|
|
21962
21964
|
PEg_Info Samsung PEgInfo
|
|
21963
21965
|
ReEditData Samsung ReEditData
|
|
21964
21966
|
OriginalPathHashKey no
|
|
@@ -29,7 +29,7 @@ use vars qw($VERSION $RELEASE @ISA @EXPORT_OK %EXPORT_TAGS $AUTOLOAD @fileTypes
|
|
|
29
29
|
%jpegMarker %specialTags %fileTypeLookup $testLen $exeDir
|
|
30
30
|
%static_vars $advFmtSelf $configFile @configFiles $noConfig);
|
|
31
31
|
|
|
32
|
-
$VERSION = '13.
|
|
32
|
+
$VERSION = '13.49';
|
|
33
33
|
$RELEASE = '';
|
|
34
34
|
@ISA = qw(Exporter);
|
|
35
35
|
%EXPORT_TAGS = (
|
|
@@ -1045,8 +1045,8 @@ $testLen = 1024; # number of bytes to read when testing for magic number
|
|
|
1045
1045
|
# file types with weak magic number recognition
|
|
1046
1046
|
my %weakMagic = ( MP3 => 1 );
|
|
1047
1047
|
|
|
1048
|
-
# file types that are determined by the process proc when FastScan
|
|
1049
|
-
# (when done, the process proc must exit after SetFileType if FastScan is
|
|
1048
|
+
# file types that are determined by the process proc when FastScan > 2
|
|
1049
|
+
# (when done, the process proc must exit after SetFileType if FastScan is > 2)
|
|
1050
1050
|
my %processType = map { $_ => 1 } qw(JPEG TIFF XMP AIFF EXE Font PS Real VCard TXT);
|
|
1051
1051
|
|
|
1052
1052
|
# Compact/XMPShorthand option settings
|
|
@@ -3015,8 +3015,8 @@ sub ExtractInfo($;@)
|
|
|
3015
3015
|
# save file type in member variable
|
|
3016
3016
|
$$self{FILE_TYPE} = $type;
|
|
3017
3017
|
$dirInfo{Parent} = ($type eq 'TIFF') ? $tiffType : $type;
|
|
3018
|
-
# don't process the file when FastScan
|
|
3019
|
-
if ($fast
|
|
3018
|
+
# don't process the file when FastScan > 2
|
|
3019
|
+
if ($fast > 2 and not $processType{$type}) {
|
|
3020
3020
|
unless ($weakMagic{$type} and (not $ext or $ext ne $type)) {
|
|
3021
3021
|
$self->SetFileType($dirInfo{Parent});
|
|
3022
3022
|
}
|
|
@@ -7256,7 +7256,7 @@ sub ProcessJPEG($$;$)
|
|
|
7256
7256
|
}
|
|
7257
7257
|
if (not $$self{VALUE}{FileType} or ($$self{DOC_NUM} and $$options{ExtractEmbedded})) {
|
|
7258
7258
|
$self->SetFileType(); # set FileType tag
|
|
7259
|
-
return 1 if $fast
|
|
7259
|
+
return 1 if $fast > 2; # don't process file when FastScan > 2
|
|
7260
7260
|
$$self{LOW_PRIORITY_DIR}{IFD1} = 1; # lower priority of IFD1 tags
|
|
7261
7261
|
}
|
|
7262
7262
|
$$raf{NoBuffer} = 1 if $self->Options('FastScan'); # disable buffering in FastScan mode
|
|
@@ -8636,8 +8636,8 @@ sub DoProcessTIFF($$;$)
|
|
|
8636
8636
|
my $t = ($baseType eq 'TIFF' or $fileType =~ /RAW/) ? $fileType : undef;
|
|
8637
8637
|
$self->SetFileType($t);
|
|
8638
8638
|
}
|
|
8639
|
-
# don't process file if FastScan
|
|
8640
|
-
return 1 if not $outfile and $$self{OPTIONS}{FastScan} and $$self{OPTIONS}{FastScan}
|
|
8639
|
+
# don't process file if FastScan > 2
|
|
8640
|
+
return 1 if not $outfile and $$self{OPTIONS}{FastScan} and $$self{OPTIONS}{FastScan} > 2;
|
|
8641
8641
|
}
|
|
8642
8642
|
# (accommodate CR3 images which have a TIFF directory with ExifIFD at the top level)
|
|
8643
8643
|
my $ifdName = ($$dirInfo{DirName} and $$dirInfo{DirName} =~ /^(ExifIFD|GPS)$/) ? $1 : 'IFD0';
|
|
@@ -9229,12 +9229,22 @@ sub HandleTag($$$$;%)
|
|
|
9229
9229
|
my ($self, $tagTablePtr, $tag, $val, %parms) = @_;
|
|
9230
9230
|
my $verbose = $$self{OPTIONS}{Verbose};
|
|
9231
9231
|
my $pfmt = $parms{Format};
|
|
9232
|
-
my $
|
|
9232
|
+
my $valPt = defined $val ? \$val : undef;
|
|
9233
|
+
my $tagInfo = $parms{TagInfo} || $self->GetTagInfo($tagTablePtr, $tag, $valPt, $pfmt, $parms{Count});
|
|
9233
9234
|
my $dataPt = $parms{DataPt};
|
|
9234
9235
|
my ($subdir, $format, $noTagInfo, $rational, $binVal);
|
|
9235
9236
|
|
|
9236
9237
|
if ($tagInfo) {
|
|
9237
9238
|
$subdir = $$tagInfo{SubDirectory};
|
|
9239
|
+
} elsif (defined $tagInfo and $dataPt) {
|
|
9240
|
+
my $start = $parms{Start} || 0;
|
|
9241
|
+
my $size = $parms{Size};
|
|
9242
|
+
$size = length($$dataPt) - $start unless defined $size;
|
|
9243
|
+
return undef if $start + $size > length($$dataPt);
|
|
9244
|
+
$size = 1024 if $size > 1024; # max 1024 bytes available for the Condition
|
|
9245
|
+
my $dat = substr($$dataPt, $start, $size);
|
|
9246
|
+
$tagInfo = $self->GetTagInfo($tagTablePtr, $tag, \$dat, $pfmt, $parms{Count});
|
|
9247
|
+
return undef unless $tagInfo;
|
|
9238
9248
|
} elsif ($parms{MakeTagInfo}) {
|
|
9239
9249
|
$self->VPrint(0, $$self{INDENT}, "[adding $tag]\n") if $verbose;
|
|
9240
9250
|
my $name = $tag;
|
|
@@ -9288,6 +9298,9 @@ sub HandleTag($$$$;%)
|
|
|
9288
9298
|
}
|
|
9289
9299
|
if ($tagInfo) {
|
|
9290
9300
|
if ($subdir) {
|
|
9301
|
+
if ($$tagInfo{MakerNotes} and $$self{OPTIONS}{FastScan} and $$self{OPTIONS}{FastScan} > 1) {
|
|
9302
|
+
return undef; # don't process maker note directories when FastScan > 1
|
|
9303
|
+
}
|
|
9291
9304
|
my $subdirStart = $parms{Start};
|
|
9292
9305
|
my $subdirLen = $parms{Size};
|
|
9293
9306
|
if ($$tagInfo{RawConv} and not $$tagInfo{Writable}) {
|
|
@@ -819,11 +819,11 @@ Reference units for writing GPSSpeed when geotagging:
|
|
|
819
819
|
|
|
820
820
|
Additional user-defined tags to write when geotagging from GPX or CSV files.
|
|
821
821
|
Format is 'I<TAG>=I<TOKEN>,...' where I<TAG> is an ExifTool tag name (with
|
|
822
|
-
optional group name), and I<TOKEN> is is the property name
|
|
823
|
-
|
|
824
|
-
|
|
825
|
-
|
|
826
|
-
|
|
822
|
+
optional group name), and I<TOKEN> is is the GPX property name or CSV column
|
|
823
|
+
name. eg) C<Location=desc> will write the Location tag based on the value
|
|
824
|
+
of 'desc' in the GPS log file. The tag value is taken from the nearest fix
|
|
825
|
+
in time. Multiple tags may be specified using comma separators. Default is
|
|
826
|
+
undef.
|
|
827
827
|
|
|
828
828
|
=item GlobalTimeShift
|
|
829
829
|
|
package/package.json
CHANGED