exiftool_vendored 13.31.0 → 13.34.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.
Files changed (44) hide show
  1. checksums.yaml +4 -4
  2. data/bin/Changes +56 -1
  3. data/bin/MANIFEST +5 -0
  4. data/bin/META.json +1 -1
  5. data/bin/META.yml +1 -1
  6. data/bin/README +47 -46
  7. data/bin/exiftool +114 -89
  8. data/bin/lib/Image/ExifTool/BuildTagLookup.pm +7 -5
  9. data/bin/lib/Image/ExifTool/Canon.pm +19 -2
  10. data/bin/lib/Image/ExifTool/Exif.pm +9 -6
  11. data/bin/lib/Image/ExifTool/FlashPix.pm +4 -159
  12. data/bin/lib/Image/ExifTool/FujiFilm.pm +11 -3
  13. data/bin/lib/Image/ExifTool/Geotag.pm +5 -3
  14. data/bin/lib/Image/ExifTool/GoPro.pm +14 -2
  15. data/bin/lib/Image/ExifTool/LNK.pm +4 -1
  16. data/bin/lib/Image/ExifTool/Lang/cs.pm +0 -1
  17. data/bin/lib/Image/ExifTool/Lang/de.pm +0 -1
  18. data/bin/lib/Image/ExifTool/Lang/fr.pm +0 -1
  19. data/bin/lib/Image/ExifTool/Lang/it.pm +0 -1
  20. data/bin/lib/Image/ExifTool/Lang/ja.pm +0 -1
  21. data/bin/lib/Image/ExifTool/Lang/nl.pm +0 -1
  22. data/bin/lib/Image/ExifTool/Lang/pl.pm +0 -1
  23. data/bin/lib/Image/ExifTool/Lang/zh_cn.pm +0 -1
  24. data/bin/lib/Image/ExifTool/Microsoft.pm +158 -1
  25. data/bin/lib/Image/ExifTool/Minolta.pm +4 -2
  26. data/bin/lib/Image/ExifTool/Nikon.pm +72 -37
  27. data/bin/lib/Image/ExifTool/NikonCustom.pm +40 -10
  28. data/bin/lib/Image/ExifTool/Olympus.pm +254 -34
  29. data/bin/lib/Image/ExifTool/Panasonic.pm +3 -3
  30. data/bin/lib/Image/ExifTool/Pentax.pm +340 -61
  31. data/bin/lib/Image/ExifTool/QuickTime.pm +11 -4
  32. data/bin/lib/Image/ExifTool/README +2 -1
  33. data/bin/lib/Image/ExifTool/Sony.pm +44 -17
  34. data/bin/lib/Image/ExifTool/TNEF.pm +487 -0
  35. data/bin/lib/Image/ExifTool/TagLookup.pm +4380 -4265
  36. data/bin/lib/Image/ExifTool/TagNames.pod +265 -19
  37. data/bin/lib/Image/ExifTool/WriteExif.pl +14 -12
  38. data/bin/lib/Image/ExifTool/Writer.pl +19 -15
  39. data/bin/lib/Image/ExifTool/XMPStruct.pl +1 -1
  40. data/bin/lib/Image/ExifTool.pm +12 -4
  41. data/bin/lib/Image/ExifTool.pod +50 -44
  42. data/bin/perl-Image-ExifTool.spec +46 -45
  43. data/lib/exiftool_vendored/version.rb +1 -1
  44. metadata +3 -2
@@ -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 28455 tags, with 17676 unique tag names.
15
+ They contain a total of 28636 tags, with 17834 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
@@ -364,11 +364,11 @@ tags remain.
364
364
 
365
365
  The table below lists all EXIF tags. Also listed are TIFF, DNG, HDP and
366
366
  other tags which are not part of the EXIF specification, but may co-exist
367
- with EXIF tags in some images. Tags which are part of the EXIF 2.32
367
+ with EXIF tags in some images. Tags which are part of the EXIF 3.0
368
368
  specification have an underlined B<Tag Name> in the HTML version of this
369
369
  documentation. See
370
- L<https://web.archive.org/web/20190624045241if_/http://www.cipa.jp:80/std/documents/e/DC-008-Translation-2019-E.pdf>
371
- for the official EXIF 2.32 specification.
370
+ L<https://www.cipa.jp/std/documents/download_e.html?CIPA_DC-008-2024-E>
371
+ for the official EXIF 3.0 specification.
372
372
 
373
373
  Tag ID Tag Name Group Writable
374
374
  ------ -------- ----- --------
@@ -1039,6 +1039,8 @@ for the official EXIF 2.32 specification.
1039
1039
  0xc7aa CacheVersion SubIFD2 int32u!
1040
1040
  0xc7b5 DefaultUserCrop SubIFD rational64u[4]!
1041
1041
  0xc7d5 NikonNEFInfo - Nikon NEFInfo
1042
+ 0xc7d7 ZIFMetadata - no
1043
+ 0xc7d8 ZIFAnnotations - no
1042
1044
  0xc7e9 DepthFormat IFD0 int16u!
1043
1045
  0xc7ea DepthNear IFD0 rational64u!
1044
1046
  0xc7eb DepthFar IFD0 rational64u!
@@ -8048,7 +8050,9 @@ boot, not including standby time.
8048
8050
  41 ManualFlashOutput int16s
8049
8051
  42 ColorTone int16s
8050
8052
  46 SRAWQuality int16s
8053
+ 50 FocusBracketing int16s
8051
8054
  51 Clarity int16s
8055
+ 52 HDR-PQ int16s
8052
8056
 
8053
8057
  =head3 Canon FocalLength Tags
8054
8058
 
@@ -10335,6 +10339,7 @@ Information about creative filter settings.
10335
10339
  18 AFStatusViewfinder int32s
10336
10340
  19 InitialAFPointInServo int32s
10337
10341
  20 SubjectToDetect int32s
10342
+ 21 SubjectSwitching int32s
10338
10343
  24 EyeDetection int32s
10339
10344
 
10340
10345
  =head3 Canon RawBurstInfo Tags
@@ -12185,6 +12190,9 @@ Tags extracted from FLIR Public image Format (FPF) files.
12185
12190
  0x1446 FlickerReduction int32u
12186
12191
  0x1447 FujiModel string
12187
12192
  0x1448 FujiModel2 string
12193
+ 0x144a WBRed int16u
12194
+ 0x144b WBGreen int16u
12195
+ 0x144c WBBlue int16u
12188
12196
  0x144d RollAngle rational64s
12189
12197
  0x3803 VideoRecordingMode int32u
12190
12198
  0x3804 PeripheralLighting int16u
@@ -15992,13 +16000,11 @@ These tags are used by the Z8 firmware 2.00 and 2.10.
15992
16000
  1812 NonCPULens1MaxAperture? int32u~
15993
16001
  1816 NonCPULens2MaxAperture? int32u~
15994
16002
  1820 NonCPULens3MaxAperture? int32u~
15995
- 1824 HDMIOutputResolution int8u
16003
+ 1824 NonCPULens4MaxAperture? int32u~
15996
16004
  1828 NonCPULens5MaxAperture? int32u~
15997
16005
  1832 NonCPULens6MaxAperture? int32u~
15998
16006
  1836 NonCPULens7MaxAperture? int32u~
15999
16007
  1840 NonCPULens8MaxAperture? int32u~
16000
- 1842 AirplaneMode? int8u
16001
- 1843 EmptySlotRelease? int8u
16002
16008
  1844 NonCPULens9MaxAperture? int32u~
16003
16009
  1848 NonCPULens10MaxAperture? int32u~
16004
16010
  1852 NonCPULens11MaxAperture? int32u~
@@ -16008,12 +16014,15 @@ These tags are used by the Z8 firmware 2.00 and 2.10.
16008
16014
  1868 NonCPULens15MaxAperture? int32u~
16009
16015
  1872 NonCPULens16MaxAperture? int32u~
16010
16016
  1876 NonCPULens17MaxAperture? int32u~
16011
- 1878 EnergySavingMode? int8u
16012
16017
  1880 NonCPULens18MaxAperture? int32u~
16013
16018
  1884 NonCPULens19MaxAperture? int32u~
16014
16019
  1888 NonCPULens20MaxAperture? int32u~
16015
- 1906 USBPowerDelivery? int8u
16016
- 1915 SensorShield? int8u
16020
+ 1904 HDMIOutputResolution int8u
16021
+ 1922 AirplaneMode? int8u
16022
+ 1923 EmptySlotRelease? int8u
16023
+ 1958 EnergySavingMode? int8u
16024
+ 1986 USBPowerDelivery? int8u
16025
+ 1995 SensorShield? int8u
16017
16026
  2046 PixelShiftShooting int8u
16018
16027
  2048 PixelShiftNumberShots int8u
16019
16028
  2050 PixelShiftDelay int8u
@@ -16024,6 +16033,9 @@ These tags are used by the Z8 firmware 2.00 and 2.10.
16024
16033
  2060 LensFunc2ButtonPlaybackMode int8u
16025
16034
  2062 PlaybackButtonPlaybackMode int8u
16026
16035
  2064 BracketButtonPlaybackMode int8u
16036
+ 2206 MaximumApertureLV? int8u
16037
+ 2208 ReleaseModeButton int8u
16038
+ 2216 ReleaseModeButtonPlaybackMode int8u
16027
16039
 
16028
16040
  =head3 Nikon ShotInfoZ9 Tags
16029
16041
 
@@ -16833,7 +16845,7 @@ Z6, Z6ii, Z7, Z7ii, Z50 and Zfc.
16833
16845
  =head3 Nikon AFInfo2V0400 Tags
16834
16846
 
16835
16847
  AF information for Nikon cameras with the Expeed 7 processor: The Zf, Z6_3,
16836
- Z8, Z9 and Z50_3.
16848
+ Z8, Z9, Z50_2 and Z5_2.
16837
16849
 
16838
16850
  Index1 Tag Name Writable
16839
16851
  ------ -------- --------
@@ -18557,6 +18569,7 @@ Custom settings for the Z8.
18557
18569
  263 AutoFocusModeRestrictions? int8u
18558
18570
  267 CHModeShootingSpeed int8u
18559
18571
  273 FlashBurstPriority? int8u
18572
+ 281 Func3Button int8u
18560
18573
  335 LimitAF-AreaModeSelDynamic_S? int8u
18561
18574
  336 LimitAF-AreaModeSelDynamic_M? int8u
18562
18575
  337 LimitAF-AreaModeSelDynamic_L? int8u
@@ -18578,7 +18591,6 @@ Custom settings for the Z8.
18578
18591
  465 SubCommandDialVideoPlaybackMode? int8u
18579
18592
  467 FocusPointLock? int8u
18580
18593
  469 ControlRingResponse int8u
18581
- 515 MovieAFAreaMode? int8u
18582
18594
  529 ZebraPatternToneRange? int8u
18583
18595
  531 MovieZebraPattern? int8u
18584
18596
  533 MovieHighlightDisplayThreshold? int8u
@@ -18878,7 +18890,6 @@ Custom settings for the Z9.
18878
18890
  493 ControlRingResponse int8u
18879
18891
  505 VerticalMovieFuncButton? int8u
18880
18892
  529 VerticalMovieAFOnButton? int8u
18881
- 539 MovieAFAreaMode? int8u
18882
18893
  551 HDMIViewAssist? int8u
18883
18894
  553 ZebraPatternToneRange? int8u
18884
18895
  555 MovieZebraPattern? int8u
@@ -19340,6 +19351,8 @@ any information found here will be extracted, even if the tag is not listed.
19340
19351
  0x0307 AFFineTuneAdj int16s[3]
19341
19352
  0x0308 FocusBracketStepSize int8u
19342
19353
  0x0309 AISubjectTrackingMode int16u
19354
+ 0x030a AFTargetInfo Olympus AFTargetInfo
19355
+ 0x030b SubjectDetectInfo Olympus SubjectDetectInfo
19343
19356
  0x0400 FlashMode int16u
19344
19357
  0x0401 FlashExposureComp rational64s
19345
19358
  0x0403 FlashRemoteControl int16u
@@ -19384,6 +19397,7 @@ any information found here will be extracted, even if the tag is not listed.
19384
19397
  0x0603 ImageQuality2 int16u
19385
19398
  0x0604 ImageStabilization int32u
19386
19399
  0x0804 StackedImage int32u[2]
19400
+ 0x0821 ISOAutoSettings int16u[2]
19387
19401
  0x0900 ManometerPressure int16u
19388
19402
  0x0901 ManometerReading int32s[2]
19389
19403
  0x0902 ExtendedWBDetect int16u
@@ -19391,6 +19405,31 @@ any information found here will be extracted, even if the tag is not listed.
19391
19405
  0x0904 PitchAngle int16s[2]
19392
19406
  0x0908 DateTimeUTC string
19393
19407
 
19408
+ =head3 Olympus AFTargetInfo Tags
19409
+
19410
+ Position and size of selected AF Area and focus areas for OM cameras.
19411
+
19412
+ Index2 Tag Name Writable
19413
+ ------ -------- --------
19414
+ 0 AFFrameSize int16u[2]
19415
+ 2 AFFocusArea int16u[4]
19416
+ 6 AFSelectedArea int16u[4]
19417
+
19418
+ =head3 Olympus SubjectDetectInfo Tags
19419
+
19420
+ Subject Detection data for OM cameras. These tags contain the areas of a
19421
+ subject and its elements detected by Subject Detection, or the main face and
19422
+ eyes detected by Face Detection. These elements can be either L1 details
19423
+ (level 1, such as head, chassis, airplane nose, etc.) or L2 details (level
19424
+ 2, such as eye, driver, airplane cockpit, etc.).
19425
+
19426
+ Index2 Tag Name Writable
19427
+ ------ -------- --------
19428
+ 0 SubjectDetectFrameSize int16u[2]
19429
+ 2 SubjectDetectArea int16u[4]
19430
+ 6 SubjectDetectDetail int16u[4]
19431
+ 10 SubjectDetectStatus int16u
19432
+
19394
19433
  =head3 Olympus RawDevelopment Tags
19395
19434
 
19396
19435
  Tag ID Tag Name Writable
@@ -19438,6 +19477,13 @@ any information found here will be extracted, even if the tag is not listed.
19438
19477
  0x0119 RawDevAutoGradation int16u
19439
19478
  0x0120 RawDevPMNoiseFilter int16u
19440
19479
  0x0121 RawDevArtFilter int16u[4]
19480
+ 0x8000 RawDevSubIFD Olympus RawDevSubIFD
19481
+
19482
+ =head3 Olympus RawDevSubIFD Tags
19483
+
19484
+ Tag ID Tag Name Writable
19485
+ ------ -------- --------
19486
+ [no tags known]
19441
19487
 
19442
19488
  =head3 Olympus ImageProcessing Tags
19443
19489
 
@@ -19506,6 +19552,7 @@ any information found here will be extracted, even if the tag is not listed.
19506
19552
  0x1900 KeystoneCompensation int8u[2]
19507
19553
  0x1901 KeystoneDirection int8u[2]
19508
19554
  0x1906 KeystoneValue int16s[3]
19555
+ 0x2110 GNDFilterType int8u
19509
19556
 
19510
19557
  =head3 Olympus FocusInfo Tags
19511
19558
 
@@ -19534,12 +19581,13 @@ any information found here will be extracted, even if the tag is not listed.
19534
19581
  0x120a MacroLED int16u
19535
19582
  0x1500 SensorTemperature int16s
19536
19583
  0x1600 ImageStabilization undef~
19584
+ 0x2100 AntiShockWaitingTime yes
19537
19585
 
19538
19586
  =head3 Olympus AFInfo Tags
19539
19587
 
19540
19588
  Index1 Tag Name Writable
19541
19589
  ------ -------- --------
19542
- [no tags known]
19590
+ 1580 CAFSensitivity no
19543
19591
 
19544
19592
  =head3 Olympus FE Tags
19545
19593
 
@@ -20360,6 +20408,8 @@ These tags are used in Pentax/Asahi cameras.
20360
20408
  0x0402 ToneCurve yes~
20361
20409
  0x0403 ToneCurves yes~
20362
20410
  0x0405 UnknownBlock? undef
20411
+ 0x040b FaceInfoK3III Pentax FaceInfoK3III
20412
+ 0x040c AFInfoK3III Pentax AFInfoK3III
20363
20413
  0x0e00 PrintIM PrintIM
20364
20414
 
20365
20415
  =head3 Pentax LensRec Tags
@@ -20677,10 +20727,16 @@ Flash information tags for the K10D, K20D and K200D.
20677
20727
  7 AFIntegrationTime int8u
20678
20728
  11 AFPointsInFocus int8u
20679
20729
  20 AFPointValues? no
20680
- 298 AFPointsSelected int8u[41]~
20681
- 399 AFPointsUnknown? int8u[41]~
20730
+ 298 AFPointsSelected int8u[101]~
20731
+ 399 AFPointsUnknown? int8u[101]~
20682
20732
  506 LiveView int8u
20683
20733
  509 AFHold int8u
20734
+ 543 FirstFrameActionInAFC int8u
20735
+ 544 ActionInAFCCont int8u
20736
+ 545 AFCHold int8u & 0x03
20737
+ 545.1 AFCSensitivity int8u & 0x0c
20738
+ 545.2 AFCPointTracking int8u & 0x70
20739
+ 2400 SubjectRecognition int8u
20684
20740
 
20685
20741
  =head3 Pentax KelvinWB Tags
20686
20742
 
@@ -20922,6 +20978,7 @@ sensors are located in the camera.
20922
20978
 
20923
20979
  Index1 Tag Name Writable
20924
20980
  ------ -------- --------
20981
+ 10 ShotNumber no
20925
20982
  12 SensorTemperature int16s
20926
20983
  14 SensorTemperature2 int16s
20927
20984
  20 CameraTemperature4 int16s
@@ -20934,6 +20991,90 @@ sensors are located in the camera.
20934
20991
  ------ -------- --------
20935
20992
  [no tags known]
20936
20993
 
20994
+ =head3 Pentax FaceInfoK3III Tags
20995
+
20996
+ Index4 Tag Name Writable
20997
+ ------ -------- --------
20998
+ 0 FaceImageSize int32u[2]
20999
+ 0.1 FaceInfoK3III? int32u[$size/4]
21000
+ 2 CAFArea int32u[4]
21001
+ 6 FacesDetectedA int32u
21002
+ 8 FacesDetectedB int32u
21003
+ 10 Face1AArea int32u[4]
21004
+ 14 Face1AEye1 int32u[4]
21005
+ 18 Face1AEye2 int32u[4]
21006
+ 30 Face2AArea int32u[4]
21007
+ 34 Face2AEye1 int32u[4]
21008
+ 38 Face2AEye2 int32u[4]
21009
+ 50 Face3AArea int32u[4]
21010
+ 54 Face3AEye1 int32u[4]
21011
+ 58 Face3AEye2 int32u[4]
21012
+ 70 Face4AArea int32u[4]
21013
+ 74 Face4AEye1 int32u[4]
21014
+ 78 Face4AEye2 int32u[4]
21015
+ 90 Face5AArea int32u[4]
21016
+ 94 Face5AEye1 int32u[4]
21017
+ 98 Face5AEye2 int32u[4]
21018
+ 110 Face6AArea int32u[4]
21019
+ 114 Face6AEye1 int32u[4]
21020
+ 118 Face6AEye2 int32u[4]
21021
+ 130 Face7AArea int32u[4]
21022
+ 134 Face7AEye1 int32u[4]
21023
+ 138 Face7AEye2 int32u[4]
21024
+ 150 Face8AArea int32u[4]
21025
+ 154 Face8AEye1 int32u[4]
21026
+ 158 Face8AEye2 int32u[4]
21027
+ 170 Face9AArea int32u[4]
21028
+ 174 Face9AEye1 int32u[4]
21029
+ 178 Face9AEye2 int32u[4]
21030
+ 190 Face10AArea int32u[4]
21031
+ 194 Face10AEye1 int32u[4]
21032
+ 198 Face10AEye2 int32u[4]
21033
+ 210 Face1BArea int32u[4]
21034
+ 214 Face1BEye1 int32u[4]
21035
+ 218 Face1BEye2 int32u[4]
21036
+ 230 Face2BArea int32u[4]
21037
+ 234 Face2BEye1 int32u[4]
21038
+ 238 Face2BEye2 int32u[4]
21039
+ 250 Face3BArea int32u[4]
21040
+ 254 Face3BEye1 int32u[4]
21041
+ 258 Face3BEye2 int32u[4]
21042
+ 270 Face4BArea int32u[4]
21043
+ 274 Face4BEye1 int32u[4]
21044
+ 278 Face4BEye2 int32u[4]
21045
+ 290 Face5BArea int32u[4]
21046
+ 294 Face5BEye1 int32u[4]
21047
+ 298 Face5BEye2 int32u[4]
21048
+ 310 Face6BArea int32u[4]
21049
+ 314 Face6BEye1 int32u[4]
21050
+ 318 Face6BEye2 int32u[4]
21051
+ 330 Face7BArea int32u[4]
21052
+ 334 Face7BEye1 int32u[4]
21053
+ 338 Face7BEye2 int32u[4]
21054
+ 350 Face8BArea int32u[4]
21055
+ 354 Face8BEye1 int32u[4]
21056
+ 358 Face8BEye2 int32u[4]
21057
+ 370 Face9BArea int32u[4]
21058
+ 374 Face9BEye1 int32u[4]
21059
+ 378 Face9BEye2 int32u[4]
21060
+ 390 Face10BArea int32u[4]
21061
+ 394 Face10BEye1 int32u[4]
21062
+ 398 Face10BEye2 int32u[4]
21063
+
21064
+ =head3 Pentax AFInfoK3III Tags
21065
+
21066
+ AF tags written by the K-3 Mark III, GR III and GR IIIx.
21067
+
21068
+ Index2 Tag Name Writable
21069
+ ------ -------- --------
21070
+ 0 AFInfo? int16u[$size/2]
21071
+ 0.1 AFMode int16u
21072
+ 1 AFSelectionMode int16u
21073
+ 3 NumAFPoints int16u
21074
+ 7 AFFrameSize no
21075
+ 7.1 AFAreas no+
21076
+ 11 AFAreaSize no
21077
+
20937
21078
  =head3 Pentax Type2 Tags
20938
21079
 
20939
21080
  These tags are used by the Pentax Optio 330 and 430, and are similar to the
@@ -23487,11 +23628,11 @@ E-mount models.
23487
23628
 
23488
23629
  =head3 Sony Tag9416 Tags
23489
23630
 
23490
- Valid for the ILCE-1/6700/7CM2/7CR/7M4/7RM5/7SM3/9M3, ILME-FX3/FX30, ZV-E1/E10M2.
23631
+ Valid for the ILCE-1/6700/7CM2/7CR/7M4/7RM5/7SM3/9M3, ILME-FX2/FX3/FX30,
23632
+ ZV-E1/E10M2.
23491
23633
 
23492
23634
  Index1 Tag Name Writable
23493
23635
  ------ -------- --------
23494
- 0 Tag9416_0000 no
23495
23636
  4 SonyISO no
23496
23637
  6 StopsAboveBaseISO no
23497
23638
  10 SonyExposureTime2 no
@@ -31672,7 +31813,8 @@ the config file.
31672
31813
  'RMKN' RicohRMKN EXIF
31673
31814
  'RTHU' PreviewImage no
31674
31815
  'SDLN' PlayMode string
31675
- 'SIGM' PreviewImage no
31816
+ 'SIGM' SigmaEXIF EXIF
31817
+ PreviewImage string
31676
31818
  'SNum' SerialNumber string/
31677
31819
  'SelO' PlaySelection int8u
31678
31820
  'TAGS' FujiFilmTags FujiFilm MOV
@@ -36383,6 +36525,110 @@ Tags with index 54 and greater are conditional based on the StreamType.
36383
36525
  58 AudioSampleRate no
36384
36526
  ImageHeight no
36385
36527
 
36528
+ =head2 TNEF Tags
36529
+
36530
+ Information extracted from Transport Neutral Encapsulation Format (TNEF)
36531
+ files (eg. winmail.dat). But note that the exiftool application doesn't
36532
+ process files with a .DAT extension by default when a directory name is
36533
+ given, so in this case either specify the .DAT file(s) by name or add
36534
+ C<-ext+ dat> to the command.
36535
+
36536
+ Tag ID Tag Name Writable
36537
+ ------ -------- --------
36538
+ 0x8000 From no
36539
+ 0x18004 Subject no
36540
+ 0x18009 MessageID no
36541
+ 0x18010 AttachTitle no
36542
+ 0x2800c MessageBody no
36543
+ 0x30006 StartDate no
36544
+ 0x30007 EndDate no
36545
+ 0x38005 SentDate no
36546
+ 0x38006 ReceivedDate no
36547
+ 0x38012 AttachCreateDate no
36548
+ 0x38013 AttachModifyDate no
36549
+ 0x38020 MessageModifyDate no
36550
+ 0x40009 ResponseRequested no
36551
+ 0x4800d Priority no
36552
+ 0x50008 OwnerAppointmentID no
36553
+ 0x60000 Owner no
36554
+ 0x60001 SentFor no
36555
+ 0x60002 Delegate no
36556
+ 0x68007 MessageStatus no
36557
+ 0x6800f AttachData no
36558
+ 0x68011 AttachMetaFile no
36559
+ 0x69001 AttachTransportFilename no
36560
+ 0x69002 AttachRenderingData no
36561
+ 0x69003 MessageProps TNEF MsgProps
36562
+ 0x69004 RecipientTable no
36563
+ 0x69005 AttachInfo TNEF AttachInfo
36564
+ 0x69007 CodePage no
36565
+ 0x70600 OriginalMessageClass no
36566
+ 0x78008 MessageClass no
36567
+ 0x89006 TNEFVersion no
36568
+
36569
+ =head3 TNEF MsgProps Tags
36570
+
36571
+ Tag ID Tag Name Writable
36572
+ ------ -------- --------
36573
+ 0x0002 AlternateRecipientAllowed no
36574
+ 0x0039 ClientSubmitTime no
36575
+ 0x0040 ReceivedByName no
36576
+ 0x0044 ReceivedRepresentingName no
36577
+ 0x004d OriginalAuthorName no
36578
+ 0x0055 OriginalDeliveryTime no
36579
+ 0x0070 Subject no
36580
+ 0x0075 ReceivedByAddressType no
36581
+ 0x0076 ReceivedByEmailAddress no
36582
+ 0x0077 ReceivedRepresentingAddressType no
36583
+ 0x0078 ReceivedRepresentingEmailAddress no
36584
+ 0x007f CorrelationKey no
36585
+ 0x0c1a SenderName no
36586
+ 0x0c1d SenderSearchKey no
36587
+ 0x0e06 MessageDeliveryTime no
36588
+ 0x0e1d NormalizedSubject no
36589
+ 0x0e28 PrimarySendAccount no
36590
+ 0x0e29 NextSendAccount no
36591
+ 0x0f02 DeliveryOrRenewTime no
36592
+ 0x1000 MessageBodyText no
36593
+ 0x1007 SyncBodyCount no
36594
+ 0x1008 SyncBodyData no
36595
+ 0x1009 MessageBodyRTF no
36596
+ 0x1013 MessageBodyHTML no
36597
+ 0x1035 InternetMessageID no
36598
+ 0x10f4 Hidden no
36599
+ 0x10f6 ReadOnly no
36600
+ 0x3007 CreateDate no
36601
+ 0x3008 ModifyDate no
36602
+ 0x3fde InternetCodePage no
36603
+ 0x3ff1 LocalUserID no
36604
+ 0x3ff8 CreatorName no
36605
+ 0x3ffa LastModifierName no
36606
+ 0x3ffd MessageCodePage no
36607
+ 0x4076 SpamConfidenceLevel no
36608
+ '00020329_Author' Author no
36609
+ '00020329_LastAuthor' LastAuthor no
36610
+ '00062004_0000801A' HomeAddress no
36611
+ '00062004_000080DA' HomeAddressCountryCode no
36612
+ '00062008_00008554' AppVersion no
36613
+
36614
+ =head3 TNEF AttachInfo Tags
36615
+
36616
+ Tag ID Tag Name Writable
36617
+ ------ -------- --------
36618
+ 0x0e20 AttachSize no
36619
+ 0x0e21 AttachNum no
36620
+ 0x0ff8 MappingSignature? no
36621
+ 0x3001 AttachFileName no
36622
+ 0x3701 AttachBinary no
36623
+ 0x3703 AttachFileExtension no
36624
+ 0x3705 AttachMethod no
36625
+ 0x3707 AttachLongFileName no
36626
+ 0x3708 AttachPathName no
36627
+ 0x370d AttachLongPathName no
36628
+ 0x370e AttachMIMEType no
36629
+ 0x7ffb ExceptionStartTime? no
36630
+ 0x7ffc ExceptionEndTime? no
36631
+
36386
36632
  =head2 WTV Tags
36387
36633
 
36388
36634
  Tags found in Windows recorded TV (WTV) videos.
@@ -49,7 +49,7 @@ my %mandatory = (
49
49
  0x0000 => '2 3 0 0',# GPSVersionID
50
50
  },
51
51
  InteropIFD => {
52
- 0x0002 => '0100', # InteropVersion
52
+ 0x0002 => '0100', # InteropVersion (from the DCF spec, not the EXIF spec)
53
53
  },
54
54
  );
55
55
 
@@ -2529,17 +2529,19 @@ NoOverwrite: next if $isNew > 0;
2529
2529
  }
2530
2530
  if ($$tagInfo{Name} eq 'PreviewImageStart') {
2531
2531
  if ($$et{FILE_TYPE} eq 'JPEG' and not $$tagInfo{MakerPreview}) {
2532
- # hold onto the PreviewImage until we can determine if it fits
2533
- $$et{PREVIEW_INFO} or $$et{PREVIEW_INFO} = {
2534
- Data => $buff,
2535
- Fixup => Image::ExifTool::Fixup->new,
2536
- };
2537
- if ($$tagInfo{IsOffset} and $$tagInfo{IsOffset} eq '2') {
2538
- $$et{PREVIEW_INFO}{NoBaseShift} = 1;
2539
- }
2540
- if ($offset >= 0 and $offset+$size <= $dataLen) {
2541
- # set flag indicating this preview wasn't in a trailer
2542
- $$et{PREVIEW_INFO}{WasContained} = 1;
2532
+ if ($size) {
2533
+ # hold onto the PreviewImage until we can determine if it fits
2534
+ $$et{PREVIEW_INFO} or $$et{PREVIEW_INFO} = {
2535
+ Data => $buff,
2536
+ Fixup => Image::ExifTool::Fixup->new,
2537
+ };
2538
+ if ($$tagInfo{IsOffset} and $$tagInfo{IsOffset} eq '2') {
2539
+ $$et{PREVIEW_INFO}{NoBaseShift} = 1;
2540
+ }
2541
+ if ($offset >= 0 and $offset+$size <= $dataLen) {
2542
+ # set flag indicating this preview wasn't in a trailer
2543
+ $$et{PREVIEW_INFO}{WasContained} = 1;
2544
+ }
2543
2545
  }
2544
2546
  $buff = '';
2545
2547
  } elsif ($$et{TIFF_TYPE} eq 'ARW' and $$et{Model} eq 'DSLR-A100') {
@@ -695,12 +695,11 @@ TAG: foreach $tagInfo (@matchingTags) {
695
695
  my $src = GetTagTable($$table{SRC_TABLE});
696
696
  $writeProc = $$src{WRITE_PROC} unless $writeProc;
697
697
  }
698
- {
698
+ if ($writeProc) {
699
699
  # make sure module is loaded if the writeProc is a string
700
700
  unless (ref $writeProc) {
701
701
  my $module = $writeProc;
702
- $module =~ s/::\w+$//;
703
- eval "require $module";
702
+ $module =~ s/::\w+$// and eval "require $module";
704
703
  }
705
704
  no strict 'refs';
706
705
  next unless $writeProc and &$writeProc();
@@ -1907,7 +1906,7 @@ sub RestoreNewValues($)
1907
1906
  #------------------------------------------------------------------------------
1908
1907
  # Set alternate file for extracting information
1909
1908
  # Inputs: 0) ExifTool ref, 1) family 8 group name (of the form "File#" where # is any number)
1910
- # 2) alternate file name, or undef to reset
1909
+ # 2) alternate file name (may contain tag names with leading "$"), or undef to reset
1911
1910
  # Returns: 1 on success, or 0 on invalid group name
1912
1911
  sub SetAlternateFile($$$)
1913
1912
  {
@@ -1917,7 +1916,9 @@ sub SetAlternateFile($$$)
1917
1916
  # keep the same file if already initialized (possibly has metadata extracted)
1918
1917
  if (not defined $file) {
1919
1918
  delete $$self{ALT_EXIFTOOL}{$g8};
1920
- } elsif (not ($$self{ALT_EXIFTOOL}{$g8} and $$self{ALT_EXIFTOOL}{$g8}{ALT_FILE} eq $file)) {
1919
+ } elsif (not ($$self{ALT_EXIFTOOL}{$g8} and $file !~ /\$/ and
1920
+ $$self{ALT_EXIFTOOL}{$g8}{ALT_FILE} eq $file))
1921
+ {
1921
1922
  my $altExifTool = Image::ExifTool->new;
1922
1923
  $$altExifTool{ALT_FILE} = $file;
1923
1924
  $$self{ALT_EXIFTOOL}{$g8} = $altExifTool;
@@ -3201,7 +3202,7 @@ sub InsertTagValues($$;$$$$)
3201
3202
  my ($docNum, $tag);
3202
3203
 
3203
3204
  if ($docGrp) {
3204
- $docNum = $docGrp =~ /(\d+)$/ ? $1 : 0;
3205
+ $docNum = $docGrp =~ /(\d+(-\d+)*)$/ ? $1 : 0;
3205
3206
  } else {
3206
3207
  undef $cache; # no cache if no document groups
3207
3208
  }
@@ -3269,25 +3270,25 @@ sub InsertTagValues($$;$$$$)
3269
3270
  # (similar to code in BuildCompositeTags(), but this is case-insensitive)
3270
3271
  my $cacheTag = $$cache{$lcTag};
3271
3272
  unless ($cacheTag) {
3272
- $cacheTag = $$cache{$lcTag} = [ ];
3273
+ $cacheTag = $$cache{$lcTag} = { };
3273
3274
  # find all matching keys, organize into groups, and store in cache
3274
3275
  my $ex = $$self{TAG_EXTRA};
3275
3276
  my @matches = grep /^$tag(\s|$)/i, @$foundTags;
3276
3277
  @matches = $self->GroupMatches($group, \@matches) if defined $group;
3277
3278
  foreach (@matches) {
3278
3279
  my $doc = $$ex{$_}{G3} || 0;
3279
- if (defined $$cacheTag[$doc]) {
3280
- next unless $$cacheTag[$doc] =~ / \((\d+)\)$/;
3280
+ if (defined $$cacheTag{$doc}) {
3281
+ next unless $$cacheTag{$doc} =~ / \((\d+)\)$/;
3281
3282
  my $cur = $1;
3282
3283
  # keep the most recently extracted tag
3283
3284
  next if / \((\d+)\)$/ and $1 < $cur;
3284
3285
  }
3285
- $$cacheTag[$doc] = $_;
3286
+ $$cacheTag{$doc} = $_;
3286
3287
  }
3287
3288
  }
3288
- my $doc = $lcTag =~ /\b(main|doc(\d+)):/ ? ($2 || 0) : $docNum;
3289
- if ($$cacheTag[$doc]) {
3290
- $tag = $$cacheTag[$doc];
3289
+ my $doc = $lcTag =~ /\b(main|doc(\d+(-\d+)*)):/ ? ($2 || 0) : $docNum;
3290
+ if ($$cacheTag{$doc}) {
3291
+ $tag = $$cacheTag{$doc};
3291
3292
  $val = $self->GetValue($tag, $type);
3292
3293
  }
3293
3294
  } else {
@@ -3403,7 +3404,7 @@ sub InsertTagValues($$;$$$$)
3403
3404
  undef $advFmtSelf;
3404
3405
  $didExpr = 1; # set flag indicating an expression was evaluated
3405
3406
  }
3406
- unless (defined $val) {
3407
+ unless (defined $val or (ref $opt and $$self{OPTIONS}{UndefTags})) {
3407
3408
  $val = $$self{OPTIONS}{MissingTagValue};
3408
3409
  unless (defined $val) {
3409
3410
  my $g3 = ($docGrp and $var !~ /\b(main|doc\d+):/i) ? $docGrp . ':' : '';
@@ -5051,6 +5052,7 @@ TryLib: for ($lib=$strptimeLib; ; $lib='') {
5051
5052
  last;
5052
5053
  }
5053
5054
  if (not $lib) {
5055
+ last unless $$self{OPTIONS}{StrictDate};
5054
5056
  warn $wrn || "Install POSIX::strptime or Time::Piece for inverse date/time conversions\n";
5055
5057
  return undef;
5056
5058
  } elsif ($lib eq 'POSIX::strptime') {
@@ -6921,7 +6923,7 @@ sub CheckBinaryData($$$)
6921
6923
  $format = $1;
6922
6924
  $count = $2;
6923
6925
  # can't evaluate $count now because we don't know $size yet
6924
- undef $count if $count =~ /\$size/;
6926
+ $count = -1 if $count =~ /\$size/; # (-1 = any count allowed)
6925
6927
  }
6926
6928
  return CheckValue($valPtr, $format, $count);
6927
6929
  }
@@ -7247,6 +7249,8 @@ sub WriteBinaryData($$$)
7247
7249
  $self->VerboseValue("- $dirName:$$tagInfo{Name}", $val);
7248
7250
  $self->VerboseValue("+ $dirName:$$tagInfo{Name}", $newVal);
7249
7251
  ++$$self{CHANGED};
7252
+ } else {
7253
+ $self->Warn("Error packing $$tagInfo{Name} value");
7250
7254
  }
7251
7255
  }
7252
7256
  # add necessary fixups for any offsets
@@ -86,7 +86,7 @@ sub InflateStruct($$;$)
86
86
  my %struct;
87
87
  for (;;) {
88
88
  last unless $sfmt ? $$obj =~ s/^\s*"(.*?)"\s*://s :
89
- $$obj =~ s/^\s*([-\w:]+#?)\s*=//s;
89
+ $$obj =~ s/^\s*([-\w:.]+#?)\s*=//s;
90
90
  my $tag = $1;
91
91
  my ($v, $w) = InflateStruct($et, $obj, '}');
92
92
  $warn = $w if $w and not $warn;