exiftool_vendored 13.17.0 → 13.18.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 861018287a20c9c313a1fbaae7c77019fb9875a096936c68a61818e5d5cbda48
-  data.tar.gz: 1e0cc71de8847a24053b2fa9b569fdbf48b720aa70e027c6c984d6faabcde10a
+  metadata.gz: 7ed6242287b3fc53d1781c76868bb76b2ae54d5a43dcd48a52ff5678ecf6984d
+  data.tar.gz: 8b0446136fa4d3b248742abc3c961ddd60d1b849ce0e8505af39b65c6662b32f
 SHA512:
-  metadata.gz: 9ddf18669ddb544c1360868fd79cf7b5a0664d838f7986a43db8b15d1c21b4fbe30f516efdc2f55c6a4af21b29312e99c7ef2d28acce3eacba9aa77a65b219e7
-  data.tar.gz: b47c09c393c4b62543b458b2d57f2a3fee3868b0ed37da38954f7a8958746cf7566c76ff93eb839ffad0ddf9ea77c7a09663eaff8266a8b0f5067153e2579340
+  metadata.gz: a1863a2767968d76be14ffee77fb966c7d643a501c5dffed80291ccabf73b58775ecf5ffb6a2d54a1fd3cec10e07f7c28a32cb8567f6a6a6948ce4eb06728914
+  data.tar.gz: a2bde276ca6e28bc212c82751848fdc9a8c27a41b7abd522d27ddc8490be0b2d67f8a537c52f14cbfb4fc4b3424efe6dcc1ed2c67909cbc270fb5521c8a889bc

data/bin/Changes

@@ -7,6 +7,20 @@ RSS feed: https://exiftool.org/rss.xml
 Note: The most recent production release is Version 13.10. (Other versions are
 considered development releases, and are not uploaded to MetaCPAN.)
 
+Feb. 3, 2025 - Version 13.18
+
+  - Decode a number of new GoPro tags
+  - Enhanced -geotag option to set Geotime from either SubSecDateTimeOriginal
+    (preferentially) or DateTimeOriginal if not otherwise specified
+  - Don't allow ICC_Profile to be deleted from QuickTime-based files
+    (specifically HEIC, to avoid problem where Apple Preview wouldn't display the
+    resulting file)
+  - Improved decoding of AF points for Nikon D3400 and D7500
+  - Patched issue introduced in 13.13 which could give a "No data reference"
+    error when writing MP4 videos from some Google phones
+  - Fixed problem writing XMP-iptcExt:LocationCreatedGPSAltitudeRef with an
+    incorrect namespace
+
 Jan. 29, 2025 - Version 13.17
 
   - Added support for reading more embedded images and videos written in the
@@ -14,10 +28,9 @@ Jan. 29, 2025 - Version 13.17
   - Added support for reading JPEG trailer written by some OnePlus phones
   - Added a -validate warning for QuickTime 'wide' atoms with an invalid size
   - Added a new CanonLensType
-  - Extract more embedded videos and depth/gain maps from JPEG images written 
   - Avoid decoding Sony 0x9050 data for the ILCE-1M2 because the encoding has
-    changed since the ILCE-1 and the new encoding is not yet known
-  - Fixed issue that could cause runtime error when using -j with -b
+    changed since the ILCE-1 and the new encoding is not yet known (github #310)
+  - Fixed issue that could cause runtime warning when using -j with -b
   - Fixed some issues decoding AFPointsUsed for some newer Nikon models
   - Fixed problem corrupting QuickTime-format videos when writing if they
     contain a 'wide' atom with an invalid size

data/bin/META.json

@@ -50,5 +50,5 @@
       }
    },
    "release_status" : "stable",
-   "version" : "13.17"
+   "version" : "13.18"
 }

data/bin/META.yml

@@ -31,4 +31,4 @@ recommends:
   Time::HiRes: '0'
 requires:
   perl: '5.004'
-version: '13.17'
+version: '13.18'

data/bin/README

@@ -109,8 +109,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-13.17.tar.gz | tar -xf -
-  cd Image-ExifTool-13.17
+  gzip -dc Image-ExifTool-13.18.tar.gz | tar -xf -
+  cd Image-ExifTool-13.18
   ./exiftool t/images/ExifTool.jpg
 
 Note:  These commands extract meta information from one of the test images. 

data/bin/config_files/example.config

@@ -371,7 +371,7 @@ $Image::ExifTool::QuickTime::Keys{PREFERRED} = 3;
 # Add user-defined cities to the Geolocation lookup
 @Image::ExifTool::UserDefined::Geolocation = (
     # (city,region,subregion,country_code,country,timezone,feature_code,population,lat,lon)
-    ['Sinemorets','burgas','Obshtina Tsarevo','BG','','Europe/Sofia','PPL',400,42.06115,27.97833],
+    ['Sinemorets','Burgas','Obshtina Tsarevo','BG','','Europe/Sofia','PPL',400,42.06115,27.97833],
 );
 
 #------------------------------------------------------------------------------

data/bin/exiftool

@@ -11,7 +11,7 @@ use strict;
 use warnings;
 require 5.004;
 
-my $version = '13.17';
+my $version = '13.18';
 
 # add our 'lib' directory to the include list BEFORE 'use Image::ExifTool'
 my $exePath;
@@ -1391,7 +1391,8 @@ for (;;) {
                 # add geotag/geosync/geolocate commands first
                 unshift @newValues, pop @newValues;
                 if (lc $2 eq 'geotag' and (not defined $addGeotime or $addGeotime) and length $val) {
-                    $addGeotime = ($1 || '') . 'Geotime<DateTimeOriginal#';
+                    $addGeotime = [ ($1 || '') . 'Geotime<DateTimeOriginal#',
+                                    ($1 || '') . 'Geotime<SubSecDateTimeOriginal#' ];
                 }
             }
         }
@@ -1670,8 +1671,9 @@ if (@newValues) {
     # assume -geotime value if -geotag specified without -geotime
     if ($addGeotime) {
         AddSetTagsFile($setTagsFile = '@') unless $setTagsFile and $setTagsFile eq '@';
-        push @{$setTags{$setTagsFile}}, $addGeotime;
-        $verbose and print $vout qq{Argument "-$addGeotime" is assumed\n};
+        push @{$setTags{$setTagsFile}}, @$addGeotime;
+        my @a = map qq("-$_"), @$addGeotime;
+        $verbose and print $vout 'Arguments ',join(' and ', @a)," are assumed\n";
     }
     my %setTagsIndex;
     # add/delete option lookup
@@ -5984,7 +5986,7 @@ with this command:
 
 produces output like this:
 
-    -- Generated by ExifTool 13.17 --
+    -- Generated by ExifTool 13.18 --
     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
@@ -7808,8 +7810,9 @@ the B<-geotag> option.)
 
 Geotag an image (C<a.jpg>) from position information in a GPS track log
 (C<track.log>).  Since the C<Geotime> tag is not specified, the value of
-DateTimeOriginal is used for geotagging.  Local system time is assumed
-unless DateTimeOriginal contains a timezone.
+SubSecDateTimeOriginal (preferentially) or DateTimeOriginal is used for
+geotagging.  Local system time is assumed unless the time contains a
+timezone.
 
 =item C<exiftool -geotag track.log -geolocate=geotag a.jpg>
 
@@ -7854,7 +7857,8 @@ Delete XMP GPS tags which were added by the geotag feature.
 
 =item C<exiftool -xmp:geotag=track.log a.jpg>
 
-Geotag an image with XMP tags, using the time from DateTimeOriginal.
+Geotag an image with XMP tags, using the time from SubSecDateTimeOriginal or
+DateTimeOriginal.
 
 =item C<exiftool -geotag a.log -geotag b.log -r dir>
 

data/bin/lib/Image/ExifTool/CanonRaw.pm

@@ -854,7 +854,7 @@ sub ProcessCRW($$)
 
     # process trailers if they exist in CRW file (not in CIFF information!)
     if ($$et{FILE_TYPE} eq 'CRW') {
-        my $trailInfo = Image::ExifTool::IdentifyTrailer($raf);
+        my $trailInfo = $et->IdentifyTrailer($raf);
         $et->ProcessTrailers($trailInfo) if $trailInfo;
     }
 

data/bin/lib/Image/ExifTool/GoPro.pm

@@ -7,6 +7,7 @@
 #
 # References:   1) https://github.com/gopro/gpmf-parser
 #               2) https://github.com/stilldavid/gopro-utils
+#               3) https://github.com/gopro/gpmf-parser
 #------------------------------------------------------------------------------
 
 package Image::ExifTool::GoPro;
@@ -16,7 +17,7 @@ use vars qw($VERSION);
 use Image::ExifTool qw(:DataAccess :Utils);
 use Image::ExifTool::QuickTime;
 
-$VERSION = '1.11';
+$VERSION = '1.12';
 
 sub ProcessGoPro($$$);
 sub ProcessString($$$);
@@ -59,6 +60,8 @@ my %addUnits = (
     PrintConv => 'Image::ExifTool::GoPro::AddUnits($self, $val, $tag)',
 );
 
+my %noYes = ( N => 'No', Y => 'Yes' );
+
 # Tags found in the GPMF box of Hero6 mp4 videos (ref PH), and
 # the gpmd-format timed metadata of Hero5 and Hero6 videos (ref 1)
 %Image::ExifTool::GoPro::GPMF = (
@@ -72,7 +75,7 @@ my %addUnits = (
         let me know if you discover the meaning of any of these unknown tags. See
         L<https://github.com/gopro/gpmf-parser> for details about this format.
     },
-  # ABSC (GPMF) - seen: 0 (fmt f)
+    ABSC => 'AutoBoostScore', #3
     ACCL => { #2 (gpmd)
         Name => 'Accelerometer',
         Notes => 'accelerator readings in m/s2',
@@ -82,9 +85,9 @@ my %addUnits = (
   # ANGY (GPMF-GEOC) - seen 179.9 (fmt d, Max)
   # ANGZ (GPMF-GEOC) - seen 0.152 (fmt d, Max)
     ALLD => 'AutoLowLightDuration', #1 (gpmd) (untested)
-  # APTO (GPMF) - seen: 'OFF', 'RAW', 'DYNM' (fmt c)
-  # ARUW (GPMF) - seen: 1.14285719394684 (fmt f)
-  # ARWA (GPMF) - seen: 1.14285719394684 (fmt f)
+    APTO => 'AudioProtuneOption', #3
+    ARUW => 'AspectRatioUnwarped', #3
+    ARWA => 'AspectRatioWarped', #3
     ATTD => { #PH (Karma)
         Name => 'Attitude',
         # UNIT=s,rad,rad,rad,rad/s,rad/s,rad/s,
@@ -99,10 +102,10 @@ my %addUnits = (
         # SCAL=1000 1 1 1 1
         Binary => 1,
     },
-  # AUBT (GPMF) - seen: ''N' (type c)
+    AUBT => { Name => 'AudioBlueTooth', PrintConv => \%noYes }, #3
     AUDO => 'AudioSetting', #PH (GPMF - seen: 'WIND', fmt c)
-  # AUPT (GPMF) - seen: 'N','Y' (fmt c)
-  # BITR (GPMF) - seen: 'STANDARD' (fmt c)
+    AUPT => { Name => 'AutoProtune', PrintConv => \%noYes },
+    BITR => 'BitrateSetting', #3
     BPOS => { #PH (Karma)
         Name => 'Controller',
         Unknown => 1,
@@ -116,16 +119,22 @@ my %addUnits = (
   # CALH (GPMF-GEOC) - seen 3040 (fmt L, Max)
   # CALW (GPMF-GEOC) - seen 4056 (fmt L, Max)
     CASN => 'CameraSerialNumber', #PH (GPMF - seen: 'C3221324545448', fmt c)
-  # CDAT (GPMF) - seen: 1732152823 (fmt J)
-  # CDTM (GPMF) - seen: 0 (fmt L)
+    CDAT => { #3
+        Name => 'CreationDate',
+        Groups => { 2 => 'Time' },
+        RawConv => 'ConvertUnixTime($val)',
+        PrintConv => '$self->ConvertDateTime($val)',
+    },
+    CDTM => 'CaptureDelayTimer', #3
   # CINF (GPMF) - seen: 0x67376be7709bc8876a8baf3940908618, 0xe230988539b30cf5f016627ae8fc5395,
   #                     0x8bcbe424acc5b37d7d77001635198b3b (fmt B) (Camera INFormation?)
-  # CLDP (GPMF) - seen: 'Y' (fmt c)
+    CLDP => { Name => 'ClassificationDataPresent', PrintConv => \%noYes },
   # CLKC (GPMF) - seen: 0 (fmt L)
   # CLKS (GPMF) - seen: 2 (fmt B)
-  # CMOD (GPMF) - seen: 12,13,17 [12 360 video, 13 time-laps video, 17 JPEG] (fmt B)
+  # CMOD (GPMF) - seen: 12,13,17 [12 360 video, 13 time-laps video, 17 JPEG] (fmt B) - CameraMode (ref 3)
   # CPID (GPMF) - seen: '1194885996 3387225026 733916448 2433577768' (fmt L)
   # CPIN (GPMF) - seen: 1
+    CPIN => 'ChapterNumber',
   # CRTX (GPMF-BACK/FRNT) - double[1]
   # CRTY (GPMF-BACK/FRNT) - double[1]
     CSEN => { #PH (Karma)
@@ -135,7 +144,7 @@ my %addUnits = (
         # SCAL=1000 1 1 1 1 1 1 1 1 1 1
         Binary => 1,
     },
-  # CTRL (GPMF) - seen: 'Pro' (fmt c)
+    CTRL => 'ControlLevel', #3
     CYTS => { #PH (Karma)
         Name => 'CoyoteStatus',
         # UNIT=s,,,,,rad,rad,rad,,
@@ -155,22 +164,22 @@ my %addUnits = (
         # (Max) DVID='HLMT',DVNM='Highlights'
     },
   # DNSC (GPMF) - seen: 'HIGH' (fmt c)
-  # DUST (GPMF) - seen: 'NO_LIMIT' (fmt c)
+    DUST => 'DurationSetting', #3
   # DVID (GPMF) - DeviceID; seen: 1 (fmt L), HLMT (fmt F), GEOC (fmt F), 'BACK' (fmt F, Max)
     DVID => { Name => 'DeviceID', Unknown => 1 }, #2 (gpmd)
   # DVNM (GPMF) seen: 'Video Global Settings' (fmt c), 'Highlights' (fmt c), 'Geometry Calibrations' (Max)
   # DVNM (gpmd) seen: 'Camera' (Hero5), 'Hero6 Black' (Hero6), 'GoPro Karma v1.0' (Karma)
     DVNM => 'DeviceName', #PH (n/c)
     DZOM => { #PH (GPMF - seen: 'Y', fmt c)
-        Name => 'DigitalZoom',
-        PrintConv => { N => 'No', Y => 'Yes' },
+        Name => 'DigitalZoomOn',
+        PrintConv => \%noYes,
     },
-  # DZMX (GPMF) - seen: 1.39999997615814 (fmt f)
-  # DZST (GPMF) - seen: 0 (fmt L) (something to do with digital zoom maybe?)
+    DZMX => 'DigitalZoomAmount', #3
+    DZST => 'DigitalZoom', #3
     EISA => { #PH (GPMF) - seen: 'Y','N','HS EIS','N/A' (fmt c) [N was for a time-lapse video]
         Name => 'ElectronicImageStabilization',
     },
-  # EISE (GPMF) - seen: 'Y','N' (fmt c)
+    EISE => { Name => 'ElectronicStabilizationOn', PrintConv => \%noYes }, #3
     EMPT => { Name => 'Empty', Unknown => 1 }, #2 (gpmd)
     ESCS => { #PH (Karma)
         Name => 'EscapeStatus',
@@ -180,7 +189,7 @@ my %addUnits = (
         Unknown => 1,
         %addUnits,
     },
-  # EXPT (GPMF) - seen: '', 'AUTO' (fmt c)
+    EXPT => 'ExposureType', #3
     FACE => 'FaceDetected', #PH (gpmd)
     FCNM => 'FaceNumbers', #PH (gpmd) (faces counted per frame, ref 1)
     FMWR => 'FirmwareVersion', #PH (GPMF - seen: HD6.01.01.51.00, fmt c)
@@ -242,10 +251,10 @@ my %addUnits = (
         Notes => 'gyroscope readings in rad/s',
         Binary => 1,
     },
-  # HCTL (GPMF) - seen: "Off" (fmt c)
-  # HDRV (GPMF) - seen: "N" (fmt c)
+    HCLT => 'HorizonControl', #3
+    HDRV => { Name => 'HDRVideo', PrintConv => \%noYes }, #3/PH (NC)
   # HFLG (APP6) - seen: 0
-  # HSGT (GPMF) - seen: 'OFF' (fmt c)
+    HSGT => 'HindsightSettings', #3
     ISOE => 'ISOSpeeds', #PH (gpmd)
     ISOG => { #2 (gpmd)
         Name => 'ImageSensorGain',
@@ -270,20 +279,20 @@ my %addUnits = (
         Binary => 1,
     },
     MAGN => 'Magnetometer', #1 (gpmd) (units of uT)
-  # MAPX (GPMF) - seen: 1 (fmt f)
-  # MAPY (GPMF) - seen: 1 (fmt f)
+    MAPX => 'MappingXCoefficients', #3
+    MAPY => 'MappingYCoefficients', #3
   # MFOV (GPMF-BACK/FRNT) - seen: 100 (fmt d, Max)
     MINF => { #PH (GPMF - seen: HERO6 Black, fmt c)
         Name => 'Model',
         Groups => { 2 => 'Camera' },
         Description => 'Camera Model Name',
     },
-  # MMOD (GPMF) - seen: 'STEREO' (fmt c)
-  # MTYP (GPMF) - seen: 0,1,5,11 [1 for time-lapse video, 5 for 360 video, 11 for JPEG] (fmt B)
-  # MUID (GPMF) - seen: 3882563431 2278071152 967805802 411471936 0 0 0 0 (fmt L)
-  # MXCF (GPMF) - seen: 'x1' (fmt c)
-  # MYCF (GPMF) - seen: 'y1' (fmt c)
-  # ORDP (GPMF) - seen: 'Y' (fmt c)
+    MMOD => 'MediaMode', #3
+  # MTYP (GPMF) - seen: 0,1,5,11 [1 for time-lapse video, 5 for 360 video, 11 for JPEG] (fmt B) - MediaType (ref 3)
+    MUID => { Name => 'MediaUID', ValueConv => 'join("-", unpack("H8H4H4H4H12", $val))' },
+    MXCF => 'MappingXMode', #3
+    MYCF => 'MappingYMode', #3
+    ORDP => { Name => 'OrientationDataPresent', PrintConv => \%noYes }, #3
     OREN => { #PH (GPMF - seen: 'U', fmt c)
         Name => 'AutoRotation',
         PrintConv => {
@@ -292,20 +301,20 @@ my %addUnits = (
             A => 'Auto', # (NC)
         },
     },
-    # (most of the "P" tags are ProTune settings - PH)
+    # (most of the "P" tags are Protune settings - PH)
     PHDR => 'HDRSetting', #PH (APP6 - seen: 0)
-  # PIMD (GPMF) - seen: 'AUTO' (fmt c)
+    PIMD => 'ProtuneISOMode', #3
     PIMN => 'AutoISOMin', #PH (GPMF - seen: 100, fmt L)
     PIMX => 'AutoISOMax', #PH (GPMF - seen: 1600, fmt L)
-  # POLY (GPMF) - seen: '0 2.11120247840881 0.14325800538063 -1.030...' (fmt f)
+    POLY => 'PolynomialCoefficients', #3
   # PRAW (APP6) - seen: 0, 'N', 'Y' (fmt c)
   # PRCN (GPMF) - seen: 65 zeros (fmt B)
     PRES => 'PhotoResolution', #PH (APP6 - seen: '12MP_W')
-  # PRJT (APP6) - seen: 'GPRO','EACO' (fmt F, Hero8, Max)
-  # PRNA (GPMF) - seen 10 (fmt B)
-  # PRNU (GPMF) - seen 0 (fmt B)
+    PRJT => 'LensProjection', #3
+  # PRNA (GPMF) - seen 10 (fmt B) - PresetIDs (ref 3)
+  # PRNU (GPMF) - seen 0 (fmt B) - PresetIDs (ref 3)
     PRTN => { #PH (GPMF - seen: 'N', fmt c)
-        Name => 'ProTune',
+        Name => 'Protune',
         PrintConv => {
             N => 'Off',
             Y => 'On', # (NC)
@@ -316,9 +325,9 @@ my %addUnits = (
     PTSH => 'Sharpness', #PH (GPMF - seen: 'HIGH', fmt c)
     PTWB => 'WhiteBalance', #PH (GPMF - seen: 'AUTO', fmt c)
   # PVUL (APP6) - seen: 'F' (fmt c, Hero8, Max)
-  # PWPR (GPMF) - seen: 'PERFORMANCE' (fmt c)
-  # PYCF (GPMF) - seen: '[r0,r1,r2,r3,r4,r5,r6]' (fmt c)
-  # RAMP (GPMF) - seen: empty string (fmt c)
+    PWPR => 'PowerProfile', #3
+    PYCF => 'PolynomialPower', #3
+    RAMP => 'SpeedRampSetting', #3
     RATE => 'Rate', #PH (GPMF - seen: '0_5SEC', fmt c; APP6 - seen: '4_1SEC')
     RMRK => { #2 (gpmd)
         Name => 'Comments',
@@ -328,7 +337,7 @@ my %addUnits = (
         Name => 'ScaleFactor',
         Unknown => 1,
     },
-  # SCAP (GPMF) - seen: 'N' (fmt c)
+    SCAP => { Name => 'ScheduleCapture', PrintConv => \%noYes }, #3
     SCPR => { #PH (Karma) [stream was empty]
         Name => 'ScaledPressure',
         # UNIT=s,Pa,Pa,degC
@@ -336,7 +345,7 @@ my %addUnits = (
         # SCAL=1000 0.00999999977648258 0.00999999977648258 100
         %addUnits,
     },
-  # SCTM (GPMF) - seen 0 (fmt L)
+    SCTM => 'ScheduleCaptureTime', #3 (seconds since UTC midnight)
   # SFTR (GPMF-BACK/FRNT) - seen 0.999,1.00004 (fmt d, Max)
   # SHFX (GPMF-GEOC) - seen 22.92 (fmt d, Max)
   # SHFY (GPMF-GEOC) - seen 0.123 (fmt d, Max)
@@ -361,9 +370,9 @@ my %addUnits = (
         Unknown => 1,
         ValueConv => '$self->Decode($val, "Latin")',
     },
-  # SMTR (GPMF) - seen: 'N' (fmt c)
+    SMTR => { Name => 'SpotMeter', PrintConv => \%noYes }, #3
   # SOFF (APP6) - seen: 0 (fmt L, Hero8, Max)
-  # SROT (GPMF) - seen 20.60 (fmt f, Max)
+    SROT => 'SensorReadoutTime', #3
     STMP => { #1 (gpmd)
         Name => 'TimeStamp',
         ValueConv => '$val / 1e6',
@@ -437,8 +446,8 @@ my %addUnits = (
         Name => 'WhiteBalanceRGB',
         Binary => 1,
     },
-  # ZFOV (APP6,GPMF) - seen: 148.34, 0 (fmt f, Hero8, Max)
-  # ZMPL (GPMF) - seen: 0.652929663658142 (fmt f)
+    ZFOV => 'DiagonalFieldOfView', #3
+    ZMPL => 'ZoomScaleNormalization', #3
 #
 # the following ref forum12825
 #
@@ -450,7 +459,6 @@ my %addUnits = (
             return join('', @a);
         },
     },
-    EXPT => 'MaximumShutterAngle',
     MTRX => 'AccelerometerMatrix',
     ORIN => 'InputOrientation',
     ORIO => 'OutputOrientation',
@@ -873,6 +881,8 @@ under the same terms as Perl itself.
 
 =item L<https://github.com/stilldavid/gopro-utils>
 
+=item L<https://github.com/gopro/gpmf-parser>
+
 =back
 
 =head1 SEE ALSO

data/bin/lib/Image/ExifTool/Nikon.pm

@@ -65,7 +65,7 @@ use Image::ExifTool::Exif;
 use Image::ExifTool::GPS;
 use Image::ExifTool::XMP;
 
-$VERSION = '4.42';
+$VERSION = '4.43';
 
 sub LensIDConv($$$);
 sub ProcessNikonAVI($$$);
@@ -1370,6 +1370,25 @@ my %retouchValues = ( #PH
     54 => 'Low Key', # (S3500)
 );
 
+# AF points for models with 11 focus points (eg. D3400)
+my %afPoints11 = (
+    0 => '(none)',
+    0x7ff => 'All 11 Points',
+    BITMASK => {
+        0 => 'Center',
+        1 => 'Top',
+        2 => 'Bottom',
+        3 => 'Mid-left',
+        4 => 'Mid-right',
+        5 => 'Upper-left',
+        6 => 'Upper-right',
+        7 => 'Lower-left',
+        8 => 'Lower-right',
+        9 => 'Far Left',
+        10 => 'Far Right',
+    },
+);
+
 # AF point indices for models with 51 focus points, eg. D3 (ref JD/PH)
 #        A1  A2  A3  A4  A5  A6  A7  A8  A9
 #    B1  B2  B3  B4  B5  B6  B7  B8  B9  B10  B11
@@ -4027,23 +4046,7 @@ my %base64coord = (
         Name => 'AFPointsInFocus',
         Format => 'int16u',
         PrintConvColumns => 2,
-        PrintConv => {
-            0 => '(none)',
-            0x7ff => 'All 11 Points',
-            BITMASK => {
-                0 => 'Center',
-                1 => 'Top',
-                2 => 'Bottom',
-                3 => 'Mid-left',
-                4 => 'Mid-right',
-                5 => 'Upper-left',
-                6 => 'Upper-right',
-                7 => 'Lower-left',
-                8 => 'Lower-right',
-                9 => 'Far Left',
-                10 => 'Far Right',
-            },
-        },
+        PrintConv => \%afPoints11,
     },
 );
 
@@ -4515,7 +4518,7 @@ my %base64coord = (
     0x1c => [
         { #PH
             Name => 'ContrastDetectAFInFocus',
-            Condition => '$$self{AFInfo2Version} eq "0100"',
+            Condition => '$$self{AFInfo2Version} eq "0100" and $$self{ContrastDetectAF}',
             PrintConv => { 0 => 'No', 1 => 'Yes' },
         },{ #PH (D500, see forum11190)
             Name => 'AFPointsSelected',
@@ -4525,6 +4528,11 @@ my %base64coord = (
             ValueConvInv => '$val=~tr/ //d; pack("H*",$val)',
             PrintConv => sub { PrintAFPoints(shift, \%afPoints153); },
             PrintConvInv => sub { PrintAFPointsInv(shift, \%afPoints153); },
+        },{ #PH (D3400) (NC "selected")
+            Name => 'AFPointsSelected',
+            Condition => '$$self{AFInfo2Version} eq "0101" and $$self{PhaseDetectAF} == 2',
+            Format => 'int16u',
+            PrintConv => \%afPoints11,
         },
     ],
     # 0x1d - always zero (with or without live view)
@@ -4573,6 +4581,14 @@ my %base64coord = (
             ValueConvInv => '$val=~tr/ //d; pack("H*",$val)',
             PrintConv => sub { PrintAFPoints(shift, \%afPoints153); },
             PrintConvInv => sub { PrintAFPointsInv(shift, \%afPoints153); },
+        },{ #PH (D7500) (NC "in focus")
+            Name => 'AFPointsInFocus',
+            Condition => '$$self{AFInfo2Version} eq "0101" and $$self{PhaseDetectAF} == 1',
+            Format => 'undef[7]',
+            ValueConv => 'join(" ", unpack("H2"x7, $val))',
+            ValueConvInv => '$val=~tr/ //d; pack("H*",$val)',
+            PrintConv => sub { PrintAFPoints(shift, \%afPoints51); },
+            PrintConvInv => sub { PrintAFPointsInv(shift, \%afPoints51); },
         },
     ],
     0x31 => { #28 (Z7)
@@ -4639,6 +4655,16 @@ my %base64coord = (
                 11 => 'Far Right',
             },
         },
+        {
+            Name => 'PrimaryAFPoint',
+            Condition => '$$self{PhaseDetectAF} == 1 and $$self{AFInfo2Version} eq "0101"',
+            PrintConvColumns => 5,
+            PrintConv => {
+                0 => '(none)',
+                %afPoints51,
+                1 => 'C6 (Center)',
+            },
+        },
         {
             Name => 'PrimaryAFPoint',
             Condition => '$$self{AFInfo2Version} eq "0101"',

data/bin/lib/Image/ExifTool/Photoshop.pm

@@ -1165,7 +1165,7 @@ sub ProcessPSD($$)
             $len = Set32u(length $data);
             Write($outfile, $len, $data) or $err = 1;
             # look for trailer and edit if necessary
-            my $trailInfo = Image::ExifTool::IdentifyTrailer($raf);
+            my $trailInfo = $et->IdentifyTrailer($raf);
             if ($trailInfo) {
                 my $tbuf = '';
                 $$trailInfo{OutFile} = \$tbuf;  # rewrite trailer(s)
@@ -1223,7 +1223,7 @@ sub ProcessPSD($$)
         }
         $$et{INDENT} = $oldIndent;
         # process trailers if they exist
-        my $trailInfo = Image::ExifTool::IdentifyTrailer($raf);
+        my $trailInfo = $et->IdentifyTrailer($raf);
         $et->ProcessTrailers($trailInfo) if $trailInfo;
     }
     return $rtnVal;