exiftool-vendored.pl 12.56.0 → 12.62.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 +115 -5
- package/bin/LICENSE +674 -0
- package/bin/MANIFEST +11 -0
- package/bin/META.json +1 -1
- package/bin/META.yml +1 -1
- package/bin/README +45 -44
- package/bin/config_files/example.config +1 -0
- package/bin/config_files/rotate_regions.config +1 -1
- package/bin/exiftool +262 -160
- package/bin/lib/Image/ExifTool/AIFF.pm +2 -2
- package/bin/lib/Image/ExifTool/APE.pm +2 -2
- package/bin/lib/Image/ExifTool/BMP.pm +0 -1
- package/bin/lib/Image/ExifTool/BuildTagLookup.pm +23 -19
- package/bin/lib/Image/ExifTool/Canon.pm +26 -6
- package/bin/lib/Image/ExifTool/CanonRaw.pm +5 -1
- package/bin/lib/Image/ExifTool/DJI.pm +28 -2
- package/bin/lib/Image/ExifTool/Exif.pm +77 -19
- package/bin/lib/Image/ExifTool/FlashPix.pm +33 -10
- package/bin/lib/Image/ExifTool/FujiFilm.pm +7 -3
- package/bin/lib/Image/ExifTool/GPS.pm +7 -2
- package/bin/lib/Image/ExifTool/Geotag.pm +30 -7
- package/bin/lib/Image/ExifTool/JPEG.pm +14 -2
- package/bin/lib/Image/ExifTool/Jpeg2000.pm +36 -11
- package/bin/lib/Image/ExifTool/LIF.pm +10 -2
- package/bin/lib/Image/ExifTool/LNK.pm +5 -4
- package/bin/lib/Image/ExifTool/MIE.pm +3 -3
- package/bin/lib/Image/ExifTool/MPEG.pm +2 -2
- package/bin/lib/Image/ExifTool/MakerNotes.pm +3 -2
- package/bin/lib/Image/ExifTool/Minolta.pm +6 -7
- package/bin/lib/Image/ExifTool/MinoltaRaw.pm +2 -1
- package/bin/lib/Image/ExifTool/Nikon.pm +1005 -909
- package/bin/lib/Image/ExifTool/NikonCustom.pm +2 -2
- package/bin/lib/Image/ExifTool/NikonSettings.pm +1 -1
- package/bin/lib/Image/ExifTool/Olympus.pm +88 -6
- package/bin/lib/Image/ExifTool/PDF.pm +17 -8
- package/bin/lib/Image/ExifTool/PNG.pm +10 -2
- package/bin/lib/Image/ExifTool/PanasonicRaw.pm +27 -1
- package/bin/lib/Image/ExifTool/Pentax.pm +8 -5
- package/bin/lib/Image/ExifTool/PhaseOne.pm +14 -1
- package/bin/lib/Image/ExifTool/Photoshop.pm +38 -7
- package/bin/lib/Image/ExifTool/QuickTime.pm +48 -14
- package/bin/lib/Image/ExifTool/QuickTimeStream.pl +91 -27
- package/bin/lib/Image/ExifTool/README +19 -2
- package/bin/lib/Image/ExifTool/RIFF.pm +34 -13
- package/bin/lib/Image/ExifTool/Rawzor.pm +2 -2
- package/bin/lib/Image/ExifTool/Ricoh.pm +2 -1
- package/bin/lib/Image/ExifTool/Sigma.pm +5 -4
- package/bin/lib/Image/ExifTool/SigmaRaw.pm +9 -3
- package/bin/lib/Image/ExifTool/Sony.pm +39 -10
- package/bin/lib/Image/ExifTool/TagLookup.pm +4687 -4628
- package/bin/lib/Image/ExifTool/TagNames.pod +338 -117
- package/bin/lib/Image/ExifTool/Validate.pm +5 -5
- package/bin/lib/Image/ExifTool/WPG.pm +296 -0
- package/bin/lib/Image/ExifTool/WriteExif.pl +42 -0
- package/bin/lib/Image/ExifTool/WritePDF.pl +7 -8
- package/bin/lib/Image/ExifTool/WriteXMP.pl +1 -1
- package/bin/lib/Image/ExifTool/Writer.pl +162 -40
- package/bin/lib/Image/ExifTool/XMP.pm +35 -8
- package/bin/lib/Image/ExifTool/XMP2.pl +2 -1
- package/bin/lib/Image/ExifTool/ZIP.pm +159 -41
- package/bin/lib/Image/ExifTool.pm +286 -65
- package/bin/lib/Image/ExifTool.pod +95 -51
- package/bin/perl-Image-ExifTool.spec +44 -43
- package/bin/pp_build_exe.args +5 -4
- package/package.json +3 -3
|
@@ -9938,8 +9938,8 @@ my %noYes = ( 0 => 'No', 1 => 'Yes' );
|
|
|
9938
9938
|
},
|
|
9939
9939
|
},
|
|
9940
9940
|
217 => { Name => 'MovieMultiSelector', %buttonsZ9, Unknown => 1}, # CSg2-h
|
|
9941
|
-
221 => { Name => 'MovieAFSpeed', ValueConv => '$val - 5', ValueConvInv => '$val +
|
|
9942
|
-
223 => { Name => 'MovieAFSpeedApply',
|
|
9941
|
+
221 => { Name => 'MovieAFSpeed', ValueConv => '$val - 5', ValueConvInv => '$val + 5' }, # CSg6-a
|
|
9942
|
+
223 => { Name => 'MovieAFSpeedApply', PrintConv => {0 => 'Always', 1 => 'Only During Recording'},}, # CSg6-b
|
|
9943
9943
|
225 => { # CSg7
|
|
9944
9944
|
Name => 'MovieAFTrackingSensitivity',
|
|
9945
9945
|
PrintConv => {
|
|
@@ -1512,7 +1512,7 @@ my %infoZSeries = (
|
|
|
1512
1512
|
6 => 'None',
|
|
1513
1513
|
},
|
|
1514
1514
|
}],
|
|
1515
|
-
0x0ee => { Name => 'MovieAFSpeed',
|
|
1515
|
+
0x0ee => { Name => 'MovieAFSpeed', ValueConv => '$val - 6', ValueConvInv => '$val + 6' }, # CSg4-a (Z7_2)
|
|
1516
1516
|
0x0ef => { # CSg4-b (Z7_2)
|
|
1517
1517
|
Name => 'MovieAFSpeedApply',
|
|
1518
1518
|
PrintConv => {
|
|
@@ -40,7 +40,7 @@ use Image::ExifTool qw(:DataAccess :Utils);
|
|
|
40
40
|
use Image::ExifTool::Exif;
|
|
41
41
|
use Image::ExifTool::APP12;
|
|
42
42
|
|
|
43
|
-
$VERSION = '2.
|
|
43
|
+
$VERSION = '2.81';
|
|
44
44
|
|
|
45
45
|
sub PrintLensInfo($$$);
|
|
46
46
|
|
|
@@ -116,6 +116,7 @@ my %olympusLensTypes = (
|
|
|
116
116
|
'0 35 10' => 'Olympus M.Zuiko 100-400mm F5.0-6.3', #IB
|
|
117
117
|
'0 36 10' => 'Olympus M.Zuiko Digital ED 8-25mm F4 Pro', #IB
|
|
118
118
|
'0 37 10' => 'Olympus M.Zuiko Digital ED 40-150mm F4.0 Pro', #forum3833
|
|
119
|
+
'0 39 10' => 'Olympus M.Zuiko Digital ED 90mm F3.5 Macro IS Pro', #forum3833
|
|
119
120
|
# Sigma lenses
|
|
120
121
|
'1 01 00' => 'Sigma 18-50mm F3.5-5.6 DC', #8
|
|
121
122
|
'1 01 10' => 'Sigma 30mm F2.8 EX DN', #NJ
|
|
@@ -3164,21 +3165,38 @@ my %indexInfo = (
|
|
|
3164
3165
|
PrintHex => 1,
|
|
3165
3166
|
ValueConv => '($val & 0x1f) . " " . ($val & 0xffe0)',
|
|
3166
3167
|
ValueConvInv => 'my @v=split(" ",$val); @v == 2 ? $v[0] + $v[1] : $val',
|
|
3167
|
-
PrintConv => [
|
|
3168
|
+
PrintConv => [ # herb values added:
|
|
3169
|
+
# based on code of W.P. in https://exiftool.org/forum/index.php?topic=14144.0
|
|
3168
3170
|
{
|
|
3169
|
-
0x00 => '(none)',
|
|
3170
|
-
0x01 => 'Center',
|
|
3171
|
+
# 0x00 => '(none)',
|
|
3172
|
+
# 0x01 => 'Center',
|
|
3171
3173
|
# need to fill this in...
|
|
3174
|
+
0x00 => '(none)',
|
|
3175
|
+
0x02 => 'Top-center (horizontal)',
|
|
3176
|
+
0x04 => 'Right (horizontal)',
|
|
3177
|
+
0x05 => 'Mid-right (horizontal)',
|
|
3178
|
+
0x06 => 'Center (horizontal)',
|
|
3179
|
+
0x07 => 'Mid-left (horizontal)',
|
|
3180
|
+
0x08 => 'Left (horizontal)',
|
|
3181
|
+
0x0a => 'Bottom-center (horizontal)',
|
|
3182
|
+
0x0c => 'Top-center (vertical)',
|
|
3183
|
+
0x0f => 'Right (vertical)',
|
|
3184
|
+
0x15 => 'Bottom-center (vertical)',
|
|
3185
|
+
0x10 => 'Mid-right (vertical)',
|
|
3186
|
+
0x11 => 'Center (vertical)',
|
|
3187
|
+
0x12 => 'Mid-left (vertical)',
|
|
3188
|
+
0x13 => 'Left (vertical)',
|
|
3172
3189
|
},
|
|
3173
3190
|
{
|
|
3174
3191
|
0x00 => 'Single Target',
|
|
3175
3192
|
0x40 => 'All Target', # (guess)
|
|
3176
3193
|
},
|
|
3177
3194
|
]
|
|
3178
|
-
},{ #
|
|
3195
|
+
},{ #herb all camera model except E-Mxxx and OM-x
|
|
3179
3196
|
Name => 'AFPoint',
|
|
3197
|
+
Condition => '$$self{Model} !~ /^(E-M|OM-)/ ',
|
|
3180
3198
|
Writable => 'int16u',
|
|
3181
|
-
Notes => 'other
|
|
3199
|
+
Notes => 'models other than E-Mxxx and OM-x',
|
|
3182
3200
|
RawConv => '($val or $$self{Model} ne "E-P1") ? $val : undef',
|
|
3183
3201
|
PrintConv => {
|
|
3184
3202
|
# (E-P1 always writes 0, maybe other models do too - PH)
|
|
@@ -3188,9 +3206,73 @@ my %indexInfo = (
|
|
|
3188
3206
|
3 => 'Center (vertical)', #6 (E-510)
|
|
3189
3207
|
255 => 'None',
|
|
3190
3208
|
},
|
|
3209
|
+
},{ #herb all newer models E-Mxxx and OM-x; we do not know details
|
|
3210
|
+
Name => 'AFPoint',
|
|
3211
|
+
Writable => 'int16u',
|
|
3212
|
+
Notes => 'other models',
|
|
3191
3213
|
}
|
|
3192
3214
|
],
|
|
3193
3215
|
# 0x31a Continuous AF parameters?
|
|
3216
|
+
0x31b => [ #herb, based on investigations of abgestumpft: https://exiftool.org/forum/index.php?topic=14527.0
|
|
3217
|
+
# for newer models E-Mxxx and OM-x
|
|
3218
|
+
{
|
|
3219
|
+
Name => 'AFPointDetails',
|
|
3220
|
+
Condition => '$$self{Model} =~ m/^E-M|^OM-/ ',
|
|
3221
|
+
Writable => 'int16u',
|
|
3222
|
+
Notes => 'models E-Mxxx and OM-x',
|
|
3223
|
+
PrintHex => 1,
|
|
3224
|
+
ValueConv => '(($val >> 13) & 0x7) . " " . (($val >> 12) & 0x1) . " " . (($val >> 11) & 0x1) . " " .
|
|
3225
|
+
# subject detect face and eye half press
|
|
3226
|
+
(($val >> 8) & 0x3) . " " . (($val >> 7) & 0x1) . " " . (($val >> 5) & 0x1) . " " .
|
|
3227
|
+
# eye AF face detect x-AF with MF
|
|
3228
|
+
(($val >> 4) & 0x1) . " " . (($val >> 3) & 0x1) . " " . ($val & 0x7)',
|
|
3229
|
+
# release object found MF...
|
|
3230
|
+
PrintConvColumns => 4,
|
|
3231
|
+
PrintConv => [
|
|
3232
|
+
{
|
|
3233
|
+
# should be identical to AISubjectTrackingMode
|
|
3234
|
+
0 => 'No Subject Detection',
|
|
3235
|
+
1 => 'Motorsports',
|
|
3236
|
+
2 => 'Airplanes',
|
|
3237
|
+
3 => 'Trains',
|
|
3238
|
+
4 => 'Birds',
|
|
3239
|
+
5 => 'Dogs & Cats',
|
|
3240
|
+
},{
|
|
3241
|
+
0 => 'Face Priority',
|
|
3242
|
+
1 => 'Target Priority',
|
|
3243
|
+
},{
|
|
3244
|
+
0 => 'Normal AF',
|
|
3245
|
+
1 => 'AF on Half Press',
|
|
3246
|
+
},{
|
|
3247
|
+
0 => 'No Eye-AF',
|
|
3248
|
+
1 => 'Right Eye Priority',
|
|
3249
|
+
2 => 'Left Eye Priority',
|
|
3250
|
+
3 => 'Both Eyes Priority',
|
|
3251
|
+
},{
|
|
3252
|
+
0 => 'No Face Detection',
|
|
3253
|
+
1 => 'Face Detection',
|
|
3254
|
+
},{
|
|
3255
|
+
0 => 'No MF',
|
|
3256
|
+
1 => 'With MF',
|
|
3257
|
+
},{
|
|
3258
|
+
0 => 'AF Priority',
|
|
3259
|
+
1 => 'Release Priority',
|
|
3260
|
+
},{
|
|
3261
|
+
0 => 'No Object found',
|
|
3262
|
+
1 => 'Object found',
|
|
3263
|
+
},{
|
|
3264
|
+
0 => 'MF',
|
|
3265
|
+
1 => 'S-AF',
|
|
3266
|
+
2 => 'C-AF',
|
|
3267
|
+
6 => 'C-AF + TR',
|
|
3268
|
+
},
|
|
3269
|
+
],
|
|
3270
|
+
},{ # for older models
|
|
3271
|
+
Name => 'AFPointDetails',
|
|
3272
|
+
Writable => 'int16u',
|
|
3273
|
+
Notes => 'other models',
|
|
3274
|
+
}
|
|
3275
|
+
],
|
|
3194
3276
|
0x328 => { #PH
|
|
3195
3277
|
Name => 'AFInfo',
|
|
3196
3278
|
SubDirectory => { TagTable => 'Image::ExifTool::Olympus::AFInfo' },
|
|
@@ -21,7 +21,7 @@ use vars qw($VERSION $AUTOLOAD $lastFetched);
|
|
|
21
21
|
use Image::ExifTool qw(:DataAccess :Utils);
|
|
22
22
|
require Exporter;
|
|
23
23
|
|
|
24
|
-
$VERSION = '1.
|
|
24
|
+
$VERSION = '1.56';
|
|
25
25
|
|
|
26
26
|
sub FetchObject($$$$);
|
|
27
27
|
sub ExtractObject($$;$$);
|
|
@@ -41,7 +41,7 @@ my $cryptStream; # flag that streams are encrypted
|
|
|
41
41
|
my $lastOffset; # last fetched object offset
|
|
42
42
|
my %streamObjs; # hash of stream objects
|
|
43
43
|
my %fetched; # dicts fetched in verbose mode (to avoid cyclical recursion)
|
|
44
|
-
my $pdfVer; # version of PDF file being processed
|
|
44
|
+
my $pdfVer; # version of PDF file being processed (from header)
|
|
45
45
|
|
|
46
46
|
# filters supported in DecodeStream()
|
|
47
47
|
my %supportedFilter = (
|
|
@@ -115,6 +115,7 @@ my %supportedFilter = (
|
|
|
115
115
|
CreationDate => {
|
|
116
116
|
Name => 'CreateDate',
|
|
117
117
|
Writable => 'date',
|
|
118
|
+
PDF2 => 1, # not deprecated in PDF 2.0
|
|
118
119
|
Groups => { 2 => 'Time' },
|
|
119
120
|
Shift => 'Time',
|
|
120
121
|
PrintConv => '$self->ConvertDateTime($val)',
|
|
@@ -123,6 +124,7 @@ my %supportedFilter = (
|
|
|
123
124
|
ModDate => {
|
|
124
125
|
Name => 'ModifyDate',
|
|
125
126
|
Writable => 'date',
|
|
127
|
+
PDF2 => 1, # not deprecated in PDF 2.0
|
|
126
128
|
Groups => { 2 => 'Time' },
|
|
127
129
|
Shift => 'Time',
|
|
128
130
|
PrintConv => '$self->ConvertDateTime($val)',
|
|
@@ -168,7 +170,10 @@ my %supportedFilter = (
|
|
|
168
170
|
Lang => 'Language',
|
|
169
171
|
PageLayout => { },
|
|
170
172
|
PageMode => { },
|
|
171
|
-
Version =>
|
|
173
|
+
Version => {
|
|
174
|
+
Name => 'PDFVersion',
|
|
175
|
+
RawConv => '$$self{PDFVersion} = $val if $$self{PDFVersion} < $val; $val',
|
|
176
|
+
},
|
|
172
177
|
);
|
|
173
178
|
|
|
174
179
|
# tags extracted from the PDF Encrypt dictionary
|
|
@@ -1754,7 +1759,7 @@ sub ProcessDict($$$$;$$)
|
|
|
1754
1759
|
my $unknown = $$tagTablePtr{EXTRACT_UNKNOWN};
|
|
1755
1760
|
my $embedded = (defined $unknown and not $unknown and $et->Options('ExtractEmbedded'));
|
|
1756
1761
|
my @tags = @{$$dict{_tags}};
|
|
1757
|
-
my ($next, %join);
|
|
1762
|
+
my ($next, %join, $validInfo);
|
|
1758
1763
|
my $index = 0;
|
|
1759
1764
|
|
|
1760
1765
|
$nesting = ($nesting || 0) + 1;
|
|
@@ -1775,6 +1780,7 @@ sub ProcessDict($$$$;$$)
|
|
|
1775
1780
|
last;
|
|
1776
1781
|
}
|
|
1777
1782
|
}
|
|
1783
|
+
$validInfo = ($et->Options('Validate') and $tagTablePtr eq \%Image::ExifTool::PDF::Info);
|
|
1778
1784
|
#
|
|
1779
1785
|
# extract information from all tags in the dictionary
|
|
1780
1786
|
#
|
|
@@ -1810,6 +1816,10 @@ sub ProcessDict($$$$;$$)
|
|
|
1810
1816
|
$isSubDoc = 1; # treat as a sub-document
|
|
1811
1817
|
}
|
|
1812
1818
|
}
|
|
1819
|
+
if ($validInfo and $$et{PDFVersion} >= 2.0 and (not $tagInfo or not $$tagInfo{PDF2})) {
|
|
1820
|
+
my $name = $tagInfo ? ":$$tagInfo{Name}" : " Info tag '${tag}'";
|
|
1821
|
+
$et->Warn("PDF$name is deprecated in PDF 2.0");
|
|
1822
|
+
}
|
|
1813
1823
|
if ($verbose) {
|
|
1814
1824
|
my ($val2, $extra);
|
|
1815
1825
|
if (ref $val eq 'SCALAR') {
|
|
@@ -2118,9 +2128,8 @@ sub ReadPDF($$)
|
|
|
2118
2128
|
$raf->Read($buff, 1024) >= 8 or return 0;
|
|
2119
2129
|
$buff =~ /^(\s*)%PDF-(\d+\.\d+)/ or return 0;
|
|
2120
2130
|
$$et{PDFBase} = length $1 and $et->Warn('PDF header is not at start of file',1);
|
|
2121
|
-
$pdfVer = $2;
|
|
2131
|
+
$pdfVer = $$et{PDFVersion} = $2;
|
|
2122
2132
|
$et->SetFileType(); # set the FileType tag
|
|
2123
|
-
$et->Warn("The PDF $pdfVer specification is held hostage by the ISO") if $pdfVer >= 2.0;
|
|
2124
2133
|
# store PDFVersion tag
|
|
2125
2134
|
my $tagTablePtr = GetTagTable('Image::ExifTool::PDF::Root');
|
|
2126
2135
|
$et->HandleTag($tagTablePtr, 'Version', $pdfVer);
|
|
@@ -2384,8 +2393,8 @@ This module is loaded automatically by Image::ExifTool when required.
|
|
|
2384
2393
|
This code reads meta information from PDF (Adobe Portable Document Format)
|
|
2385
2394
|
files. It supports object streams introduced in PDF-1.5 but only with a
|
|
2386
2395
|
limited set of Filter and Predictor algorithms, however all standard
|
|
2387
|
-
encryption methods through PDF-
|
|
2388
|
-
|
|
2396
|
+
encryption methods through PDF-2.0 are supported, including AESV2 (AES-128)
|
|
2397
|
+
and AESV3 (AES-256).
|
|
2389
2398
|
|
|
2390
2399
|
=head1 AUTHOR
|
|
2391
2400
|
|
|
@@ -36,7 +36,7 @@ use strict;
|
|
|
36
36
|
use vars qw($VERSION $AUTOLOAD %stdCase);
|
|
37
37
|
use Image::ExifTool qw(:DataAccess :Utils);
|
|
38
38
|
|
|
39
|
-
$VERSION = '1.
|
|
39
|
+
$VERSION = '1.63';
|
|
40
40
|
|
|
41
41
|
sub ProcessPNG_tEXt($$$);
|
|
42
42
|
sub ProcessPNG_iTXt($$$);
|
|
@@ -1374,6 +1374,7 @@ sub ProcessPNG($$)
|
|
|
1374
1374
|
my $datCount = 0;
|
|
1375
1375
|
my $datBytes = 0;
|
|
1376
1376
|
my $fastScan = $et->Options('FastScan');
|
|
1377
|
+
my $md5 = $$et{ImageDataMD5};
|
|
1377
1378
|
my ($n, $sig, $err, $hbuf, $dbuf, $cbuf);
|
|
1378
1379
|
my ($wasHdr, $wasEnd, $wasDat, $doTxt, @txtOffset);
|
|
1379
1380
|
|
|
@@ -1453,6 +1454,7 @@ sub ProcessPNG($$)
|
|
|
1453
1454
|
if ($datCount and $chunk ne $datChunk) {
|
|
1454
1455
|
my $s = $datCount > 1 ? 's' : '';
|
|
1455
1456
|
print $out "$fileType $datChunk ($datCount chunk$s, total $datBytes bytes)\n";
|
|
1457
|
+
print $out "$$et{INDENT}(ImageDataMD5: $datBytes bytes of $datChunk data)\n" if $md5;
|
|
1456
1458
|
$datCount = $datBytes = 0;
|
|
1457
1459
|
}
|
|
1458
1460
|
}
|
|
@@ -1539,7 +1541,12 @@ sub ProcessPNG($$)
|
|
|
1539
1541
|
}
|
|
1540
1542
|
# skip over data chunks if possible/necessary
|
|
1541
1543
|
} elsif (not $validate or $len > $chunkSizeLimit) {
|
|
1542
|
-
|
|
1544
|
+
if ($md5) {
|
|
1545
|
+
$et->ImageDataMD5($raf, $len);
|
|
1546
|
+
$raf->Read($cbuf, 4) == 4 or $et->Warn('Truncated data'), last;
|
|
1547
|
+
} else {
|
|
1548
|
+
$raf->Seek($len + 4, 1) or $et->Warn('Seek error'), last;
|
|
1549
|
+
}
|
|
1543
1550
|
next;
|
|
1544
1551
|
}
|
|
1545
1552
|
} elsif ($wasDat and $isTxtChunk{$chunk}) {
|
|
@@ -1558,6 +1565,7 @@ sub ProcessPNG($$)
|
|
|
1558
1565
|
$et->Warn("Corrupted $fileType image") unless $wasEnd;
|
|
1559
1566
|
last;
|
|
1560
1567
|
}
|
|
1568
|
+
$md5->add($dbuf) if $md5 and $datChunk; # add to MD5 if necessary
|
|
1561
1569
|
if ($verbose or $validate or ($outfile and not $fastScan)) {
|
|
1562
1570
|
# check CRC when in verbose mode (since we don't care about speed)
|
|
1563
1571
|
my $crc = CalculateCRC(\$hbuf, undef, 4);
|
|
@@ -21,7 +21,7 @@ use vars qw($VERSION);
|
|
|
21
21
|
use Image::ExifTool qw(:DataAccess :Utils);
|
|
22
22
|
use Image::ExifTool::Exif;
|
|
23
23
|
|
|
24
|
-
$VERSION = '1.
|
|
24
|
+
$VERSION = '1.28';
|
|
25
25
|
|
|
26
26
|
sub ProcessJpgFromRaw($$$);
|
|
27
27
|
sub WriteJpgFromRaw($$$);
|
|
@@ -266,6 +266,7 @@ my %panasonicWhiteBalance = ( #forum9396
|
|
|
266
266
|
PanasonicHack => 1,
|
|
267
267
|
OffsetPair => 0x117, # (use StripByteCounts as the offset pair)
|
|
268
268
|
NotRealPair => 1, # (to avoid Validate warning)
|
|
269
|
+
IsImageData => 1,
|
|
269
270
|
},
|
|
270
271
|
0x119 => {
|
|
271
272
|
Name => 'DistortionInfo',
|
|
@@ -296,6 +297,20 @@ my %panasonicWhiteBalance = ( #forum9396
|
|
|
296
297
|
},
|
|
297
298
|
},
|
|
298
299
|
# 0x122 - int32u: RAWDataOffset for the GH5s/GX9, or pointer to end of raw data for G9 (forum9295)
|
|
300
|
+
0x127 => { #github193 (newer models)
|
|
301
|
+
Name => 'JpgFromRaw2',
|
|
302
|
+
Groups => { 2 => 'Preview' },
|
|
303
|
+
DataTag => 'JpgFromRaw2',
|
|
304
|
+
RawConv => '$self->ValidateImage(\$val,$tag)',
|
|
305
|
+
},
|
|
306
|
+
0x13b => {
|
|
307
|
+
Name => 'Artist',
|
|
308
|
+
Groups => { 2 => 'Author' },
|
|
309
|
+
Permanent => 1, # (so we don't add it if the model doesn't write it)
|
|
310
|
+
Writable => 'string',
|
|
311
|
+
WriteGroup => 'IFD0',
|
|
312
|
+
RawConv => '$val =~ s/\s+$//; $val', # trim trailing blanks
|
|
313
|
+
},
|
|
299
314
|
0x2bc => { # PH Extension!!
|
|
300
315
|
Name => 'ApplicationNotes', # (writable directory!)
|
|
301
316
|
Writable => 'int8u',
|
|
@@ -318,6 +333,17 @@ my %panasonicWhiteBalance = ( #forum9396
|
|
|
318
333
|
noise-reduction strengths the R, G and B channels
|
|
319
334
|
},
|
|
320
335
|
},
|
|
336
|
+
0x8298 => { #github193
|
|
337
|
+
Name => 'Copyright',
|
|
338
|
+
Groups => { 2 => 'Author' },
|
|
339
|
+
Permanent => 1, # (so we don't add it if the model doesn't write it)
|
|
340
|
+
Format => 'undef',
|
|
341
|
+
Writable => 'string',
|
|
342
|
+
WriteGroup => 'IFD0',
|
|
343
|
+
RawConv => $Image::ExifTool::Exif::Main{0x8298}{RawConv},
|
|
344
|
+
RawConvInv => $Image::ExifTool::Exif::Main{0x8298}{RawConvInv},
|
|
345
|
+
PrintConvInv => $Image::ExifTool::Exif::Main{0x8298}{PrintConvInv},
|
|
346
|
+
},
|
|
321
347
|
0x83bb => { # PH Extension!!
|
|
322
348
|
Name => 'IPTC-NAA', # (writable directory!)
|
|
323
349
|
Format => 'undef', # convert binary values as undef
|
|
@@ -58,7 +58,7 @@ use Image::ExifTool::Exif;
|
|
|
58
58
|
use Image::ExifTool::GPS;
|
|
59
59
|
use Image::ExifTool::HP;
|
|
60
60
|
|
|
61
|
-
$VERSION = '3.
|
|
61
|
+
$VERSION = '3.42';
|
|
62
62
|
|
|
63
63
|
sub CryptShutterCount($$);
|
|
64
64
|
sub PrintFilter($$$);
|
|
@@ -72,10 +72,7 @@ sub DecodeAFPoints($$$$;$);
|
|
|
72
72
|
Notes => q{
|
|
73
73
|
The first number gives the series of the lens, and the second identifies the
|
|
74
74
|
lens model. Note that newer series numbers may not always be properly
|
|
75
|
-
identified by cameras running older firmware versions.
|
|
76
|
-
been added to differentiate lenses which would otherwise have the same
|
|
77
|
-
LensType, and are used by the Composite LensID tag when attempting to
|
|
78
|
-
identify the specific lens model.
|
|
75
|
+
identified by cameras running older firmware versions.
|
|
79
76
|
},
|
|
80
77
|
OTHER => sub {
|
|
81
78
|
my ($val, $inv, $conv) = @_;
|
|
@@ -4081,6 +4078,7 @@ my %binaryDataAttrs = (
|
|
|
4081
4078
|
ValueConvInv => '$val=~s/\.\d+$//; $val',
|
|
4082
4079
|
PrintConv => \%pentaxLensTypes,
|
|
4083
4080
|
SeparateTable => 1,
|
|
4081
|
+
PrintInt => 1,
|
|
4084
4082
|
},
|
|
4085
4083
|
3 => { #PH
|
|
4086
4084
|
Name => 'ExtenderStatus',
|
|
@@ -4104,6 +4102,7 @@ my %binaryDataAttrs = (
|
|
|
4104
4102
|
ValueConvInv => '$val=~s/\.\d+$//; $val',
|
|
4105
4103
|
PrintConv => \%pentaxLensTypes,
|
|
4106
4104
|
SeparateTable => 1,
|
|
4105
|
+
PrintInt => 1,
|
|
4107
4106
|
},
|
|
4108
4107
|
3 => {
|
|
4109
4108
|
Name => 'LensData',
|
|
@@ -4139,6 +4138,7 @@ my %binaryDataAttrs = (
|
|
|
4139
4138
|
},
|
|
4140
4139
|
PrintConv => \%pentaxLensTypes,
|
|
4141
4140
|
SeparateTable => 1,
|
|
4141
|
+
PrintInt => 1,
|
|
4142
4142
|
},
|
|
4143
4143
|
4 => {
|
|
4144
4144
|
Name => 'LensData',
|
|
@@ -4174,6 +4174,7 @@ my %binaryDataAttrs = (
|
|
|
4174
4174
|
},
|
|
4175
4175
|
PrintConv => \%pentaxLensTypes,
|
|
4176
4176
|
SeparateTable => 1,
|
|
4177
|
+
PrintInt => 1,
|
|
4177
4178
|
},
|
|
4178
4179
|
13 => {
|
|
4179
4180
|
Name => 'LensData',
|
|
@@ -4209,6 +4210,7 @@ my %binaryDataAttrs = (
|
|
|
4209
4210
|
},
|
|
4210
4211
|
PrintConv => \%pentaxLensTypes,
|
|
4211
4212
|
SeparateTable => 1,
|
|
4213
|
+
PrintInt => 1,
|
|
4212
4214
|
},
|
|
4213
4215
|
12 => {
|
|
4214
4216
|
Name => 'LensData',
|
|
@@ -4245,6 +4247,7 @@ my %binaryDataAttrs = (
|
|
|
4245
4247
|
},
|
|
4246
4248
|
PrintConv => \%pentaxLensTypes,
|
|
4247
4249
|
SeparateTable => 1,
|
|
4250
|
+
PrintInt => 1,
|
|
4248
4251
|
},
|
|
4249
4252
|
15 => {
|
|
4250
4253
|
Name => 'LensData',
|
|
@@ -15,7 +15,7 @@ use vars qw($VERSION);
|
|
|
15
15
|
use Image::ExifTool qw(:DataAccess :Utils);
|
|
16
16
|
use Image::ExifTool::Exif;
|
|
17
17
|
|
|
18
|
-
$VERSION = '1.
|
|
18
|
+
$VERSION = '1.08';
|
|
19
19
|
|
|
20
20
|
sub WritePhaseOne($$$);
|
|
21
21
|
sub ProcessPhaseOne($$$);
|
|
@@ -84,6 +84,7 @@ my @formatName = ( undef, 'string', 'int16s', undef, 'int32s' );
|
|
|
84
84
|
Name => 'RawData',
|
|
85
85
|
Format => 'undef', # (actually 2-byte integers, but don't convert)
|
|
86
86
|
Binary => 1,
|
|
87
|
+
IsImageData => 1,
|
|
87
88
|
PutFirst => 1,
|
|
88
89
|
Writable => 0,
|
|
89
90
|
Drop => 1, # don't copy to other file types
|
|
@@ -584,6 +585,7 @@ sub ProcessPhaseOne($$$)
|
|
|
584
585
|
my $dirLen = $$dirInfo{DirLen} || $$dirInfo{DataLen} - $dirStart;
|
|
585
586
|
my $binary = $et->Options('Binary');
|
|
586
587
|
my $verbose = $et->Options('Verbose');
|
|
588
|
+
my $md5 = $$et{ImageDataMD5};
|
|
587
589
|
my $htmlDump = $$et{HTML_DUMP};
|
|
588
590
|
|
|
589
591
|
return 0 if $dirLen < 12;
|
|
@@ -676,6 +678,17 @@ sub ProcessPhaseOne($$$)
|
|
|
676
678
|
}
|
|
677
679
|
}
|
|
678
680
|
}
|
|
681
|
+
if ($md5 and $tagInfo and $$tagInfo{IsImageData}) {
|
|
682
|
+
my ($pos, $len) = ($valuePtr, $size);
|
|
683
|
+
while ($len) {
|
|
684
|
+
my $n = $len > 65536 ? 65536 : $len;
|
|
685
|
+
my $tmp = substr($$dataPt, $pos, $n);
|
|
686
|
+
$md5->add($tmp);
|
|
687
|
+
$len -= $n;
|
|
688
|
+
$pos += $n;
|
|
689
|
+
}
|
|
690
|
+
$et->VPrint(0, "$$et{INDENT}(ImageDataMD5: $size bytes of PhaseOne:$$tagInfo{Name})\n");
|
|
691
|
+
}
|
|
679
692
|
my %parms = (
|
|
680
693
|
DirName => $ifdType,
|
|
681
694
|
Index => $index,
|
|
@@ -28,7 +28,7 @@ use strict;
|
|
|
28
28
|
use vars qw($VERSION $AUTOLOAD $iptcDigestInfo %printFlags);
|
|
29
29
|
use Image::ExifTool qw(:DataAccess :Utils);
|
|
30
30
|
|
|
31
|
-
$VERSION = '1.
|
|
31
|
+
$VERSION = '1.69';
|
|
32
32
|
|
|
33
33
|
sub ProcessPhotoshop($$$);
|
|
34
34
|
sub WritePhotoshop($$$);
|
|
@@ -74,7 +74,7 @@ my %thumbnailInfo = (
|
|
|
74
74
|
my @tags = qw{ImageWidth ImageHeight FileType};
|
|
75
75
|
my $info = $et->ImageInfo(\$val, @tags);
|
|
76
76
|
my ($w, $h, $type) = @$info{@tags};
|
|
77
|
-
$w and $h and $type eq 'JPEG' or warn("Not a valid JPEG image\n"), return undef;
|
|
77
|
+
$w and $h and $type and $type eq 'JPEG' or warn("Not a valid JPEG image\n"), return undef;
|
|
78
78
|
my $wbytes = int(($w * 24 + 31) / 32) * 4;
|
|
79
79
|
return pack('N6n2', 1, $w, $h, $wbytes, $wbytes * $h, length($val), 24, 1) . $val;
|
|
80
80
|
},
|
|
@@ -571,6 +571,13 @@ my %unicodeString = (
|
|
|
571
571
|
ValueConv => '100 * $val / 255',
|
|
572
572
|
PrintConv => 'sprintf("%d%%",$val)',
|
|
573
573
|
},
|
|
574
|
+
_xvis => {
|
|
575
|
+
Name => 'LayerVisible',
|
|
576
|
+
Format => 'int8u',
|
|
577
|
+
List => 1,
|
|
578
|
+
ValueConv => '$val & 0x02',
|
|
579
|
+
PrintConv => { 0x02 => 'No', 0x00 => 'Yes' },
|
|
580
|
+
},
|
|
574
581
|
# tags extracted from additional layer information (tag ID's are real)
|
|
575
582
|
# - must be able to accommodate a blank entry to preserve the list ordering
|
|
576
583
|
luni => {
|
|
@@ -589,6 +596,16 @@ my %unicodeString = (
|
|
|
589
596
|
List => 1,
|
|
590
597
|
Unknown => 1,
|
|
591
598
|
},
|
|
599
|
+
lclr => {
|
|
600
|
+
Name => 'LayerColors',
|
|
601
|
+
Format => 'int16u',
|
|
602
|
+
Count => 1,
|
|
603
|
+
List => 1,
|
|
604
|
+
PrintConv => {
|
|
605
|
+
0=>'None', 1=>'Red', 2=>'Orange', 3=>'Yellow',
|
|
606
|
+
4=>'Green', 5=>'Blue', 6=>'Violet', 7=>'Gray',
|
|
607
|
+
},
|
|
608
|
+
},
|
|
592
609
|
shmd => { # layer metadata (undocumented structure)
|
|
593
610
|
# (for now, only extract layerTime. May also contain "layerXMP" --
|
|
594
611
|
# it would be nice to decode this but I need a sample)
|
|
@@ -603,6 +620,13 @@ my %unicodeString = (
|
|
|
603
620
|
ValueConv => 'length $val ? ConvertUnixTime($val,1) : ""',
|
|
604
621
|
PrintConv => 'length $val ? $self->ConvertDateTime($val) : ""',
|
|
605
622
|
},
|
|
623
|
+
lsct => {
|
|
624
|
+
Name => 'LayerSections',
|
|
625
|
+
Format => 'int32u',
|
|
626
|
+
Count => 1,
|
|
627
|
+
List => 1,
|
|
628
|
+
PrintConv => { 0 => 'Layer', 1 => 'Folder (open)', 2 => 'Folder (closed)', 3 => 'Divider' },
|
|
629
|
+
},
|
|
606
630
|
);
|
|
607
631
|
|
|
608
632
|
# tags extracted from ImageSourceData found in TIFF images (ref PH)
|
|
@@ -682,7 +706,7 @@ sub ProcessLayersAndMask($$$)
|
|
|
682
706
|
local $_;
|
|
683
707
|
my ($et, $dirInfo, $tagTablePtr) = @_;
|
|
684
708
|
my $raf = $$dirInfo{RAF};
|
|
685
|
-
my $fileType = $$et{
|
|
709
|
+
my $fileType = $$et{FileType};
|
|
686
710
|
my $data;
|
|
687
711
|
|
|
688
712
|
return 0 unless $fileType eq 'PSD' or $fileType eq 'PSB'; # (no layer section in CS1 files)
|
|
@@ -748,17 +772,16 @@ sub ProcessLayers($$$)
|
|
|
748
772
|
my $pos = 0;
|
|
749
773
|
return 0 if $dirLen < 2;
|
|
750
774
|
$raf->Read($buff, 2) == 2 or return 0;
|
|
751
|
-
my $num = Get16s(\$buff, 0);
|
|
775
|
+
my $num = Get16s(\$buff, 0); # number of layers
|
|
752
776
|
$num = -$num if $num < 0; # (first channel is transparency data if negative)
|
|
753
777
|
$et->VerboseDir('Layers', $num, $dirLen);
|
|
754
778
|
$et->HandleTag($tagTablePtr, '_xcnt', $num, Start => $pos, Size => 2, %dinfo); # LayerCount
|
|
755
779
|
my $oldIndent = $$et{INDENT};
|
|
756
780
|
$$et{INDENT} .= '| ';
|
|
757
|
-
|
|
758
781
|
$pos += 2;
|
|
759
782
|
my $psb = $$et{IsPSB}; # is PSB format?
|
|
760
783
|
my $psiz = $psb ? 8 : 4;
|
|
761
|
-
for ($i=0; $i<$num; ++$i) {
|
|
784
|
+
for ($i=0; $i<$num; ++$i) { # process each layer
|
|
762
785
|
$et->VPrint(0, $oldIndent.'+ [Layer '.($i+1)." of $num]\n");
|
|
763
786
|
last if $pos + 18 > $dirLen;
|
|
764
787
|
$raf->Read($buff, 18) == 18 or last;
|
|
@@ -776,6 +799,7 @@ sub ProcessLayers($$$)
|
|
|
776
799
|
$sig =~ /^(8BIM|MIB8)$/ or last; # verify signature
|
|
777
800
|
$et->HandleTag($tagTablePtr, '_xbnd', undef, Start => 4, Size => 4, %dinfo);
|
|
778
801
|
$et->HandleTag($tagTablePtr, '_xopc', undef, Start => 8, Size => 1, %dinfo);
|
|
802
|
+
$et->HandleTag($tagTablePtr, '_xvis', undef, Start =>10, Size => 1, %dinfo);
|
|
779
803
|
my $nxt = $pos + 16 + Get32u(\$buff, 12);
|
|
780
804
|
$n = Get32u(\$buff, 16); # get size of layer mask data
|
|
781
805
|
$pos += 20 + $n; # skip layer mask data
|
|
@@ -823,7 +847,7 @@ sub ProcessLayers($$$)
|
|
|
823
847
|
$raf->Read($buff, $n) == $n or last;
|
|
824
848
|
$dinfo{DataPos} = $pos;
|
|
825
849
|
while ($count{$tag} < $i) {
|
|
826
|
-
$et->HandleTag($tagTablePtr, $tag, '');
|
|
850
|
+
$et->HandleTag($tagTablePtr, $tag, $tag eq 'lsct' ? 0 : '');
|
|
827
851
|
++$count{$tag};
|
|
828
852
|
}
|
|
829
853
|
$et->HandleTag($tagTablePtr, $tag, undef, Start => 0, Size => $n, %dinfo);
|
|
@@ -840,6 +864,13 @@ sub ProcessLayers($$$)
|
|
|
840
864
|
}
|
|
841
865
|
$pos = $nxt;
|
|
842
866
|
}
|
|
867
|
+
# pad lists if necessary to have an entry for each layer
|
|
868
|
+
foreach (sort keys %count) {
|
|
869
|
+
while ($count{$_} < $num) {
|
|
870
|
+
$et->HandleTag($tagTablePtr, $_, $_ eq 'lsct' ? 0 : '');
|
|
871
|
+
++$count{$_};
|
|
872
|
+
}
|
|
873
|
+
}
|
|
843
874
|
$$et{INDENT} = $oldIndent;
|
|
844
875
|
return 1;
|
|
845
876
|
}
|