exiftool-vendored.exe 12.65.0 → 12.69.0

package/bin/exiftool_files/Changes

@@ -7,6 +7,64 @@ RSS feed: https://exiftool.org/rss.xml
 Note: The most recent production release is Version 12.60. (Other versions are
 considered development releases, and are not uploaded to MetaCPAN.)
 
+Oct. 26, 2023 - Version 12.69
+
+  - Added support for DNG version 1.7.0.0
+  - Added a new XMP-GCamera tag
+  - Added a number of new Nikon Z lenses (thanks Warren Hatch and Stefan)
+  - Added a number of new XMP-crs tags
+  - Extract XML metadata from some Hasselblad images
+  - Tweaked -fast2 option to read metadata from inside mdat atom of HEIC images
+  - Patched FFF reader to be more tolerant of the mess made by incompetent
+    Hasselblad programmers (wrong IFD count for some values)
+  - Patched WebP reader to be more tolerant of the mess made by incompetent
+    Google programmers (EXIF with wrong header and XMP with wrong ID)
+  - Fixed problem which could cause "use of uninitialized variable" warnings
+    when reading images from some Nikon cameras
+  - Fixed List type for new XMP-photomech:CreatorIdentity tag
+
+Oct. 16, 2023 - Version 12.68
+
+  - Added preliminary read support for XISF images
+  - Added the ability to delete JUMBF metadata from PNG images
+  - Added support for writing Canon burst-roll CR3 images
+  - Added a new Nikon Z9 SubjectDetection value, and improved Zf support (thanks
+    Warren Hatch)
+  - Added a couple of new PentaxModelID values
+  - Added a few couple of new tag values for the Pentax K-3 Mark III Monochrome (github #226)
+  - Added a new XMP-photomech tag
+  - Added a new QuickTime ItemList tag
+  - Added a new Nikon LensID
+  - Added a new Canon LensType
+  - Support decimal values for FujiFilm ShadowTone and HighlightTone tags
+  - Decode some new Sony tags (thanks Jos Roost)
+  - Decode ShutterCount for Canon EOS R6 (thanks gamin)
+  - Decode QuickTime VideoFullRangeFlag
+  - Decode JPGCompression for the Nikon D3S
+  - Enhanced -geotag feature to allow writing QuickTime:GPSCoordinates
+  - Renamed Panasonic HDRShot tag to MergedImages (forum 15298)
+  - Fixed problem where some NEF files were misidentified as NRW
+
+Sept. 19, 2023 - Version 12.67
+
+  - Added a new Pentax LensType (thanks dmont)
+  - Added a new FujiFilm FilmMode and FaceElementTypes values (thanks Greybeard)
+  - Fixed error writing new DataMining tag where URI prefix wasn't being
+    properly added to the value
+
+Sept. 19, 2023 - Version 12.66
+
+  - Added a few new Canon LensType values (thanks Norbert Wasser)
+  - Added conversions for a few Apple:ImageCaptureType values
+  - Added new XMP tag for PLUS version 2.0.1
+  - Added a new CanonModelID (thanks Laurent Clevy)
+  - Decode another tag from Canon 1DS raw images (Hubert Figuiere, github #219)
+  - Decode JPGCompression for newer Nikon models (thanks Warren Hatch)
+  - Fixed bug introduced in 12.65 where duplicate tags were not returned even
+    when the groups where specified explicitly
+  - API Changes:
+      - Added WindowsWideFile option
+
 Aug. 10, 2023 - Version 12.65
 
   - Added a new QuickTime Keys tag
@@ -135,6 +193,8 @@ Apr. 5, 2023 - Version 12.60 (production release)
   - Fixed problem where setting the Geotime value didn't work when using an
     advanced-formatting expression containing a greater-than symbol (>)
 
+History of older versions (back to Nov. 19, 2003 - Version 1.00) -->
+
 Mar. 28, 2023 - Version 12.59
 
   - COMPATIBILITY WARNING: Changed the calculated ImageDataMD5 for JPEG images
@@ -323,8 +383,6 @@ Nov. 8, 2022 - Version 12.50 (production release)
   - Fixed inconsistent year and time zone for Kenwood dashcam timed GPS in MP4
     videos
 
-History of older versions (back to Nov. 19, 2003 - Version 1.00) -->
-
 Oct. 19, 2022 - Version 12.49
 
   - Added read support for Windows ICO and CUR files

package/bin/exiftool_files/README

@@ -51,11 +51,11 @@ supported by ExifTool (r = read, w = write, c = create):
   DCP   r/w   | ICO   r     | MPG   r     | PSB   r/w   | WV    r
   DCR   r     | ICS   r     | MPO   r/w   | PSD   r/w   | X3F   r/w
   DFONT r     | IDML  r     | MQV   r/w   | PSP   r     | XCF   r
-  DIVX  r     | IIQ   r/w   | MRC   r     | QTIF  r/w   | XLS   r
-  DJVU  r     | IND   r/w   | MRW   r/w   | R3D   r     | XLSX  r
-  DLL   r     | INSP  r/w   | MXF   r     | RA    r     | XMP   r/w/c
-  DNG   r/w   | INSV  r     | NEF   r/w   | RAF   r/w   | ZIP   r
-  DOC   r     | INX   r     | NKSC  r/w   | RAM   r     |
+  DIVX  r     | IIQ   r/w   | MRC   r     | QTIF  r/w   | XISF  r
+  DJVU  r     | IND   r/w   | MRW   r/w   | R3D   r     | XLS   r
+  DLL   r     | INSP  r/w   | MXF   r     | RA    r     | XLSX  r
+  DNG   r/w   | INSV  r     | NEF   r/w   | RAF   r/w   | XMP   r/w/c
+  DOC   r     | INX   r     | NKSC  r/w   | RAM   r     | ZIP   r
   DOCX  r     | ISO   r     | NRW   r/w   | RAR   r     |
 
   Meta Information
@@ -108,8 +108,8 @@ your home directory, then you would type the following commands in a
 terminal window to extract and run ExifTool:
 
   cd ~/Desktop
-  gzip -dc Image-ExifTool-12.65.tar.gz | tar -xf -
-  cd Image-ExifTool-12.65
+  gzip -dc Image-ExifTool-12.69.tar.gz | tar -xf -
+  cd Image-ExifTool-12.69
   ./exiftool t/images/ExifTool.jpg
 
 Note:  These commands extract meta information from one of the test images. 

package/bin/exiftool_files/exiftool.pl

@@ -11,7 +11,7 @@ use strict;
 use warnings;
 require 5.004;
 
-my $version = '12.65';
+my $version = '12.69';
 
 # add our 'lib' directory to the include list BEFORE 'use Image::ExifTool'
 my $exePath;
@@ -4673,11 +4673,11 @@ DESCRIPTION
       DCP   r/w   | ICO   r     | MPG   r     | PSB   r/w   | WV    r
       DCR   r     | ICS   r     | MPO   r/w   | PSD   r/w   | X3F   r/w
       DFONT r     | IDML  r     | MQV   r/w   | PSP   r     | XCF   r
-      DIVX  r     | IIQ   r/w   | MRC   r     | QTIF  r/w   | XLS   r
-      DJVU  r     | IND   r/w   | MRW   r/w   | R3D   r     | XLSX  r
-      DLL   r     | INSP  r/w   | MXF   r     | RA    r     | XMP   r/w/c
-      DNG   r/w   | INSV  r     | NEF   r/w   | RAF   r/w   | ZIP   r
-      DOC   r     | INX   r     | NKSC  r/w   | RAM   r     |
+      DIVX  r     | IIQ   r/w   | MRC   r     | QTIF  r/w   | XISF  r
+      DJVU  r     | IND   r/w   | MRW   r/w   | R3D   r     | XLS   r
+      DLL   r     | INSP  r/w   | MXF   r     | RA    r     | XLSX  r
+      DNG   r/w   | INSV  r     | NEF   r/w   | RAF   r/w   | XMP   r/w/c
+      DOC   r     | INX   r     | NKSC  r/w   | RAM   r     | ZIP   r
       DOCX  r     | ISO   r     | NRW   r/w   | RAR   r     |
 
       Meta Information
@@ -5604,7 +5604,7 @@ OPTIONS
 
          produces output like this:
 
-             -- Generated by ExifTool 12.65 --
+             -- Generated by ExifTool 12.69 --
              File: a.jpg - 2003:10:31 15:44:19
              (f/5.6, 1/60s, ISO 100)
              File: b.jpg - 2006:05:23 11:57:38
@@ -6434,12 +6434,17 @@ OPTIONS
          GPSLongitude, GPSLongitudeRef, GPSAltitude, GPSAltitudeRef,
          GPSDateStamp, GPSTimeStamp, GPSDateTime, GPSTrack, GPSTrackRef,
          GPSSpeed, GPSSpeedRef, GPSImgDirection, GPSImgDirectionRef,
-         GPSPitch, GPSRoll, AmbientTemperature and CameraElevationAngle. By
-         default, tags are created in EXIF, and updated in XMP only if they
-         already exist. However, "EXIF:Geotime" or "XMP:Geotime" may be
-         specified to write only EXIF or XMP tags respectively. Note that
-         GPSPitch and GPSRoll are non-standard, and require user-defined
-         tags in order to be written.
+         GPSPitch, GPSRoll, GPSCoordinates, AmbientTemperature and
+         CameraElevationAngle. By default, in image files tags are created
+         in EXIF, and updated in XMP only if they already exist. In
+         QuickTime-format files GPSCoordinates is created in the preferred
+         location (ItemList by default) as well as in XMP. However,
+         "EXIF:Geotime", "XMP:Geotime" or "QuickTime:Geotime" may be
+         specified to write to write only to one group. Also,
+         "ItemList:Geotime", "Keys:Geotime" or "UserData:Geotime" may be
+         used to write to a specific location in QuickTime-format files.
+         Note that GPSPitch and GPSRoll are non-standard, and require
+         user-defined tags in order to be written.
 
          The "Geosync" tag may be used to specify a time correction which is
          applied to each "Geotime" value for synchronization with GPS time.
@@ -6533,7 +6538,8 @@ OPTIONS
          value is set to 1 if *=VAL* is omitted. If *VAL* is omitted, the
          option value is set to undef if "=" is used, or an empty string
          with "^=". If *OPT* is not specified a list of available options is
-         returned. See Image::ExifTool Options for option details. This
+         returned. The option name is not case senstive, but the option
+         values are. See Image::ExifTool Options for option details. This
          overrides API options set via the config file.
 
     -common_args
@@ -6547,13 +6553,14 @@ OPTIONS
          Load specified configuration file instead of the default
          ".ExifTool_config". If used, this option must come before all other
          arguments on the command line and applies to all -execute'd
-         commands. The *CFGFILE* must exist relative to the current working
-         directory or the exiftool application directory unless an absolute
-         path is specified. Loading of the default config file may be
-         disabled by setting *CFGFILE* to an empty string (ie. ""). See
-         <https://exiftool.org/config.html> and config_files/example.config
-         in the full ExifTool distribution for details about the
-         configuration file syntax.
+         commands. This file is used to create user-defined tags as well as
+         set default ExifTool options. The *CFGFILE* must exist relative to
+         the current working directory or the exiftool application directory
+         unless an absolute path is specified. Loading of the default config
+         file may be disabled by setting *CFGFILE* to an empty string (ie.
+         ""). See <https://exiftool.org/config.html> and
+         config_files/example.config in the full ExifTool distribution for
+         details about the configuration file syntax.
 
     -echo[*NUM*] *TEXT*
          Echo *TEXT* to stdout (-echo or -echo1) or stderr (-echo2). Text is
@@ -7241,10 +7248,13 @@ RENAMING EXAMPLES
          "20060507_118-1861.jpg".
 
 GEOTAGGING EXAMPLES
-    ExifTool implements geotagging via 3 special tags: Geotag (which for
-    convenience is also implemented as an exiftool option), Geosync and
-    Geotime. The examples below highlight some geotagging features. See
-    <https://exiftool.org/geotag.html> for additional documentation.
+    ExifTool implements geotagging from GPS log files via 3 special tags:
+    Geotag (which for convenience is also implemented as an exiftool
+    option), Geosync and Geotime. The examples below highlight some
+    geotagging features. See <https://exiftool.org/geotag.html> for
+    additional documentation. (Note that geotagging from known GPS
+    coordinates is done by writing the GPS tags directly rather than using
+    the -geotag option.)
 
     exiftool -geotag track.log a.jpg
          Geotag an image ("a.jpg") from position information in a GPS track

package/bin/exiftool_files/lib/Image/ExifTool/Apple.pm

@@ -16,7 +16,7 @@ use vars qw($VERSION);
 use Image::ExifTool::Exif;
 use Image::ExifTool::PLIST;
 
-$VERSION = '1.10';
+$VERSION = '1.11';
 
 sub ConvertPLIST($$);
 
@@ -123,8 +123,12 @@ sub ConvertPLIST($$);
     0x0014 => { # (StillImageCaptureType, ref 2)
         Name => 'ImageCaptureType',
         Writable => 'int32s',
-        Unknown => 1, # (don't know what the values mean)
         # seen: 1,2,3,4,5,10,12
+        PrintConv => { #forum15096
+            1 => 'ProRAW',
+            2 => 'Portrait',
+            10 => 'Photo',
+        },
     },
     0x0015 => { # (ImageGroupIdentifier, ref 2)
         Name => 'ImageUniqueID',

package/bin/exiftool_files/lib/Image/ExifTool/Canon.pm

@@ -88,7 +88,7 @@ sub ProcessCTMD($$$);
 sub ProcessExifInfo($$$);
 sub SwapWords($);
 
-$VERSION = '4.67';
+$VERSION = '4.70';
 
 # Note: Removed 'USM' from 'L' lenses since it is redundant - PH
 # (or is it?  Ref 32 shows 5 non-USM L-type lenses)
@@ -476,7 +476,6 @@ $VERSION = '4.67';
     255.1 => 'Sigma 180mm f/2.8 EX DG OS HSM APO Macro', #50
     255.2 => 'Tamron SP 70-200mm f/2.8 Di VC USD', #exiv issue 1202 (A009)
     255.3 => 'Yongnuo YN 50mm f/1.8', #50
-    313 => 'Canon RF 28mm F2.8 STM', #42
     368 => 'Sigma 14-24mm f/2.8 DG HSM | A or other Sigma Lens', #IB (A018)
     368.1 => 'Sigma 20mm f/1.4 DG HSM | A', #50 (newer firmware)
     368.2 => 'Sigma 50mm f/1.4 DG HSM | A', #50
@@ -491,6 +490,7 @@ $VERSION = '4.67';
    '368.11' => 'Sigma 70mm f/2.8 DG Macro', #IB (A018)
    '368.12' => 'Sigma 18-35mm f/1.8 DC HSM | A', #50
    '368.13' => 'Sigma 24-105mm f/4 DG OS HSM | A', #forum3833
+   '368.14' => 'Sigma 18-300mm f/3.5-6.3 DC Macro OS HSM | C', #forum15280 (014)
     # Note: LensType 488 (0x1e8) is reported as 232 (0xe8) in 7D CameraSettings
     488 => 'Canon EF-S 15-85mm f/3.5-5.6 IS USM', #PH
     489 => 'Canon EF 70-300mm f/4-5.6L IS USM', #Gerald Kapounek
@@ -609,18 +609,24 @@ $VERSION = '4.67';
    '61182.33' => 'Canon RF 400mm F2.8L IS USM + RF1.4x', #IB
    '61182.34' => 'Canon RF 400mm F2.8L IS USM + RF2x', #IB
    '61182.35' => 'Canon RF 600mm F4L IS USM', #GiaZopatti
-   '61182.36' => 'Canon RF 15-30mm F4.5-6.3 IS STM', #42
-   '61182.37' => 'Canon RF 800mm F5.6L IS USM', #42
-   '61182.38' => 'Canon RF 800mm F5.6L IS USM + RF1.4x', #42
-   '61182.39' => 'Canon RF 800mm F5.6L IS USM + RF2x', #42
-   '61182.40' => 'Canon RF 1200mm F8L IS USM', #42
-   '61182.41' => 'Canon RF 1200mm F8L IS USM + RF1.4x', #42
-   '61182.42' => 'Canon RF 1200mm F8L IS USM + RF2x', #42
-   '61182.43' => 'Canon RF 135mm F1.8 L IS USM', #42
-   '61182.44' => 'Canon RF 24-50mm F4.5-6.3 IS STM', #42
-   '61182.45' => 'Canon RF-S 55-210mm F5-7.1 IS STM', #42
+   '61182.36' => 'Canon RF 600mm F4L IS USM + RF1.4x', #42
+   '61182.37' => 'Canon RF 600mm F4L IS USM + RF2x', #42
+   '61182.38' => 'Canon RF 15-30mm F4.5-6.3 IS STM', #42
+   '61182.39' => 'Canon RF 800mm F5.6L IS USM', #42
+   '61182.40' => 'Canon RF 800mm F5.6L IS USM + RF1.4x', #42
+   '61182.41' => 'Canon RF 800mm F5.6L IS USM + RF2x', #42
+   '61182.42' => 'Canon RF 1200mm F8L IS USM', #42
+   '61182.43' => 'Canon RF 1200mm F8L IS USM + RF1.4x', #42
+   '61182.44' => 'Canon RF 1200mm F8L IS USM + RF2x', #42
+   '61182.45' => 'Canon RF 135mm F1.8 L IS USM', #42
+   '61182.46' => 'Canon RF 24-50mm F4.5-6.3 IS STM', #42
+   '61182.47' => 'Canon RF-S 55-210mm F5-7.1 IS STM', #42
+   '61182.48' => 'Canon RF 100-300mm F2.8L IS USM', #42
+   '61182.49' => 'Canon RF 100-300mm F2.8L IS USM + RF1.4x', #42
+   '61182.50' => 'Canon RF 100-300mm F2.8L IS USM + RF2x', #42
+   '61182.51' => 'Canon RF 28mm F2.8 STM', #42
     # we need the RFLensType values for the following...
-   '61182.46' => 'Canon RF 5.2mm F2.8L Dual Fisheye 3D VR', #PH (NC)
+   '61182.52' => 'Canon RF 5.2mm F2.8L Dual Fisheye 3D VR', #PH (NC)
     65535 => 'n/a',
 );
 
@@ -985,6 +991,7 @@ $VERSION = '4.67';
     0x80000481 => 'EOS R6 Mark II', #42
     0x80000487 => 'EOS R8', #42
     0x80000491 => 'PowerShot V10', #25
+    0x80000498 => 'EOS R100', #25
     0x80000520 => 'EOS D2000C', #IB
     0x80000560 => 'EOS D6000C', #PH (guess)
 );
@@ -1383,6 +1390,11 @@ my %offOn = ( 0 => 'Off', 1 => 'On' );
             Condition => '$$self{Model} =~ /\b(1200D|REBEL T5|Kiss X70)\b/',
             SubDirectory => { TagTable => 'Image::ExifTool::Canon::CameraInfo60D' },
         },
+        {
+            Name => 'CanonCameraInfoR6',
+            Condition => '$$self{Model} =~ /\bEOS R6$/',
+            SubDirectory => { TagTable => 'Image::ExifTool::Canon::CameraInfoR6' },
+        },
         {
             Name => 'CanonCameraInfoPowerShot',
             # valid if format is int32u[138] or int32u[148]
@@ -1698,6 +1710,12 @@ my %offOn = ( 0 => 'Off', 1 => 'On' );
         # Writable => 'int32u',
         # Protected => 2,
     },
+    0x82 => { #github219 (found on 1DS)
+         Name => 'RawDataLength',
+         # (can't yet write 1DS raw files)
+         # Writable => 'int32u',
+         # Protected => 2,
+    },
     0x83 => { #PH
         Name => 'OriginalDecisionDataOffset',
         Writable => 'int32u',
@@ -4683,6 +4701,19 @@ my %ciMaxFocal = (
     },
 );
 
+%Image::ExifTool::Canon::CameraInfoR6 = (
+    %binaryDataAttrs,
+    FIRST_ENTRY => 0,
+    PRIORITY => 0,
+    GROUPS => { 0 => 'MakerNotes', 2 => 'Camera' },
+    NOTES => 'CameraInfo tags for the EOS R6.',
+    0x0af1 => { #forum15210
+        Name => 'ShutterCount',
+        Format => 'int32u',
+        Notes => 'includes electronic + mechanical shutter',
+    },
+);
+
 # Canon camera information for 70D (MakerNotes tag 0x0d) (ref PH)
 %Image::ExifTool::Canon::CameraInfo70D = (
     %binaryDataAttrs,
@@ -6859,6 +6890,8 @@ my %ciMaxFocal = (
             290 => 'Canon RF 400mm F2.8L IS USM + RF1.4x', #IB
             291 => 'Canon RF 400mm F2.8L IS USM + RF2x', #IB
             292 => 'Canon RF 600mm F4L IS USM', #GiaZopatti
+            293 => 'Canon RF 600mm F4L IS USM + RF1.4x', #42
+            294 => 'Canon RF 600mm F4L IS USM + RF2x', #42
             295 => 'Canon RF 800mm F5.6L IS USM', #42
             296 => 'Canon RF 800mm F5.6L IS USM + RF1.4x', #42
             297 => 'Canon RF 800mm F5.6L IS USM + RF2x', #42
@@ -6869,6 +6902,10 @@ my %ciMaxFocal = (
             303 => 'Canon RF 135mm F1.8 L IS USM', #42
             304 => 'Canon RF 24-50mm F4.5-6.3 IS STM', #42
             305 => 'Canon RF-S 55-210mm F5-7.1 IS STM', #42
+            306 => 'Canon RF 100-300mm F2.8L IS USM', #42
+            307 => 'Canon RF 100-300mm F2.8L IS USM + RF1.4x', #42
+            308 => 'Canon RF 100-300mm F2.8L IS USM + RF2x', #42
+            313 => 'Canon RF 28mm F2.8 STM', #42
             # Note: add new RF lenses to %canonLensTypes with ID 61182
         },
     },
@@ -9063,6 +9100,11 @@ my %filterConv = (
     CMT3 => { # (CR3 files)
         Name => 'MakerNoteCanon',
         PreservePadding => 1,
+        Writable => 'undef', # (writable directory!)
+        # (note that ExifTool 12.68 and earlier lacked the ability to write this as a block,
+        #  and would instead add the maker notes the the CMT2 ExifIFD.  To remove these
+        #  incorrectly-placed maker notes, use "exiftool -exififd:makernotes= FILE")
+        MakerNotes => 1,
         SubDirectory => {
             TagTable => 'Image::ExifTool::Canon::Main',
             ProcessProc => \&ProcessCMT3,

package/bin/exiftool_files/lib/Image/ExifTool/DNG.pm

@@ -17,7 +17,7 @@ use Image::ExifTool::Exif;
 use Image::ExifTool::MakerNotes;
 use Image::ExifTool::CanonRaw;
 
-$VERSION = '1.23';
+$VERSION = '1.24';
 
 sub ProcessOriginalRaw($$$);
 sub ProcessAdobeData($$$);
@@ -120,6 +120,25 @@ sub WriteAdobeStuff($$$);
     },
 );
 
+# (DNG 1.7)
+%Image::ExifTool::DNG::ImageSeq = (
+    PROCESS_PROC => \&Image::ExifTool::ProcessBinaryData,
+    0 => { Name => 'SeqID',         Format => 'var_string' },
+    1 => { Name => 'SeqType',       Format => 'var_string' },
+    2 => { Name => 'SeqFrameInfo',  Format => 'var_string' },
+    3 => { Name => 'SeqIndex',      Format => 'int32u' },
+    7 => { Name => 'SeqCount',      Format => 'int32u' },
+    11 => { Name => 'SeqFinal',     Format => 'int8u', PrintConv => { 0 => 'No', 1 => 'Yes' } },
+);
+
+# (DNG 1.7)
+%Image::ExifTool::DNG::ProfileDynamicRange = (
+    PROCESS_PROC => \&Image::ExifTool::ProcessBinaryData,
+    0 => { Name => 'PDRVersion',    Format => 'int16u' },
+    2 => { Name => 'DynamicRange',  Format => 'int16u', PrintConv => { 0 => 'Standard', 1 => 'High' } },
+    4 => { Name => 'HintMaxOutputValue', Format => 'float' },
+);
+
 # fill in maker notes
 {
     my $tagInfo;
@@ -786,7 +805,11 @@ sub ProcessAdobeMakN($$$)
                 return 1 unless $$tagInfo{Writable};
             }
             $val = substr($$dataPt, 20) unless defined $val;
-            $et->FoundTag($tagInfo, $val);
+            my $key = $et->FoundTag($tagInfo, $val);
+            if ($$et{MAKER_NOTE_FIXUP}) {
+                $$et{TAG_EXTRA}{$key}{Fixup} = $$et{MAKER_NOTE_FIXUP};
+                delete $$et{MAKER_NOTE_FIXUP};
+            }
         }
     }
     return 1;

package/bin/exiftool_files/lib/Image/ExifTool/Exif.pm

@@ -57,7 +57,7 @@ use vars qw($VERSION $AUTOLOAD @formatSize @formatName %formatNumber %intFormat
 use Image::ExifTool qw(:DataAccess :Utils);
 use Image::ExifTool::MakerNotes;
 
-$VERSION = '4.44';
+$VERSION = '4.45';
 
 sub ProcessExif($$$);
 sub WriteExif($$$);
@@ -250,6 +250,7 @@ $formatName[129] = 'utf8';  # (Exif 3.0)
     34927 => 'WebP', #LibTiff
     34933 => 'PNG', # (TIFF mail list)
     34934 => 'JPEG XR', # (TIFF mail list)
+    52546 => 'JPEG XL', # (DNG 1.7)
     65000 => 'Kodak DCR Compressed', #PH
     65535 => 'Pentax PEF Compressed', #Jens
 );
@@ -3077,14 +3078,31 @@ my %opcodeInfo = (
         },
         PrintConvInv => '$val =~ /^PrintIM/ ? $val : undef',    # quick validation
     },
+    0xc519 => { # (Hasselblad X2D)
+        Name => 'HasselbladXML',
+        Format => 'undef',
+        TruncateOK => 1,    # (incorrect size written by X2D)
+        SubDirectory => {
+            DirName => 'XML',
+            TagTable => 'Image::ExifTool::PLIST::Main',
+            Start => '$valuePtr + 4',
+        },
+    },
     0xc51b => { # (Hasselblad H3D)
         Name => 'HasselbladExif',
         Format => 'undef',
-        RawConv => q{
-            $$self{DOC_NUM} = ++$$self{DOC_COUNT};
-            $self->ExtractInfo(\$val, { ReEntry => 1 });
-            $$self{DOC_NUM} = 0;
-            return undef;
+        SubDirectory => {
+            Start => '$valuePtr',
+            Base => '$start',
+            TagTable => 'Image::ExifTool::Exif::Main',
+            ProcessProc => \&Image::ExifTool::ProcessSubTIFF,
+            # Writing this is problematic due to the braindead Hasselblad programmers.
+            # One problem is that some values run outside the HasselbladExif data so they
+            # will be lost if we do a simple copy (which is what we are currently doing
+            # by returning undef from the WriteProc), but we can't rebuild this directory
+            # by writing it properly because there is an erroneous StripByteCounts value
+            # written by the X2D 100C that renders the data unreadable
+            WriteProc => sub { return undef }, 
         },
     },
     0xc573 => { #PH
@@ -3123,7 +3141,7 @@ my %opcodeInfo = (
     0xc612 => {
         Name => 'DNGVersion',
         Notes => q{
-            tags 0xc612-0xcd3b are defined by the DNG specification unless otherwise
+            tags 0xc612-0xcd48 are defined by the DNG specification unless otherwise
             noted.  See L<https://helpx.adobe.com/photoshop/digital-negative.html> for
             the specification
         },
@@ -3609,6 +3627,11 @@ my %opcodeInfo = (
         Writable => 'int16u',
         WriteGroup => 'IFD0',
         Protected => 1,
+        PrintConv => {
+            0 => 'Scene-referred',
+            1 => 'Output-referred (ICC Profile Dynamic Range)',
+            2 => 'Output-referred (High Dyanmic Range)', # DNG 1.7
+        },
     },
     0xc6c5 => { Name => 'SRawType', Description => 'SRaw Type', WriteGroup => 'IFD0' }, #exifprobe (CR2 proprietary)
     0xc6d2 => { #JD (Panasonic DMC-TZ5)
@@ -4133,7 +4156,7 @@ my %opcodeInfo = (
     0xcd2d => { # DNG 1.6
         Name => 'ProfileGainTableMap',
         Writable => 'undef',
-        WriteGroup => 'SubIFD',
+        WriteGroup => 'SubIFD', # (according to DNG 1.7 docs, this was an error and it should have been IFD0)
         Protected => 1,
         Binary => 1,
     },
@@ -4221,6 +4244,51 @@ my %opcodeInfo = (
         WriteGroup => 'IFD0',
         Protected => 1,
     },
+    0xcd40 => { # DNG 1.7
+        Name => 'ProfileGainTableMap2',
+        Writable => 'undef',
+        WriteGroup => 'IFD0',
+        Protected => 1,
+        Binary => 1,
+    },
+    0xcd43 => { # DNG 1.7
+        Name => 'ColumnInterleaveFactor',
+        Writable => 'int32u',
+        WriteGroup => 'SubIFD',
+        Protected => 1,
+    },
+    0xcd44 => { # DNG 1.7
+        Name => 'ImageSequenceInfo',
+        Writable => 'undef',
+        WriteGroup => 'IFD0',
+        SubDirectory => {
+            TagTable => 'Image::ExifTool::DNG::ImageSeq',
+            ByteOrder => 'BigEndian',
+        },
+    },
+    0xcd46 => { # DNG 1.7
+        Name => 'ImageStats',
+        Writable => 'undef',
+        WriteGroup => 'IFD0',
+        Binary => 1,
+        Protected => 1,
+    },
+    0xcd47 => { # DNG 1.7
+        Name => 'ProfileDynamicRange',
+        Writable => 'undef',
+        WriteGroup => 'IFD0',
+        SubDirectory => {
+            TagTable => 'Image::ExifTool::DNG::ProfileDynamicRange',
+            ByteOrder => 'BigEndian', # (not indicated in spec)
+        },
+    },
+    0xcd48 => { # DNG 1.7
+        Name => 'ProfileGroupName',
+        Writable => 'string',
+        Format => 'string',
+        WriteGroup => 'IFD0',
+        Protected => 1,
+    },
     0xea1c => { #13
         Name => 'Padding',
         Binary => 1,
@@ -5944,6 +6012,12 @@ sub ProcessExif($$$)
     my $inMakerNotes = $$tagTablePtr{GROUPS}{0} eq 'MakerNotes';
     my $isExif = ($tagTablePtr eq \%Image::ExifTool::Exif::Main);
 
+    # warn for incorrect maker notes in CR3 files
+    if ($$dirInfo{DirName} eq 'MakerNotes' and $$et{FileType} eq 'CR3' and
+        $$dirInfo{Parent} and $$dirInfo{Parent} eq 'ExifIFD')
+    {
+        $et->WarnOnce("MakerNotes shouldn't exist ExifIFD of CR3 image", 1);
+    }
     # set flag to calculate image data hash if requested
     $doHash = 1 if $$et{ImageDataHash} and (($$et{FILE_TYPE} eq 'TIFF' and not $base and not $inMakerNotes) or
         ($$et{FILE_TYPE} eq 'RAF' and $dirName eq 'FujiIFD'));
@@ -6219,7 +6293,7 @@ sub ProcessExif($$$)
                     }
                     # read from file if necessary
                     unless (defined $buff) {
-                        my $wrn;
+                        my ($wrn, $truncOK);
                         my $readFromRAF = ($tagInfo and $$tagInfo{ReadFromRAF});
                         if (not $raf->Seek($base + $valuePtr + $dataPos, 0)) {
                             $wrn = "Invalid offset for $dir entry $index";
@@ -6229,18 +6303,22 @@ sub ProcessExif($$$)
                             $buff = "$$tagInfo{Name} data $size bytes";
                             $readSize = length $buff;
                         } elsif ($raf->Read($buff,$size) != $size) {
-                            $wrn = "Error reading value for $dir entry $index";
+                            $wrn = sprintf("Error reading value for $dir entry $index, ID 0x%.4x", $tagID);
+                            if ($tagInfo and not $$tagInfo{Unknown}) {
+                                $wrn .= " $$tagInfo{Name}";
+                                $truncOK = $$tagInfo{TruncateOK};
+                            }
                         } elsif ($readFromRAF) {
                             # seek back to the start of the value
                             $raf->Seek($base + $valuePtr + $dataPos, 0);
                         }
                         if ($wrn) {
-                            $et->Warn($wrn, $inMakerNotes);
-                            return 0 unless $inMakerNotes or $htmlDump;
+                            $et->Warn($wrn, $inMakerNotes || $truncOK);
+                            return 0 unless $inMakerNotes or $htmlDump or $truncOK;
                             ++$warnCount;
                             $buff = '' unless defined $buff;
                             $readSize = length $buff;
-                            $bad = 1;
+                            $bad = 1 unless $truncOK;
                         }
                     }
                     $valueDataLen = length $buff;
@@ -6813,6 +6891,10 @@ sub ProcessExif($$$)
             # save original components of rational numbers (used when copying)
             $$et{RATIONAL}{$tagKey} = $rational if defined $rational;
             $$et{TAG_EXTRA}{$tagKey}{G6} = $saveFormat if $saveFormat;
+            if ($$et{MAKER_NOTE_FIXUP}) {
+                $$et{TAG_EXTRA}{$tagKey}{Fixup} = $$et{MAKER_NOTE_FIXUP};
+                delete $$et{MAKER_NOTE_FIXUP};
+            }
         }
     }