exiftool_vendored 12.83.0 → 12.86.0

Sign up to get free protection for your applications and to get access to all the features.
data/bin/exiftool CHANGED
@@ -11,7 +11,7 @@ use strict;
11
11
  use warnings;
12
12
  require 5.004;
13
13
 
14
- my $version = '12.83';
14
+ my $version = '12.86';
15
15
 
16
16
  # add our 'lib' directory to the include list BEFORE 'use Image::ExifTool'
17
17
  my $exePath;
@@ -735,6 +735,7 @@ for (;;) {
735
735
  push @isUTF8, 10 if $isAlt;
736
736
  for ($i=0; ; ++$i) {
737
737
  my @entry = Image::ExifTool::Geolocation::GetEntry($i,$langOpt,1) or last;
738
+ $#entry = 9; # remove everything after latitude (eg. feature type)
738
739
  next if $minPop and $entry[7] < $minPop;
739
740
  next if %fcodes and $neg ? $fcodes{lc $entry[6]} : not $fcodes{lc $entry[6]};
740
741
  push @entry, Image::ExifTool::Geolocation::GetAltNames($i,1) if $isAlt;
@@ -2304,8 +2305,8 @@ sub GetImageInfo($$)
2304
2305
  # output using print format file (-p) option
2305
2306
  my ($type, $doc, $grp, $lastDoc, $cache);
2306
2307
  $fileTrailer = '';
2307
- # repeat for each embedded document if necessary
2308
- if ($et->Options('ExtractEmbedded')) {
2308
+ # repeat for each sub-document if necessary
2309
+ if ($$et{DOC_COUNT}) {
2309
2310
  # (cache tag keys if there are sub-documents)
2310
2311
  $lastDoc = $$et{DOC_COUNT} and $cache = { };
2311
2312
  } else {
@@ -4720,50 +4721,50 @@ supported by ExifTool (r = read, w = write, c = create):
4720
4721
 
4721
4722
  File Types
4722
4723
  ------------+-------------+-------------+-------------+------------
4723
- 360 r/w | DOCX r | ITC r | O r | RSRC r
4724
- 3FR r | DPX r | J2C r | ODP r | RTF r
4725
- 3G2 r/w | DR4 r/w/c | JNG r/w | ODS r | RW2 r/w
4726
- 3GP r/w | DSS r | JP2 r/w | ODT r | RWL r/w
4727
- 7Z r | DV r | JPEG r/w | OFR r | RWZ r
4728
- A r | DVB r/w | JSON r | OGG r | RM r
4729
- AA r | DVR-MS r | JXL r/w | OGV r | SEQ r
4730
- AAC r | DYLIB r | K25 r | ONP r | SKETCH r
4731
- AAE r | EIP r | KDC r | OPUS r | SO r
4732
- AAX r/w | EPS r/w | KEY r | ORF r/w | SR2 r/w
4733
- ACR r | EPUB r | LA r | ORI r/w | SRF r
4734
- AFM r | ERF r/w | LFP r | OTF r | SRW r/w
4735
- AI r/w | EXE r | LIF r | PAC r | SVG r
4736
- AIFF r | EXIF r/w/c | LNK r | PAGES r | SWF r
4737
- APE r | EXR r | LRV r/w | PBM r/w | THM r/w
4738
- ARQ r/w | EXV r/w/c | M2TS r | PCD r | TIFF r/w
4739
- ARW r/w | F4A/V r/w | M4A/V r/w | PCX r | TORRENT r
4740
- ASF r | FFF r/w | MACOS r | PDB r | TTC r
4741
- AVI r | FITS r | MAX r | PDF r/w | TTF r
4742
- AVIF r/w | FLA r | MEF r/w | PEF r/w | TXT r
4743
- AZW r | FLAC r | MIE r/w/c | PFA r | VCF r
4744
- BMP r | FLIF r/w | MIFF r | PFB r | VNT r
4745
- BPG r | FLV r | MKA r | PFM r | VRD r/w/c
4746
- BTF r | FPF r | MKS r | PGF r | VSD r
4747
- C2PA r | FPX r | MKV r | PGM r/w | WAV r
4748
- CHM r | GIF r/w | MNG r/w | PLIST r | WDP r/w
4749
- COS r | GLV r/w | MOBI r | PICT r | WEBP r/w
4750
- CR2 r/w | GPR r/w | MODD r | PMP r | WEBM r
4751
- CR3 r/w | GZ r | MOI r | PNG r/w | WMA r
4752
- CRM r/w | HDP r/w | MOS r/w | PPM r/w | WMV r
4753
- CRW r/w | HDR r | MOV r/w | PPT r | WPG r
4754
- CS1 r/w | HEIC r/w | MP3 r | PPTX r | WTV r
4755
- CSV r | HEIF r/w | MP4 r/w | PS r/w | WV r
4756
- CUR r | HTML r | MPC r | PSB r/w | X3F r/w
4757
- CZI r | ICC r/w/c | MPG r | PSD r/w | XCF r
4758
- DCM r | ICO r | MPO r/w | PSP r | XISF r
4759
- DCP r/w | ICS r | MQV r/w | QTIF r/w | XLS r
4760
- DCR r | IDML r | MRC r | R3D r | XLSX r
4761
- DFONT r | IIQ r/w | MRW r/w | RA r | XMP r/w/c
4762
- DIVX r | IND r/w | MXF r | RAF r/w | ZIP r
4763
- DJVU r | INSP r/w | NEF r/w | RAM r |
4764
- DLL r | INSV r | NKSC r/w | RAR r |
4765
- DNG r/w | INX r | NRW r/w | RAW r/w |
4766
- DOC r | ISO r | NUMBERS r | RIFF r |
4724
+ 360 r/w | DOCX r | ITC r | NUMBERS r | RAW r/w
4725
+ 3FR r | DPX r | J2C r | NXD r | RIFF r
4726
+ 3G2 r/w | DR4 r/w/c | JNG r/w | O r | RSRC r
4727
+ 3GP r/w | DSS r | JP2 r/w | ODP r | RTF r
4728
+ 7Z r | DV r | JPEG r/w | ODS r | RW2 r/w
4729
+ A r | DVB r/w | JSON r | ODT r | RWL r/w
4730
+ AA r | DVR-MS r | JXL r/w | OFR r | RWZ r
4731
+ AAC r | DYLIB r | K25 r | OGG r | RM r
4732
+ AAE r | EIP r | KDC r | OGV r | SEQ r
4733
+ AAX r/w | EPS r/w | KEY r | ONP r | SKETCH r
4734
+ ACR r | EPUB r | LA r | OPUS r | SO r
4735
+ AFM r | ERF r/w | LFP r | ORF r/w | SR2 r/w
4736
+ AI r/w | EXE r | LIF r | ORI r/w | SRF r
4737
+ AIFF r | EXIF r/w/c | LNK r | OTF r | SRW r/w
4738
+ APE r | EXR r | LRV r/w | PAC r | SVG r
4739
+ ARQ r/w | EXV r/w/c | M2TS r | PAGES r | SWF r
4740
+ ARW r/w | F4A/V r/w | M4A/V r/w | PBM r/w | THM r/w
4741
+ ASF r | FFF r/w | MACOS r | PCD r | TIFF r/w
4742
+ AVI r | FITS r | MAX r | PCX r | TORRENT r
4743
+ AVIF r/w | FLA r | MEF r/w | PDB r | TTC r
4744
+ AZW r | FLAC r | MIE r/w/c | PDF r/w | TTF r
4745
+ BMP r | FLIF r/w | MIFF r | PEF r/w | TXT r
4746
+ BPG r | FLV r | MKA r | PFA r | VCF r
4747
+ BTF r | FPF r | MKS r | PFB r | VNT r
4748
+ C2PA r | FPX r | MKV r | PFM r | VRD r/w/c
4749
+ CHM r | GIF r/w | MNG r/w | PGF r | VSD r
4750
+ COS r | GLV r/w | MOBI r | PGM r/w | WAV r
4751
+ CR2 r/w | GPR r/w | MODD r | PLIST r | WDP r/w
4752
+ CR3 r/w | GZ r | MOI r | PICT r | WEBP r/w
4753
+ CRM r/w | HDP r/w | MOS r/w | PMP r | WEBM r
4754
+ CRW r/w | HDR r | MOV r/w | PNG r/w | WMA r
4755
+ CS1 r/w | HEIC r/w | MP3 r | PPM r/w | WMV r
4756
+ CSV r | HEIF r/w | MP4 r/w | PPT r | WPG r
4757
+ CUR r | HTML r | MPC r | PPTX r | WTV r
4758
+ CZI r | ICC r/w/c | MPG r | PS r/w | WV r
4759
+ DCM r | ICO r | MPO r/w | PSB r/w | X3F r/w
4760
+ DCP r/w | ICS r | MQV r/w | PSD r/w | XCF r
4761
+ DCR r | IDML r | MRC r | PSP r | XISF r
4762
+ DFONT r | IIQ r/w | MRW r/w | QTIF r/w | XLS r
4763
+ DIVX r | IND r/w | MXF r | R3D r | XLSX r
4764
+ DJVU r | INSP r/w | NEF r/w | RA r | XMP r/w/c
4765
+ DLL r | INSV r | NKA r | RAF r/w | ZIP r
4766
+ DNG r/w | INX r | NKSC r/w | RAM r |
4767
+ DOC r | ISO r | NRW r/w | RAR r |
4767
4768
 
4768
4769
  Meta Information
4769
4770
  ----------------------+----------------------+---------------------
@@ -5677,7 +5678,7 @@ with this command:
5677
5678
 
5678
5679
  produces output like this:
5679
5680
 
5680
- -- Generated by ExifTool 12.83 --
5681
+ -- Generated by ExifTool 12.86 --
5681
5682
  File: a.jpg - 2003:10:31 15:44:19
5682
5683
  (f/5.6, 1/60s, ISO 100)
5683
5684
  File: b.jpg - 2006:05:23 11:57:38
@@ -5916,7 +5917,8 @@ processed file by using %C (upper case) instead of %c. This allows a
5916
5917
  sequential number to be added to output file names, even if the names are
5917
5918
  different. For %C, a copy number of zero is not omitted as it is with %c.
5918
5919
  A leading '-' causes the number to be reset at the start of each new
5919
- directory, and '+' has no effect. The number before the decimal place gives
5920
+ directory (in the original directory structure if the files are being
5921
+ moved), and '+' has no effect. The number before the decimal place gives
5920
5922
  the starting index, the number after the decimal place gives the field
5921
5923
  width. The following examples show the output filenames when used with the
5922
5924
  command C<exiftool rose.jpg star.jpg jet.jpg ...>:
@@ -6922,7 +6924,7 @@ Arguments may be added to copy or set specific tags. Arguments take exactly
6922
6924
  the same form as those on the command line when copying or writing tags,
6923
6925
  but without the leading dash. For example:
6924
6926
 
6925
- exiftool -p '${previewimage;SetTags("comment=test","title<filename"}' ...
6927
+ exiftool -p '${previewimage;SetTags("comment=test","title<filename")}' ...
6926
6928
 
6927
6929
  =head1 WINDOWS UNICODE FILE NAMES
6928
6930
 
@@ -16,7 +16,7 @@ use vars qw($VERSION);
16
16
  use Image::ExifTool::Exif;
17
17
  use Image::ExifTool::PLIST;
18
18
 
19
- $VERSION = '1.11';
19
+ $VERSION = '1.12';
20
20
 
21
21
  sub ConvertPLIST($$);
22
22
 
@@ -128,6 +128,8 @@ sub ConvertPLIST($$);
128
128
  1 => 'ProRAW',
129
129
  2 => 'Portrait',
130
130
  10 => 'Photo',
131
+ 11 => 'Manual Focus', #forum16044
132
+ 12 => 'Scene', #forum16044
131
133
  },
132
134
  },
133
135
  0x0015 => { # (ImageGroupIdentifier, ref 2)
@@ -154,12 +156,17 @@ sub ConvertPLIST($$);
154
156
  },
155
157
  # 0x001b - (PhotosRenderEffect, ref 2)
156
158
  # 0x001c - (BracketedCaptureSequenceNumber, ref 2)
159
+ # 0x001c - Flash, 2="On" (ref PH)
157
160
  0x001d => { #2
158
161
  Name => 'LuminanceNoiseAmplitude',
159
162
  Writable => 'rational64s',
160
163
  },
161
164
  # 0x001e - (OriginatingAppID, ref 2)
162
- # 0x001f - int32s: 0,1 (PhotosAppFeatureFlags, ref 2)
165
+ 0x001f => {
166
+ Name => 'PhotosAppFeatureFlags', #2
167
+ Notes => 'set if person or pet detected in image', #PH
168
+ Writable => 'int32s',
169
+ },
163
170
  0x0020 => { # (ImageCaptureRequestIdentifier, ref 2)
164
171
  Name => 'ImageCaptureRequestID',
165
172
  Writable => 'string',
@@ -170,6 +177,17 @@ sub ConvertPLIST($$);
170
177
  Writable => 'rational64s',
171
178
  },
172
179
  # 0x0022 - (ARKitPhoto, ref 2)
180
+ 0x0023 => {
181
+ Name => 'AFPerformance', #2
182
+ Writable => 'int32s',
183
+ Count => 2,
184
+ Notes => q{
185
+ first number maybe related to focus distance, last number maybe related to
186
+ focus accuracy
187
+ },
188
+ PrintConv => 'my @a=split " ",$val; sprintf("%d %d %d",$a[0],$a[1]>>28,$a[1]&0xfffffff)',
189
+ PrintConvInv => 'my @a=split " ",$val; sprintf("%d %d",$a[0],($a[1]<<28)+$a[2])',
190
+ },
173
191
  # 0x0023 - int32s[2] (AFPerformance, ref 2)
174
192
  # 0x0024 - (AFExternalOffset, ref 2)
175
193
  0x0025 => { # (StillImageSceneFlags, ref 2)
@@ -196,7 +214,21 @@ sub ConvertPLIST($$);
196
214
  },
197
215
  # 0x002C - (SpatialOverCaptureImageType, ref 2)
198
216
  # 0x002D - (CCT, ref 2)
217
+ 0x002d => { #PH
218
+ Name => 'ColorTemperature',
219
+ Writable => 'int32s',
220
+ },
199
221
  # 0x002E - (ApsMode, ref 2)
222
+ 0x002e => { #PH
223
+ Name => 'CameraType',
224
+ Writable => 'int32s',
225
+ PrintConv => {
226
+ 0 => 'Back Wide Angle',
227
+ 1 => 'Back Normal',
228
+ 6 => 'Front',
229
+ },
230
+ },
231
+ # 0x002e - set to 0 for 0.5x (crop?) (ref PH)
200
232
  0x002F => { #2
201
233
  Name => 'FocusPosition',
202
234
  Writable => 'int32s',
@@ -209,7 +241,9 @@ sub ConvertPLIST($$);
209
241
  # 0x0032 - (IntelligentDistortionCorrection, ref 2)
210
242
  # 0x0033 - (NRFStatus, ref 2)
211
243
  # 0x0034 - (NRFInputBracketCount, ref 2)
244
+ # 0x0034 - 1 for flash on, otherwise doesn't exist (ref PH)
212
245
  # 0x0035 - (NRFRegisteredBracketCount, ref 2)
246
+ # 0x0035 - 0 for flash on, otherwise doesn't exist (ref PH)
213
247
  # 0x0036 - (LuxLevel, ref 2)
214
248
  # 0x0037 - (LastFocusingMethod, ref 2)
215
249
  0x0038 => { # (TimeOfFlightAssistedAutoFocusEstimatorMeasuredDepth, ref 2)
@@ -219,8 +253,10 @@ sub ConvertPLIST($$);
219
253
  },
220
254
  # 0x0039 - (TimeOfFlightAssistedAutoFocusEstimatorROIType, ref 2)
221
255
  # 0x003A - (NRFSRLStatus, ref 2)
256
+ # 0x003a - non-zero if a person was in the image? (ref PH)
222
257
  # 0x003B - (SystemPressureLevel, ref 2)
223
258
  # 0x003C - (CameraControlsStatisticsMaster, ref 2)
259
+ # 0x003c - 4=rear cam, 1=front cam? (ref PH)
224
260
  0x003D => { # (TimeOfFlightAssistedAutoFocusEstimatorSensorConfidence, ref 2)
225
261
  Name => 'AFConfidence',
226
262
  Writable => 'int32s',
@@ -237,6 +273,7 @@ sub ConvertPLIST($$);
237
273
  },
238
274
  0x0040 => { #2
239
275
  Name => 'SemanticStyle',
276
+ Notes => '_1=Tone, _2=Warm, _3=1.Std,2.Vibrant,3.Rich Contrast,4.Warm,5.Cool', #PH
240
277
  ValueConv => \&ConvertPLIST,
241
278
  },
242
279
  0x0041 => { # (SemanticStyleKey_RenderingVersion, ref 2)
@@ -249,20 +286,28 @@ sub ConvertPLIST($$);
249
286
  },
250
287
  # 0x0043 - (SemanticStyleKey_ToneBias, ref 2)
251
288
  # 0x0044 - (SemanticStyleKey_WarmthBias, ref 2)
252
- 0x0045 => { # (FrontFacing, ref 2)
253
- Name => 'FrontFacingCamera',
254
- Writable => 'int32s',
255
- PrintConv => { 0 => 'No', 1 => 'Yes' }, #PH (NC)
256
- },
289
+ # 0x0045 - (FrontFacing, ref 2) (not for iPhone15, ref PH)
257
290
  # 0x0046 - (TimeOfFlightAssistedAutoFocusEstimatorContainsBlindSpot, ref 2)
258
291
  # 0x0047 - (LeaderFollowerAutoFocusLeaderDepth, ref 2)
259
292
  # 0x0048 - (LeaderFollowerAutoFocusLeaderFocusMethod, ref 2)
260
293
  # 0x0049 - (LeaderFollowerAutoFocusLeaderConfidence, ref 2)
261
294
  # 0x004A - (LeaderFollowerAutoFocusLeaderROIType, ref 2)
295
+ # 0x004a - 2=back normal, 4=back wide angle, 5=front (ref PH)
262
296
  # 0x004B - (ZeroShutterLagFailureReason, ref 2)
263
297
  # 0x004C - (TimeOfFlightAssistedAutoFocusEstimatorMSPMeasuredDepth, ref 2)
264
298
  # 0x004D - (TimeOfFlightAssistedAutoFocusEstimatorMSPSensorConfidence, ref 2)
265
299
  # 0x004E - (Camera, ref 2)
300
+ 0x004e => {
301
+ Name => 'Apple_0x004e',
302
+ Unknown => 1,
303
+ # first number is 0 for front cam, 1 for either back cam (ref PH)
304
+ ValueConv => \&ConvertPLIST,
305
+ },
306
+ 0x004f => {
307
+ Name => 'Apple_0x004f',
308
+ Unknown => 1,
309
+ ValueConv => \&ConvertPLIST,
310
+ }
266
311
  );
267
312
 
268
313
  # PLIST-format CMTime structure (ref PH)
@@ -35,7 +35,7 @@ use Image::ExifTool::Sony;
35
35
  use Image::ExifTool::Validate;
36
36
  use Image::ExifTool::MacOS;
37
37
 
38
- $VERSION = '3.56';
38
+ $VERSION = '3.57';
39
39
  @ISA = qw(Exporter);
40
40
 
41
41
  sub NumbersFirst($$);
@@ -600,7 +600,8 @@ running ExifTool the old information may be removed permanently using the
600
600
  DNG => q{
601
601
  The main DNG tags are found in the EXIF table. The tables below define only
602
602
  information found within structures of these main DNG tag values. See
603
- L<http://www.adobe.com/products/dng/> for the official DNG specification.
603
+ L<https://helpx.adobe.com/camera-raw/digital-negative.html> for the official
604
+ DNG specification.
604
605
  },
605
606
  MPEG => q{
606
607
  The MPEG format doesn't specify any file-level meta information. In lieu of
@@ -88,7 +88,7 @@ sub ProcessCTMD($$$);
88
88
  sub ProcessExifInfo($$$);
89
89
  sub SwapWords($);
90
90
 
91
- $VERSION = '4.74';
91
+ $VERSION = '4.76';
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)
@@ -2590,6 +2590,13 @@ my %offOn = ( 0 => 'Off', 1 => 'On' );
2590
2590
  },
2591
2591
  # 47 - related to aspect ratio: 100=4:3,70=1:1/16:9,90=3:2,60=4:5 (PH G12)
2592
2592
  # (roughly image area in percent - 4:3=100%,1:1/16:9=75%,3:2=89%,4:5=60%)
2593
+ 51 => { #forum16036 (EOS R models)
2594
+ Name => 'Clarity',
2595
+ PrintConv => {
2596
+ OTHER => sub { shift },
2597
+ 0x7fff => 'n/a',
2598
+ },
2599
+ },
2593
2600
  );
2594
2601
 
2595
2602
  # focal length information (MakerNotes tag 0x02)
@@ -7031,7 +7038,7 @@ my %ciMaxFocal = (
7031
7038
  },
7032
7039
  },
7033
7040
  2 => { #12
7034
- Name => 'Sharpness',
7041
+ Name => 'Sharpness', # (unsharp mask strength for the EOS R5)
7035
7042
  Notes => 'all models except the 20D and 350D',
7036
7043
  Condition => '$$self{Model} !~ /\b(20D|350D|REBEL XT|Kiss Digital N)\b/',
7037
7044
  Priority => 0, # (maybe not as reliable as other sharpness values)
@@ -7077,6 +7084,8 @@ my %ciMaxFocal = (
7077
7084
  Name => 'WBShiftGM',
7078
7085
  Notes => 'positive is a shift toward green',
7079
7086
  },
7087
+ 14 => 'UnsharpMaskFineness', #forum16036
7088
+ 15 => 'UnsharpMaskThreshold', #forum16036
7080
7089
  );
7081
7090
 
7082
7091
  # Color balance information (MakerNotes tag 0xa9) (ref PH)
@@ -8992,20 +9001,32 @@ my %filterConv = (
8992
9001
  4 => 'Focus High Priority',
8993
9002
  },
8994
9003
  },
8995
- 7 => { #52
9004
+ 7 => [{ #forum16068
8996
9005
  Name => 'USMLensElectronicMF',
9006
+ Condition => '$$self{Model} =~ /EOS R\d/',
9007
+ Notes => 'EOS R models',
9008
+ PrintConv => {
9009
+ 0 => 'Disable After One-Shot',
9010
+ 1 => 'One-Shot -> Enabled',
9011
+ 2 => 'One-Shot -> Enabled (magnify)',
9012
+ 3 => 'Disable in AF Mode',
9013
+ },
9014
+ },{ #52
9015
+ Name => 'USMLensElectronicMF',
9016
+ Notes => 'Other models',
8997
9017
  PrintConv => {
8998
9018
  0 => 'Enable After AF',
8999
9019
  1 => 'Disable After AF',
9000
9020
  2 => 'Disable in AF Mode',
9001
9021
  },
9002
- },
9022
+ }],
9003
9023
  8 => { #52
9004
9024
  Name => 'AFAssistBeam',
9005
9025
  PrintConv => {
9006
9026
  0 => 'Enable',
9007
9027
  1 => 'Disable',
9008
9028
  2 => 'IR AF Assist Beam Only',
9029
+ 3 => 'LED AF Assist Beam Only', #forum16068
9009
9030
  },
9010
9031
  },
9011
9032
  9 => { #52
@@ -9104,6 +9125,19 @@ my %filterConv = (
9104
9125
  2 => 'Auto', #PH (1DXmkII)
9105
9126
  },
9106
9127
  },
9128
+ 20 => { #forum16068
9129
+ Name => 'SubjectToDetect',
9130
+ PrintConv => {
9131
+ 0 => 'None',
9132
+ 1 => 'People',
9133
+ 2 => 'Animals',
9134
+ 3 => 'Vehicles',
9135
+ },
9136
+ },
9137
+ 24 => { #forum16068
9138
+ Name => 'EyeDetection',
9139
+ PrintConv => \%offOn,
9140
+ },
9107
9141
  );
9108
9142
 
9109
9143
  # RAW burst mode info (MakerNotes tag 0x403f) (ref 25)
@@ -23,7 +23,7 @@ use vars qw($VERSION);
23
23
  use Image::ExifTool qw(:DataAccess :Utils);
24
24
  use Image::ExifTool::Canon;
25
25
 
26
- $VERSION = '1.40';
26
+ $VERSION = '1.41';
27
27
 
28
28
  sub ProcessCanonVRD($$;$);
29
29
  sub WriteCanonVRD($$;$);
@@ -1020,6 +1020,18 @@ my $blankFooter = "CANON OPTIONAL DATA\0" . ("\0" x 42) . "\xff\xd9";
1020
1020
  # 0x10018 - fmt=8: 0
1021
1021
  # 0x10020 - fmt=2: ''
1022
1022
  0x10021 => 'CustomPictureStyle', # (string)
1023
+ 0x10100 => { #forum15965
1024
+ Name => 'Rating',
1025
+ PrintConv => {
1026
+ 0 => 'Unrated',
1027
+ 1 => 1,
1028
+ 2 => 2,
1029
+ 3 => 3,
1030
+ 4 => 4,
1031
+ 5 => 5,
1032
+ 4294967295 => 'Rejected',
1033
+ },
1034
+ },
1023
1035
  0x10101 => {
1024
1036
  Name => 'CheckMark',
1025
1037
  PrintConv => {
@@ -1200,9 +1212,9 @@ my $blankFooter = "CANON OPTIONAL DATA\0" . ("\0" x 42) . "\xff\xd9";
1200
1212
  4 => 'Emphasize Center',
1201
1213
  },
1202
1214
  },
1215
+ 0x2070b => { Name => 'DiffractionCorrectionOn', %noYes },
1203
1216
  # 0x20800 - fmt=1: 0
1204
1217
  # 0x20801 - fmt=1: 0
1205
- 0x2070b => { Name => 'DiffractionCorrectionOn', %noYes },
1206
1218
  0x20900 => 'ColorHue',
1207
1219
  0x20901 => 'SaturationAdj',
1208
1220
  0x20910 => 'RedHSL',
@@ -1270,6 +1282,9 @@ my $blankFooter = "CANON OPTIONAL DATA\0" . ("\0" x 42) . "\xff\xd9";
1270
1282
  # 0xf0521 - DLO data
1271
1283
  # 0xf0520 - DLO data
1272
1284
  # 0xf0530 - created when dust delete data applied (4 bytes, all zero)
1285
+ # 0xf0561 - 1932 bytes, related to Partial Adjustment Tool Palette (ref forum15660)
1286
+ # 0xf0562 - 1596 bytes, related to Partial Adjustment Tool Palette (ref forum15660)
1287
+ # 0xf0566 - 1520 bytes, related to Partial Adjustment Tool Palette (ref forum15660)
1273
1288
  # 0xf0600 - fmt=253 (2308 bytes, JPG images)
1274
1289
  # 0xf0601 - fmt=253 (2308 bytes, JPG images)
1275
1290
  # 0x1ff52c - values: 129,130,132 (related to custom picture style somehow)
@@ -15,7 +15,7 @@ use strict;
15
15
  use vars qw($VERSION);
16
16
  use Image::ExifTool qw(:DataAccess :Utils);
17
17
 
18
- $VERSION = '1.06';
18
+ $VERSION = '1.07';
19
19
 
20
20
  # DPX tags
21
21
  %Image::ExifTool::DPX::Main = (
@@ -97,7 +97,7 @@ $VERSION = '1.06';
97
97
  3 => 'Logarithmic',
98
98
  4 => 'Unspecified video',
99
99
  5 => 'SMPTE 274M',
100
- 6 => 'ITU-R 704-4',
100
+ 6 => 'ITU-R 709-4',
101
101
  7 => 'ITU-R 601-5 system B or G (625)',
102
102
  8 => 'ITU-R 601-5 system M (525)',
103
103
  9 => 'Composite video (NTSC)',
@@ -124,7 +124,7 @@ $VERSION = '1.06';
124
124
  1 => 'Printing density',
125
125
  4 => 'Unspecified video',
126
126
  5 => 'SMPTE 274M',
127
- 6 => 'ITU-R 704-4',
127
+ 6 => 'ITU-R 709-4',
128
128
  7 => 'ITU-R 601-5 system B or G (625)',
129
129
  8 => 'ITU-R 601-5 system M (525)',
130
130
  9 => 'Composite video (NTSC)',
Binary file