exiftool-vendored.exe 12.39.0 → 12.42.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/exiftool_files/Changes +66 -1
- package/bin/exiftool_files/README +2 -2
- package/bin/exiftool_files/arg_files/exif2xmp.args +5 -0
- package/bin/exiftool_files/arg_files/xmp2exif.args +6 -0
- package/bin/exiftool_files/config_files/acdsee.config +6 -6
- package/bin/exiftool_files/config_files/photoshop_paths.config +30 -7
- package/bin/exiftool_files/config_files/picasa_faces.config +1 -1
- package/bin/exiftool_files/config_files/pix4d.config +2 -2
- package/bin/exiftool_files/config_files/tiff_version.config +2 -2
- package/bin/exiftool_files/exiftool.pl +53 -20
- package/bin/exiftool_files/lib/Image/ExifTool/Canon.pm +89 -6
- package/bin/exiftool_files/lib/Image/ExifTool/DJI.pm +59 -1
- package/bin/exiftool_files/lib/Image/ExifTool/DNG.pm +8 -2
- package/bin/exiftool_files/lib/Image/ExifTool/Exif.pm +53 -20
- package/bin/exiftool_files/lib/Image/ExifTool/Geotag.pm +3 -2
- package/bin/exiftool_files/lib/Image/ExifTool/ICC_Profile.pm +10 -8
- package/bin/exiftool_files/lib/Image/ExifTool/ID3.pm +5 -5
- package/bin/exiftool_files/lib/Image/ExifTool/MacOS.pm +9 -9
- package/bin/exiftool_files/lib/Image/ExifTool/MakerNotes.pm +17 -1
- package/bin/exiftool_files/lib/Image/ExifTool/Nikon.pm +44 -12
- package/bin/exiftool_files/lib/Image/ExifTool/NikonCustom.pm +4 -1
- package/bin/exiftool_files/lib/Image/ExifTool/Olympus.pm +27 -7
- package/bin/exiftool_files/lib/Image/ExifTool/PDF.pm +2 -1
- package/bin/exiftool_files/lib/Image/ExifTool/Panasonic.pm +10 -1
- package/bin/exiftool_files/lib/Image/ExifTool/Pentax.pm +1 -1
- package/bin/exiftool_files/lib/Image/ExifTool/Photoshop.pm +6 -5
- package/bin/exiftool_files/lib/Image/ExifTool/QuickTime.pm +9 -5
- package/bin/exiftool_files/lib/Image/ExifTool/QuickTimeStream.pl +2 -2
- package/bin/exiftool_files/lib/Image/ExifTool/Samsung.pm +237 -2
- package/bin/exiftool_files/lib/Image/ExifTool/Shortcuts.pm +3 -1
- package/bin/exiftool_files/lib/Image/ExifTool/Sony.pm +10 -4
- package/bin/exiftool_files/lib/Image/ExifTool/TagLookup.pm +6376 -6354
- package/bin/exiftool_files/lib/Image/ExifTool/TagNames.pod +79 -28
- package/bin/exiftool_files/lib/Image/ExifTool/WriteQuickTime.pl +7 -3
- package/bin/exiftool_files/lib/Image/ExifTool/WriteXMP.pl +2 -0
- package/bin/exiftool_files/lib/Image/ExifTool/Writer.pl +1 -1
- package/bin/exiftool_files/lib/Image/ExifTool/XMP.pm +9 -1
- package/bin/exiftool_files/lib/Image/ExifTool/XMPStruct.pl +21 -7
- package/bin/exiftool_files/lib/Image/ExifTool.pm +20 -12
- package/bin/exiftool_files/lib/Image/ExifTool.pod +7 -6
- package/package.json +14 -3
|
@@ -4,9 +4,74 @@ ExifTool Version History
|
|
|
4
4
|
|
|
5
5
|
RSS feed: https://exiftool.org/rss.xml
|
|
6
6
|
|
|
7
|
-
Note: The most recent production release is Version 12.
|
|
7
|
+
Note: The most recent production release is Version 12.42. (Other versions are
|
|
8
8
|
considered development releases, and are not uploaded to MetaCPAN.)
|
|
9
9
|
|
|
10
|
+
June 1, 2022 - Version 12.42 (production release)
|
|
11
|
+
|
|
12
|
+
- Added support for reading maker notes from Panasonic DC-GH6 videos
|
|
13
|
+
- Added conversion for Samsung MCCData
|
|
14
|
+
- Added a new Nikon LensID (thanks Chris)
|
|
15
|
+
- Added a few new Canon LensType values
|
|
16
|
+
- Added a couple of new Olympus StackedImage values (thanks Eberhard)
|
|
17
|
+
- Added a few new values for some Nikon Settings tags (thanks Warren Hatch)
|
|
18
|
+
- Added a "lang:" element to the -json output for alternate language tags when
|
|
19
|
+
-D, -H or -t is used
|
|
20
|
+
- Update DNG writer to not issue an error when writing DNG 1.6 files
|
|
21
|
+
- Decode information from DJI "ae_dbg_info" maker notes
|
|
22
|
+
- Decode Olympus AISubjectTrackingMode
|
|
23
|
+
- Changed ExifTool FileSize print conversion to use kB/MB/GB units instead of
|
|
24
|
+
KiB/MiB/GiB
|
|
25
|
+
- Changed "is not shiftable" warning to appear in -v (instead of just -v3)
|
|
26
|
+
output
|
|
27
|
+
- Patched to allow PDF Encrypt object to be "null"
|
|
28
|
+
- Fixed bug reading ICC_Profile 'meta' tags
|
|
29
|
+
|
|
30
|
+
Apr. 7, 2022 - Version 12.41
|
|
31
|
+
|
|
32
|
+
- Added support for "OM SYSTEM" maker notes
|
|
33
|
+
- Added 2 new Sony LensType values (thanks Jos Roost)
|
|
34
|
+
- Added some new Canon lenses (thanks LibRaw)
|
|
35
|
+
- Added a new Nikon LensID (thanks Bert Ligtvoet)
|
|
36
|
+
- Added a new Canon ContinuousDrive value (thanks Wolfgang Gulcker)
|
|
37
|
+
- Enhanced -v0 option to also print new file name when renaming, moving or
|
|
38
|
+
copying a file
|
|
39
|
+
- Updated xmp2exif.args and exif2xmp.args helper files to reflect the IPTC
|
|
40
|
+
Photometadata Mapping Guidelines version 2202.1
|
|
41
|
+
- Made "Invalid Xxx data" a minor warning for MakerNote data
|
|
42
|
+
- Patched to allow writing of MP4 videos which have other tracks with a
|
|
43
|
+
missing sample description entry
|
|
44
|
+
- Patched MacOS version to specify directory for external utilities (setfile,
|
|
45
|
+
xattr, stat, mdls and osascript from /usr/bin, and tag from /usr/local/bin)
|
|
46
|
+
- Fixed long-standing problem where Windows version could behave differently
|
|
47
|
+
for -if conditions containing undefined tags
|
|
48
|
+
- Fixed problem where -W+! combined with -j or -X produced invalid JSON or XML
|
|
49
|
+
when processing multiple files
|
|
50
|
+
- Fixed potential "uninitialized value $time in division" runtime warning when
|
|
51
|
+
reading MP4 videos
|
|
52
|
+
|
|
53
|
+
Feb. 9, 2022 - Version 12.40
|
|
54
|
+
|
|
55
|
+
- Added PageCount tag to return the number of pages in a multi-page TIFF
|
|
56
|
+
- Added a new Nikon LensID (thanks Wolfgang Exler)
|
|
57
|
+
- Added a few more Sony LensTypes (thanks Jos Roost)
|
|
58
|
+
- Decode some new Canon tags (thanks Mark Reid)
|
|
59
|
+
- Decode another Nikon Z9 tag (thanks Warren Hatch)
|
|
60
|
+
- Decode Nikon NKSC GPSImgDirection (thanks Olaf)
|
|
61
|
+
- Improved handling of empty XMP structures in lists
|
|
62
|
+
- Tolerate leading UTF-8 BOM in -geotag log files
|
|
63
|
+
- Updated photoshop_paths.config to include WorkingPath
|
|
64
|
+
- Patched to allow writing of MP4 videos which have url tracks with a missing
|
|
65
|
+
sample description entry
|
|
66
|
+
- Fixed deep recursion error when reading multi-page TIFF images with more
|
|
67
|
+
than 100 pages
|
|
68
|
+
- Fixed potential deep recursion runtime error when writing nested XMP
|
|
69
|
+
structures
|
|
70
|
+
- Fixed warning which could be generated when writing new
|
|
71
|
+
Composite:GPSCoordinates tag
|
|
72
|
+
- Fixed description of GPR (General Purpose RAW) file type
|
|
73
|
+
- Fixed typo in the name of a new Nikon tag (thanks Herb)
|
|
74
|
+
|
|
10
75
|
Jan. 13, 2022 - Version 12.39
|
|
11
76
|
|
|
12
77
|
- Added a new Pentax LensType (thanks Christian Shulz)
|
|
@@ -107,8 +107,8 @@ your home directory, then you would type the following commands in a
|
|
|
107
107
|
terminal window to extract and run ExifTool:
|
|
108
108
|
|
|
109
109
|
cd ~/Desktop
|
|
110
|
-
gzip -dc Image-ExifTool-12.
|
|
111
|
-
cd Image-ExifTool-12.
|
|
110
|
+
gzip -dc Image-ExifTool-12.42.tar.gz | tar -xf -
|
|
111
|
+
cd Image-ExifTool-12.42
|
|
112
112
|
./exiftool t/images/ExifTool.jpg
|
|
113
113
|
|
|
114
114
|
Note: These commands extract meta information from one of the test images.
|
|
@@ -12,8 +12,10 @@
|
|
|
12
12
|
# 2013/06/12 - PH Additions for the Exif 2.3 for XMP spec
|
|
13
13
|
# 2015/01/12 - PH Avoid copying to non-standard namespaces
|
|
14
14
|
# 2018/05/07 - PH Added support for GPSDestXxxRef tags
|
|
15
|
+
# 2022/03/31 - PH IPTC Photometadata Mapping Guidelines 2202.1 update
|
|
15
16
|
#
|
|
16
17
|
# References: http://www.metadataworkinggroup.org/specs/
|
|
18
|
+
# https://iptc.org/std/photometadata/documentation/mappingguidelines/
|
|
17
19
|
#
|
|
18
20
|
# Notes: 1) The first three arguments copy most of the EXIF and GPS tags to
|
|
19
21
|
# XMP-exif/XMP-tiff, and the remaining arguments handle tags
|
|
@@ -22,6 +24,8 @@
|
|
|
22
24
|
# 2) These arguments will not delete existing XMP tags which are
|
|
23
25
|
# missing from the EXIF. The XMP tags should be deleted
|
|
24
26
|
# beforehand if required.
|
|
27
|
+
#
|
|
28
|
+
# 3) EXIF:SubjectArea is not currently mapped into XMP-iptcExt:ImageRegion
|
|
25
29
|
#------------------------------------------------------------------------------
|
|
26
30
|
-XMP-exif:all < EXIF:all
|
|
27
31
|
-XMP-exifEX:all < EXIF:all
|
|
@@ -37,6 +41,7 @@
|
|
|
37
41
|
-XMP-xmp:CreatorTool < EXIF:Software
|
|
38
42
|
-XMP-dc:Rights < EXIF:Copyright
|
|
39
43
|
-XMP-dc:Creator < EXIF:Artist
|
|
44
|
+
-XMP-iptcExt:DigitalImageGUID < EXIF:DigImageGUID
|
|
40
45
|
# XMP flash information is translated by the Composite Flash tag
|
|
41
46
|
-Composite:Flash < EXIF:Flash
|
|
42
47
|
# overwrite GPS tags which have different formats in XMP
|
|
@@ -14,8 +14,10 @@
|
|
|
14
14
|
# 2016/09/26 - PH Write Composite SubSec tags
|
|
15
15
|
# 2018/05/07 - PH Added support for GPSDestXxxRef tags
|
|
16
16
|
# 2021/09/30 - PH Removed erroneous "-" when copying CreatorTool
|
|
17
|
+
# 2022/03/31 - PH IPTC Photometadata Mapping Guidelines 2202.1 update
|
|
17
18
|
#
|
|
18
19
|
# References: http://www.metadataworkinggroup.org/specs/
|
|
20
|
+
# https://iptc.org/std/photometadata/documentation/mappingguidelines/
|
|
19
21
|
#
|
|
20
22
|
# Notes: 1) The first three arguments copy the bulk of the EXIF and GPS
|
|
21
23
|
# information, and the remaining arguments handle the tags
|
|
@@ -24,6 +26,8 @@
|
|
|
24
26
|
# 2) These arguments will not delete existing EXIF tags which are
|
|
25
27
|
# missing from the XMP. The EXIF tags should be deleted
|
|
26
28
|
# beforehand if required.
|
|
29
|
+
#
|
|
30
|
+
# 3) XMP-iptcExt:ImageRegion is not currently mapped into EXIF:SubjectArea
|
|
27
31
|
#------------------------------------------------------------------------------
|
|
28
32
|
-EXIF:all < XMP-exif:all
|
|
29
33
|
-EXIF:all < XMP-exifEX:all
|
|
@@ -37,7 +41,9 @@
|
|
|
37
41
|
-Composite:SubSecModifyDate < XMP-xmp:ModifyDate
|
|
38
42
|
-EXIF:Software < XMP-xmp:CreatorTool
|
|
39
43
|
-EXIF:Copyright < XMP-dc:Rights
|
|
44
|
+
-EXIF:Artist < XMP-plus:ImageCreatorName
|
|
40
45
|
-EXIF:Artist < XMP-dc:Creator
|
|
46
|
+
-EXIF:DigImageGUID < XMP-iptcExt:DigitalImageGUID
|
|
41
47
|
# XMP flash information is translated by the Composite Flash tag
|
|
42
48
|
-EXIF:Flash < Composite:Flash
|
|
43
49
|
# generate GPS tags which have been combined into other XMP tags
|
|
@@ -97,8 +97,8 @@ my %sACDSeeRegionStruct = (
|
|
|
97
97
|
# new XMP namespaces for ACDSee regions
|
|
98
98
|
'Image::ExifTool::XMP::Main' => {
|
|
99
99
|
'acdsee-rs' => { # <-- must be the same as the NAMESPACE prefix
|
|
100
|
-
SubDirectory => {
|
|
101
|
-
TagTable => 'Image::ExifTool::UserDefined::ACDSeeRegions'
|
|
100
|
+
SubDirectory => {
|
|
101
|
+
TagTable => 'Image::ExifTool::UserDefined::ACDSeeRegions'
|
|
102
102
|
},
|
|
103
103
|
},
|
|
104
104
|
},
|
|
@@ -147,7 +147,7 @@ my %sACDSeeRegionStruct = (
|
|
|
147
147
|
},
|
|
148
148
|
ValueConv => q{
|
|
149
149
|
my ($rgn, @newRgns);
|
|
150
|
-
my $rgns = ref $val[0] eq 'ARRAY' ? $val[0] : [ $val[0] ];
|
|
150
|
+
my $rgns = ref $val[0] eq 'ARRAY' ? $val[0] : [ $val[0] ];
|
|
151
151
|
foreach $rgn (@$rgns) {
|
|
152
152
|
my %newRgn = ( Type => 'Face' );
|
|
153
153
|
if ($$rgn{RegionBoundary} and $$rgn{RegionBoundary}{RbShape} eq 'rectangle') {
|
|
@@ -220,13 +220,13 @@ my %sACDSeeRegionStruct = (
|
|
|
220
220
|
# the "Struct" entry defines the structure fields
|
|
221
221
|
Struct => {
|
|
222
222
|
# optional structure name (used for warning messages only)
|
|
223
|
-
STRUCT_NAME => 'ACDSee RegionInfo',
|
|
223
|
+
STRUCT_NAME => 'ACDSee RegionInfo',
|
|
224
224
|
RegionList => {
|
|
225
225
|
FlatName => 'Region',
|
|
226
226
|
Struct => \%sACDSeeRegionStruct,
|
|
227
227
|
List => 'Bag',
|
|
228
228
|
},
|
|
229
|
-
AppliedToDimensions => {
|
|
229
|
+
AppliedToDimensions => {
|
|
230
230
|
FlatName => 'RegionAppliedToDimensions',Struct => \%sACDSeeDimensions },
|
|
231
231
|
},
|
|
232
232
|
},
|
|
@@ -239,7 +239,7 @@ my %sACDSeeRegionStruct = (
|
|
|
239
239
|
RegionInfoACDSeeAppliedToDimensionsW => 'ACDSeeRegionAppliedToDimensionsW',
|
|
240
240
|
RegionInfoACDSeeRegionListDLYAreaH => 'ACDSeeRegionDLYAreaH',
|
|
241
241
|
RegionInfoACDSeeRegionListDLYAreaW => 'ACDSeeRegionDLYAreaW',
|
|
242
|
-
RegionInfoACDSeeRegionListDLYAreaX => 'ACDSeeRegionDLYAreaX',
|
|
242
|
+
RegionInfoACDSeeRegionListDLYAreaX => 'ACDSeeRegionDLYAreaX',
|
|
243
243
|
RegionInfoACDSeeRegionListDLYAreaY => 'ACDSeeRegionDLYAreaY',
|
|
244
244
|
RegionInfoACDSeeRegionListALGAreaH => 'ACDSeeRegionALGAreaH',
|
|
245
245
|
RegionInfoACDSeeRegionListALGAreaW => 'ACDSeeRegionALGAreaW',
|
|
@@ -34,15 +34,15 @@
|
|
|
34
34
|
# Usage:
|
|
35
35
|
#
|
|
36
36
|
# 1) Extract Photoshop path names:
|
|
37
|
-
#
|
|
37
|
+
#
|
|
38
38
|
# exiftool -config photoshop_paths.config -allpaths FILE
|
|
39
39
|
#
|
|
40
40
|
# 2) Extract Photoshop path names and anchor points:
|
|
41
|
-
#
|
|
41
|
+
#
|
|
42
42
|
# exiftool -config photoshop_paths.config -userparam anchor -allpaths FILE
|
|
43
43
|
#
|
|
44
44
|
# 3) Extract Photoshop path anchor points only:
|
|
45
|
-
#
|
|
45
|
+
#
|
|
46
46
|
# exiftool -config photoshop_paths.config -userparam anchoronly -allpaths FILE
|
|
47
47
|
#
|
|
48
48
|
# 4) Copy all Photoshop paths from one file (SRC) to another (DST):
|
|
@@ -68,6 +68,7 @@
|
|
|
68
68
|
# subpath respectively
|
|
69
69
|
# 2017/06/03 - PH Added TotalPathPoints
|
|
70
70
|
# 2017/07/17 - PH Added UniquePathPoints
|
|
71
|
+
# 2022/02/03 - PH Added WorkingPath and WorkingPathPix
|
|
71
72
|
#
|
|
72
73
|
# References: https://exiftool.org/forum/index.php/topic,1621.0.html
|
|
73
74
|
# https://exiftool.org/forum/index.php/topic,3910.0.html
|
|
@@ -77,10 +78,11 @@
|
|
|
77
78
|
# Print Photoshop path name and/or anchor points
|
|
78
79
|
# Inputs: 0) reference to Photoshop path data, 1) ExifTool object reference
|
|
79
80
|
# 2-3) optional image width/height to convert anchor points to pixels
|
|
81
|
+
# 4) optional path name
|
|
80
82
|
# Returns: String with name and/or Bezier knot anchor points
|
|
81
|
-
sub PrintPath(
|
|
83
|
+
sub PrintPath($$;$$$)
|
|
82
84
|
{
|
|
83
|
-
my ($val, $et, $w, $h) = @_;
|
|
85
|
+
my ($val, $et, $w, $h, $nm) = @_;
|
|
84
86
|
my ($pos, $name, @rtn);
|
|
85
87
|
my $len = length($$val) - 26;
|
|
86
88
|
|
|
@@ -88,8 +90,9 @@ sub PrintPath($$;$$)
|
|
|
88
90
|
if ($$val =~ m{.*/#(.{0,255})#/$}s) {
|
|
89
91
|
$name = $1;
|
|
90
92
|
$len -= length($1) + 4;
|
|
93
|
+
$name = $nm if defined $nm and not length $name;
|
|
91
94
|
} else {
|
|
92
|
-
$name = '<none>';
|
|
95
|
+
$name = defined $nm ? $nm : '<none>';
|
|
93
96
|
}
|
|
94
97
|
my $anchorOnly = $et->Options(UserParam => 'AnchorOnly');
|
|
95
98
|
push @rtn, $name unless $anchorOnly;
|
|
@@ -118,7 +121,7 @@ sub PrintPath($$;$$)
|
|
|
118
121
|
}
|
|
119
122
|
|
|
120
123
|
%Image::ExifTool::Shortcuts::UserDefined = (
|
|
121
|
-
# create "AllPaths" shortcut for all Photoshop path tags
|
|
124
|
+
# create "AllPaths" shortcut for all Photoshop path tags (except WorkingPath)
|
|
122
125
|
AllPaths => [
|
|
123
126
|
map { sprintf "Path%x", $_ } (0x7d0 .. 0xbb5),
|
|
124
127
|
],
|
|
@@ -133,6 +136,14 @@ sub PrintPath($$;$$)
|
|
|
133
136
|
Name => 'OriginPathInfo',
|
|
134
137
|
Flags => [ qw(Writable Protected Binary SetResourceName) ],
|
|
135
138
|
},
|
|
139
|
+
0x401 => {
|
|
140
|
+
Name => 'WorkingPath',
|
|
141
|
+
Flags => [ qw(Writable Protected Binary ConvertBinary SetResourceName) ],
|
|
142
|
+
PrintConv => sub {
|
|
143
|
+
my ($val, $et) = @_;
|
|
144
|
+
PrintPath($val, $et, undef, undef, 'Work Path');
|
|
145
|
+
},
|
|
146
|
+
},
|
|
136
147
|
# generate tags for each of the 998 possible Photoshop paths
|
|
137
148
|
map { $_ => {
|
|
138
149
|
Name => sprintf('Path%x', $_),
|
|
@@ -143,6 +154,7 @@ sub PrintPath($$;$$)
|
|
|
143
154
|
},
|
|
144
155
|
'Image::ExifTool::Composite' => {
|
|
145
156
|
PathCount => {
|
|
157
|
+
# (PathCount statistics do not include WorkingPath)
|
|
146
158
|
Desire => {
|
|
147
159
|
map { $_-0x7d0 => sprintf('Path%x', $_) } (0x7d0 .. 0xbb5),
|
|
148
160
|
},
|
|
@@ -180,6 +192,17 @@ sub PrintPath($$;$$)
|
|
|
180
192
|
Require => 'PathCount',
|
|
181
193
|
ValueConv => '$$self{TotalPathPoints}',
|
|
182
194
|
},
|
|
195
|
+
WorkingPathPix => {
|
|
196
|
+
Require => {
|
|
197
|
+
0 => 'ImageWidth',
|
|
198
|
+
1 => 'ImageHeight',
|
|
199
|
+
2 => 'WorkingPath',
|
|
200
|
+
},
|
|
201
|
+
ValueConv => sub {
|
|
202
|
+
my ($val, $et) = @_;
|
|
203
|
+
PrintPath($$val[2], $et, $$val[0], $$val[1], 'Work Path');
|
|
204
|
+
},
|
|
205
|
+
},
|
|
183
206
|
map { sprintf('PathPix%x', $_) => {
|
|
184
207
|
Require => {
|
|
185
208
|
0 => 'ImageWidth',
|
|
@@ -63,7 +63,7 @@
|
|
|
63
63
|
# 2015/05/12 - PH Minor code tweaks
|
|
64
64
|
# 2015/10/26 - BKW Round off area sizes to 7 decimal places
|
|
65
65
|
# 2016/01/18 - BKW Improved rounding algorithm
|
|
66
|
-
# 2016/05/14 - BKW Increased rounding to 9 decimal places (Max Picasa accepts),
|
|
66
|
+
# 2016/05/14 - BKW Increased rounding to 9 decimal places (Max Picasa accepts),
|
|
67
67
|
# moved rounding operation to subroutine
|
|
68
68
|
#
|
|
69
69
|
# References: https://exiftool.org/forum/index.php/topic,6354.0.html
|
|
@@ -16,13 +16,13 @@
|
|
|
16
16
|
|
|
17
17
|
%Image::ExifTool::UserDefined = (
|
|
18
18
|
'Image::ExifTool::XMP::Main' => {
|
|
19
|
-
Camera => {
|
|
19
|
+
Camera => {
|
|
20
20
|
SubDirectory => {
|
|
21
21
|
TagTable => 'Image::ExifTool::UserDefined::Camera',
|
|
22
22
|
},
|
|
23
23
|
},
|
|
24
24
|
},
|
|
25
|
-
);
|
|
25
|
+
);
|
|
26
26
|
|
|
27
27
|
%Image::ExifTool::UserDefined::Camera = (
|
|
28
28
|
GROUPS => { 0 => 'XMP', 1 => 'XMP-Camera', 2 => 'Camera' },
|
|
@@ -68,9 +68,9 @@ sub has_defined {
|
|
|
68
68
|
35 => 'EXIF:TransferRange', # TransferRange (342/0x0156)
|
|
69
69
|
36 => 'EXIF:YCbCrCoefficients', # YCbCrCoefficients (529/0x0211)
|
|
70
70
|
37 => 'EXIF:YCbCrPositioning', # YCbCrPositioning (531/0x0213)
|
|
71
|
-
38 => 'EXIF:YCbCrSubSampling', # YCbCrSubSampling (530/0x0212)
|
|
71
|
+
38 => 'EXIF:YCbCrSubSampling', # YCbCrSubSampling (530/0x0212)
|
|
72
72
|
# Other tags to check
|
|
73
|
-
39 => 'EXIF:PhotometricInterpretation', # PhotometricInterpretation (262/0x0106)
|
|
73
|
+
39 => 'EXIF:PhotometricInterpretation', # PhotometricInterpretation (262/0x0106)
|
|
74
74
|
40 => 'EXIF:Compression', # Compression (259/0x0103)
|
|
75
75
|
},
|
|
76
76
|
ValueConv => q{
|
|
@@ -8,9 +8,10 @@
|
|
|
8
8
|
# (See html/history.html for revision history)
|
|
9
9
|
#------------------------------------------------------------------------------
|
|
10
10
|
use strict;
|
|
11
|
+
use warnings;
|
|
11
12
|
require 5.004;
|
|
12
13
|
|
|
13
|
-
my $version = '12.
|
|
14
|
+
my $version = '12.42';
|
|
14
15
|
|
|
15
16
|
# add our 'lib' directory to the include list BEFORE 'use Image::ExifTool'
|
|
16
17
|
my $exePath;
|
|
@@ -102,6 +103,8 @@ my %database; # lookup for database information based on file name (in Exi
|
|
|
102
103
|
my %filterExt; # lookup for filtered extensions
|
|
103
104
|
my %ignore; # directory names to ignore
|
|
104
105
|
my $ignoreHidden; # flag to ignore hidden files
|
|
106
|
+
my %outComma; # flag that output text file needs a comma
|
|
107
|
+
my %outTrailer; # trailer for output text file
|
|
105
108
|
my %preserveTime; # preserved timestamps for files
|
|
106
109
|
my %printFmt; # the contents of the print format file
|
|
107
110
|
my %setTags; # hash of list references for tags to set from files
|
|
@@ -455,6 +458,8 @@ undef %database;
|
|
|
455
458
|
undef %endDir;
|
|
456
459
|
undef %filterExt;
|
|
457
460
|
undef %ignore;
|
|
461
|
+
undef %outComma;
|
|
462
|
+
undef %outTrailer;
|
|
458
463
|
undef %printFmt;
|
|
459
464
|
undef %preserveTime;
|
|
460
465
|
undef %setTags;
|
|
@@ -1819,8 +1824,21 @@ if ($filtered and not $validFile) {
|
|
|
1819
1824
|
PrintCSV() if $csv and not $isWriting;
|
|
1820
1825
|
|
|
1821
1826
|
# print folder/file trailer if necessary
|
|
1822
|
-
|
|
1823
|
-
|
|
1827
|
+
if ($textOut) {
|
|
1828
|
+
foreach (keys %outTrailer) {
|
|
1829
|
+
next unless $outTrailer{$_};
|
|
1830
|
+
if ($mt->Open(\*OUTTRAIL, $_, '>>')) {
|
|
1831
|
+
my $fp = \*OUTTRAIL;
|
|
1832
|
+
print $fp $outTrailer{$_};
|
|
1833
|
+
close $fp;
|
|
1834
|
+
} else {
|
|
1835
|
+
Error("Error appending to $_\n");
|
|
1836
|
+
}
|
|
1837
|
+
}
|
|
1838
|
+
} else {
|
|
1839
|
+
print $sectTrailer if $sectTrailer;
|
|
1840
|
+
print $fileTrailer if $fileTrailer and not $fileHeader;
|
|
1841
|
+
}
|
|
1824
1842
|
|
|
1825
1843
|
my $totWr = $countGoodWr + $countBadWr + $countSameWr + $countCopyWr +
|
|
1826
1844
|
$countGoodCr + $countBadCr;
|
|
@@ -2158,6 +2176,9 @@ sub GetImageInfo($$)
|
|
|
2158
2176
|
$tmpText = $outfile unless $append;
|
|
2159
2177
|
}
|
|
2160
2178
|
|
|
2179
|
+
# restore state of comma flag for this file if appending
|
|
2180
|
+
$comma = $outComma{$outfile} if $append and ($textOverwrite & 0x02);
|
|
2181
|
+
|
|
2161
2182
|
# print the results for this file
|
|
2162
2183
|
if (%printFmt) {
|
|
2163
2184
|
# output using print format file (-p) option
|
|
@@ -2219,7 +2240,7 @@ sub GetImageInfo($$)
|
|
|
2219
2240
|
if ($fp) {
|
|
2220
2241
|
# print file header (only once)
|
|
2221
2242
|
if ($fileHeader) {
|
|
2222
|
-
print $fp $fileHeader;
|
|
2243
|
+
print $fp $fileHeader unless defined $outfile and ($created{$outfile} or $appended{$outfile});
|
|
2223
2244
|
undef $fileHeader unless $textOut;
|
|
2224
2245
|
}
|
|
2225
2246
|
if ($html) {
|
|
@@ -2531,8 +2552,9 @@ TAG: foreach $tag (@foundTags) {
|
|
|
2531
2552
|
if ($showTagID or $outFormat < 0) {
|
|
2532
2553
|
$val = { val => $val };
|
|
2533
2554
|
if ($showTagID) {
|
|
2534
|
-
my $id = $et->GetTagID($tag);
|
|
2555
|
+
my ($id, $lang) = $et->GetTagID($tag);
|
|
2535
2556
|
$id = sprintf('0x%.4x', $id) if $showTagID eq 'H' and $id =~ /^\d+$/;
|
|
2557
|
+
$$val{lang} = $lang if $lang;
|
|
2536
2558
|
$$val{id} = $id;
|
|
2537
2559
|
}
|
|
2538
2560
|
if ($tabFormat) {
|
|
@@ -2672,9 +2694,17 @@ TAG: foreach $tag (@foundTags) {
|
|
|
2672
2694
|
}
|
|
2673
2695
|
}
|
|
2674
2696
|
if ($outfile) {
|
|
2675
|
-
|
|
2676
|
-
|
|
2677
|
-
|
|
2697
|
+
if ($textOverwrite & 0x02) {
|
|
2698
|
+
# save state of this file if we may be appending
|
|
2699
|
+
$outComma{$outfile} = $comma;
|
|
2700
|
+
$outTrailer{$outfile} = '';
|
|
2701
|
+
$outTrailer{$outfile} .= $sectTrailer and $sectTrailer = '' if $sectTrailer;
|
|
2702
|
+
$outTrailer{$outfile} .= $fileTrailer if $fileTrailer;
|
|
2703
|
+
} else {
|
|
2704
|
+
# write section and file trailers before closing the file
|
|
2705
|
+
print $fp $sectTrailer and $sectTrailer = '' if $sectTrailer;
|
|
2706
|
+
print $fp $fileTrailer if $fileTrailer;
|
|
2707
|
+
}
|
|
2678
2708
|
close($fp);
|
|
2679
2709
|
undef $tmpText;
|
|
2680
2710
|
if ($lineCount) {
|
|
@@ -2924,7 +2954,7 @@ sub SetImageInfo($$$)
|
|
|
2924
2954
|
}
|
|
2925
2955
|
}
|
|
2926
2956
|
if (defined $outfile) {
|
|
2927
|
-
$verbose and print $vout "'${infile}' --> '${outfile}'\n";
|
|
2957
|
+
defined $verbose and print $vout "'${infile}' --> '${outfile}'\n";
|
|
2928
2958
|
# create output directory if necessary
|
|
2929
2959
|
CreateDirectory($outfile);
|
|
2930
2960
|
# set temporary file (automatically erased on abnormal exit)
|
|
@@ -5155,14 +5185,15 @@ OPTIONS
|
|
|
5155
5185
|
# update metadata for all images in a directory from CSV file
|
|
5156
5186
|
exiftool -csv=a.csv dir
|
|
5157
5187
|
|
|
5158
|
-
|
|
5159
|
-
used and the API MissingTagValue is set to an empty string
|
|
5188
|
+
When importing, empty values are ignored unless the -f option is
|
|
5189
|
+
used and the API MissingTagValue is set to an empty string (in
|
|
5160
5190
|
which case the tag is deleted). Also, FileName and Directory
|
|
5161
5191
|
columns are ignored if they exist (ie. ExifTool will not attempt to
|
|
5162
|
-
write these tags with a CSV import)
|
|
5163
|
-
|
|
5164
|
-
the
|
|
5165
|
-
databases may be imported in a
|
|
5192
|
+
write these tags with a CSV import), but all other columns are
|
|
5193
|
+
imported. To force a tag to be deleted, use the -f option and set
|
|
5194
|
+
the value to "-" in the CSV file (or to the MissingTagValue if this
|
|
5195
|
+
API option was used). Multiple databases may be imported in a
|
|
5196
|
+
single command.
|
|
5166
5197
|
|
|
5167
5198
|
When exporting a CSV file, the -g or -G option adds group names to
|
|
5168
5199
|
the tag headings. If the -a option is used to allow duplicate tag
|
|
@@ -5461,7 +5492,7 @@ OPTIONS
|
|
|
5461
5492
|
|
|
5462
5493
|
produces output like this:
|
|
5463
5494
|
|
|
5464
|
-
-- Generated by ExifTool 12.
|
|
5495
|
+
-- Generated by ExifTool 12.42 --
|
|
5465
5496
|
File: a.jpg - 2003:10:31 15:44:19
|
|
5466
5497
|
(f/5.6, 1/60s, ISO 100)
|
|
5467
5498
|
File: b.jpg - 2006:05:23 11:57:38
|
|
@@ -5576,7 +5607,9 @@ OPTIONS
|
|
|
5576
5607
|
extracted. Using -v0 causes the console output buffer to be flushed
|
|
5577
5608
|
after each line (which may be useful to avoid delays when piping
|
|
5578
5609
|
exiftool output), and prints the name of each processed file when
|
|
5579
|
-
writing
|
|
5610
|
+
writing and the new file name when renaming, moving or copying.
|
|
5611
|
+
Verbose levels above -v0 do not flush after each line. Also see the
|
|
5612
|
+
-progress option.
|
|
5580
5613
|
|
|
5581
5614
|
-w[+|!] *EXT* or *FMT* (-textOut)
|
|
5582
5615
|
Write console output to files with names ending in *EXT*, one for
|
|
@@ -5794,9 +5827,9 @@ OPTIONS
|
|
|
5794
5827
|
Allow (-a) or suppress (--a) duplicate tag names to be extracted.
|
|
5795
5828
|
By default, duplicate tags are suppressed when reading unless the
|
|
5796
5829
|
-ee or -X options are used or the Duplicates option is enabled in
|
|
5797
|
-
the configuration file.
|
|
5798
|
-
|
|
5799
|
-
|
|
5830
|
+
the configuration file. When writing, this option allows multiple
|
|
5831
|
+
Warning messages to be shown. Duplicate tags are always extracted
|
|
5832
|
+
when copying.
|
|
5800
5833
|
|
|
5801
5834
|
-e (--composite)
|
|
5802
5835
|
Extract existing tags only -- don't generate composite tags.
|
|
@@ -88,7 +88,7 @@ sub ProcessCTMD($$$);
|
|
|
88
88
|
sub ProcessExifInfo($$$);
|
|
89
89
|
sub SwapWords($);
|
|
90
90
|
|
|
91
|
-
$VERSION = '4.
|
|
91
|
+
$VERSION = '4.58';
|
|
92
92
|
|
|
93
93
|
# Note: Removed 'USM' from 'L' lenses since it is redundant - PH
|
|
94
94
|
# (or is it? Ref 32 shows 5 non-USM L-type lenses)
|
|
@@ -197,6 +197,7 @@ $VERSION = '4.55';
|
|
|
197
197
|
44 => 'Canon EF 90-300mm f/4.5-5.6', #32
|
|
198
198
|
45 => 'Canon EF-S 18-55mm f/3.5-5.6 [II]', #PH (same ID for version II, ref 20)
|
|
199
199
|
46 => 'Canon EF 28-90mm f/4-5.6', #32
|
|
200
|
+
# 46 => 'Tamron 28-300mm f/3.5-6.3 Di VC PZD (A010)', # (also possibly?)
|
|
200
201
|
47 => 'Zeiss Milvus 35mm f/2 or 50mm f/2', #IB
|
|
201
202
|
47.1 => 'Zeiss Milvus 50mm f/2 Makro', #IB
|
|
202
203
|
47.2 => 'Zeiss Milvus 135mm f/2 ZE', #IB
|
|
@@ -208,6 +209,7 @@ $VERSION = '4.55';
|
|
|
208
209
|
53 => 'Canon EF-S 18-55mm f/3.5-5.6 III', #Jon Charnas
|
|
209
210
|
54 => 'Canon EF-S 55-250mm f/4-5.6 IS II', #47
|
|
210
211
|
60 => 'Irix 11mm f/4', #50
|
|
212
|
+
63 => 'Irix 30mm F1.4 Dragonfly', #IB
|
|
211
213
|
80 => 'Canon TS-E 50mm f/2.8L Macro', #42
|
|
212
214
|
81 => 'Canon TS-E 90mm f/2.8L Macro', #42
|
|
213
215
|
82 => 'Canon TS-E 135mm f/4L Macro', #42
|
|
@@ -570,7 +572,9 @@ $VERSION = '4.55';
|
|
|
570
572
|
61494 => 'Canon CN-E 85mm T1.3 L F', #PH
|
|
571
573
|
61495 => 'Canon CN-E 135mm T2.2 L F', #PH
|
|
572
574
|
61496 => 'Canon CN-E 35mm T1.5 L F', #PH
|
|
573
|
-
|
|
575
|
+
#
|
|
576
|
+
# see RFLensType tag for master list of 61182 RF lenses
|
|
577
|
+
#
|
|
574
578
|
61182 => 'Canon RF 50mm F1.2L USM or other Canon RF Lens',
|
|
575
579
|
61182.1 => 'Canon RF 24-105mm F4L IS USM',
|
|
576
580
|
61182.2 => 'Canon RF 28-70mm F2L USM',
|
|
@@ -599,7 +603,15 @@ $VERSION = '4.55';
|
|
|
599
603
|
'61182.25' => 'Canon RF 100-400mm F5.6-8 IS USM + RF1.4x', #42 (NC)
|
|
600
604
|
'61182.26' => 'Canon RF 100-400mm F5.6-8 IS USM + RF2x', #42 (NC)
|
|
601
605
|
'61182.27' => 'Canon RF 16mm F2.8 STM', #42
|
|
602
|
-
|
|
606
|
+
'61182.28' => 'Canon RF 400mm F2.8L IS USM', #IB
|
|
607
|
+
'61182.29' => 'Canon RF 400mm F2.8L IS USM + RF1.4x', #IB
|
|
608
|
+
'61182.30' => 'Canon RF 400mm F2.8L IS USM + RF2x', #IB
|
|
609
|
+
'61182.31' => 'Canon RF 600mm F4L IS USM', #GiaZopatti
|
|
610
|
+
# we need the RFLensType values for the following...
|
|
611
|
+
'61182.32' => 'Canon RF 800mm F5.6L IS USM', #PH (NC)
|
|
612
|
+
'61182.33' => 'Canon RF 1200mm F8L IS USM', #PH (NC)
|
|
613
|
+
'61182.34' => 'Canon RF 5.2mm F2.8L Dual Fisheye 3D VR', #PH (NC)
|
|
614
|
+
'61182.35' => 'Canon RF 100mm F2.8L MACRO IS USM', #(NC)
|
|
603
615
|
65535 => 'n/a',
|
|
604
616
|
);
|
|
605
617
|
|
|
@@ -970,8 +982,8 @@ my %canonQuality = (
|
|
|
970
982
|
4 => 'RAW',
|
|
971
983
|
5 => 'Superfine',
|
|
972
984
|
7 => 'CRAW', #42
|
|
973
|
-
130 => '
|
|
974
|
-
131 => '
|
|
985
|
+
130 => 'Light (RAW)', #github#119
|
|
986
|
+
131 => 'Standard (RAW)', #github#119
|
|
975
987
|
);
|
|
976
988
|
my %canonImageSize = (
|
|
977
989
|
-1 => 'n/a',
|
|
@@ -1018,7 +1030,7 @@ my %canonWhiteBalance = (
|
|
|
1018
1030
|
20 => 'PC Set4', #PH
|
|
1019
1031
|
21 => 'PC Set5', #PH
|
|
1020
1032
|
# 22 - Custom 2?
|
|
1021
|
-
23 => 'Auto (ambience priority)', #PH (5DS)
|
|
1033
|
+
23 => 'Auto (ambience priority)', #PH (5DS) (perhaps this needs re-thinking?: forum13295)
|
|
1022
1034
|
# 30 - Click White Balance?
|
|
1023
1035
|
# 31 - Shot Settings?
|
|
1024
1036
|
# 137 - Tungsten?
|
|
@@ -2053,6 +2065,13 @@ my %offOn = ( 0 => 'Off', 1 => 'On' );
|
|
|
2053
2065
|
TagTable => 'Image::ExifTool::Canon::HDRInfo',
|
|
2054
2066
|
}
|
|
2055
2067
|
},
|
|
2068
|
+
0x4026 => { #github#119
|
|
2069
|
+
Name => 'LogInfo',
|
|
2070
|
+
SubDirectory => {
|
|
2071
|
+
Validate => 'Image::ExifTool::Canon::Validate($dirData,$subdirStart,$size)',
|
|
2072
|
+
TagTable => 'Image::ExifTool::Canon::LogInfo',
|
|
2073
|
+
}
|
|
2074
|
+
},
|
|
2056
2075
|
0x4028 => { #PH
|
|
2057
2076
|
Name => 'AFConfig', # (AFTabInfo)
|
|
2058
2077
|
SubDirectory => {
|
|
@@ -2126,6 +2145,7 @@ my %offOn = ( 0 => 'Off', 1 => 'On' );
|
|
|
2126
2145
|
4 => 'Continuous, Low', #PH
|
|
2127
2146
|
5 => 'Continuous, High', #PH
|
|
2128
2147
|
6 => 'Silent Single', #PH
|
|
2148
|
+
8 => 'Continuous, High+', #WolfgangGulcker
|
|
2129
2149
|
# ref A: https://exiftool.org/forum/index.php/topic,5701.msg27843.html#msg27843
|
|
2130
2150
|
9 => 'Single, Silent', #A
|
|
2131
2151
|
10 => 'Continuous, Silent', #A
|
|
@@ -6789,6 +6809,10 @@ my %ciMaxFocal = (
|
|
|
6789
6809
|
284 => 'Canon RF 100-400mm F5.6-8 IS USM + RF1.4x', #42 (NC)
|
|
6790
6810
|
285 => 'Canon RF 100-400mm F5.6-8 IS USM + RF2x', #42 (NC)
|
|
6791
6811
|
288 => 'Canon RF 16mm F2.8 STM', #42
|
|
6812
|
+
289 => 'Canon RF 400mm F2.8L IS USM', #IB
|
|
6813
|
+
290 => 'Canon RF 400mm F2.8L IS USM + RF1.4x', #IB
|
|
6814
|
+
291 => 'Canon RF 400mm F2.8L IS USM + RF2x', #IB
|
|
6815
|
+
292 => 'Canon RF 600mm F4L IS USM', #GiaZopatti
|
|
6792
6816
|
#xxx => 'Canon RF 100mm F2.8L MACRO IS USM',
|
|
6793
6817
|
# Note: add new RF lenses to %canonLensTypes with ID 61182
|
|
6794
6818
|
},
|
|
@@ -8701,6 +8725,65 @@ my %filterConv = (
|
|
|
8701
8725
|
# 3 - maybe related to AutoImageAlign?
|
|
8702
8726
|
);
|
|
8703
8727
|
|
|
8728
|
+
# More color information (MakerNotes tag 0x4026) (ref github issue #119)
|
|
8729
|
+
%Image::ExifTool::Canon::LogInfo = (
|
|
8730
|
+
%binaryDataAttrs,
|
|
8731
|
+
FORMAT => 'int32s',
|
|
8732
|
+
FIRST_ENTRY => 1,
|
|
8733
|
+
PRIORITY => 0,
|
|
8734
|
+
4 => {
|
|
8735
|
+
Name => 'CompressionFormat',
|
|
8736
|
+
PrintConv => {
|
|
8737
|
+
0 => 'Editing (ALL-I)',
|
|
8738
|
+
1 => 'Standard (IPB)',
|
|
8739
|
+
2 => 'Light (IPB)',
|
|
8740
|
+
3 => 'Motion JPEG',
|
|
8741
|
+
4 => 'RAW', # either Standard or Light, depending on Quality
|
|
8742
|
+
},
|
|
8743
|
+
},
|
|
8744
|
+
6 => { # 0 to 7
|
|
8745
|
+
Name => 'Sharpness',
|
|
8746
|
+
RawConv => '$val == 0x7fffffff ? undef : $val',
|
|
8747
|
+
},
|
|
8748
|
+
7 => { # -4 to 4
|
|
8749
|
+
Name => 'Saturation',
|
|
8750
|
+
RawConv => '$val == 0x7fffffff ? undef : $val',
|
|
8751
|
+
%Image::ExifTool::Exif::printParameter,
|
|
8752
|
+
},
|
|
8753
|
+
8 => { # -4 to 4
|
|
8754
|
+
Name => 'ColorTone',
|
|
8755
|
+
RawConv => '$val == 0x7fffffff ? undef : $val',
|
|
8756
|
+
%Image::ExifTool::Exif::printParameter,
|
|
8757
|
+
},
|
|
8758
|
+
9 => {
|
|
8759
|
+
Name => 'ColorSpace2',
|
|
8760
|
+
RawConv => '$val == 0x7fffffff ? undef : $val',
|
|
8761
|
+
PrintConv => {
|
|
8762
|
+
0 => 'BT.709',
|
|
8763
|
+
1 => 'BT.2020',
|
|
8764
|
+
2 => 'CinemaGamut',
|
|
8765
|
+
},
|
|
8766
|
+
},
|
|
8767
|
+
10 => {
|
|
8768
|
+
Name => 'ColorMatrix',
|
|
8769
|
+
RawConv => '$val == 0x7fffffff ? undef : $val',
|
|
8770
|
+
PrintConv => {
|
|
8771
|
+
0 => 'EOS Original',
|
|
8772
|
+
1 => 'Neutral',
|
|
8773
|
+
},
|
|
8774
|
+
},
|
|
8775
|
+
11 => {
|
|
8776
|
+
Name => 'CanonLogVersion', # (increases dynamic range of sensor data)
|
|
8777
|
+
RawConv => '$val == 0x7fffffff ? undef : $val',
|
|
8778
|
+
PrintConv => {
|
|
8779
|
+
0 => 'OFF',
|
|
8780
|
+
1 => 'CLogV1',
|
|
8781
|
+
2 => 'CLogV2', # (NC)
|
|
8782
|
+
3 => 'CLogV3',
|
|
8783
|
+
},
|
|
8784
|
+
},
|
|
8785
|
+
);
|
|
8786
|
+
|
|
8704
8787
|
# AF configuration info (MakerNotes tag 0x4028) (ref PH)
|
|
8705
8788
|
%Image::ExifTool::Canon::AFConfig = (
|
|
8706
8789
|
%binaryDataAttrs,
|