exiftool_vendored 12.65.0 → 12.68.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 043102c6d2f82c4799b2885cbd9fdd7e9dfac5f1fe0450dea8bc2392a995dca3
-  data.tar.gz: f188b33293746a02b5b8814a5b566cfefebb9311146d75a383522686424dc547
+  metadata.gz: 8775a6c495517ead6255debf3b1c804d3e5648d563bea48171176632cfb5043b
+  data.tar.gz: 305d08e52e2ef9b75538fe0305093dad86581448d56a21d66503863b11321a6f
 SHA512:
-  metadata.gz: af7e7099dbf145f6ad9000691f208cd15bac17f74b5051e5e3273837f3d6d09b121171d3b593029bca036b6b58b23dddc55b962ddf9b2d7e0638a9d926de5400
-  data.tar.gz: f92aae3415a5d73e8c449c466584798d66941ec0c28d97ebe1e88c0d917cecfce642c7bf2b20608fd425ddd412ff2b2a3659da97519a413903524fc99d98da73
+  metadata.gz: aa79d6fa82ae949030c90fc5e07c0271eb837336e9ee8675a1bb468b1f4f5b430b0ce78678a75e5025520a1118b7defd21a8f06242ad019d2001e10d1f270e54
+  data.tar.gz: ac7c7da4ef3ba52118a9bea9c0ccdc6a85f4d247e622e75c4e40567d582f0ca062eb68ad796a1a3745c5631c9800e243f45599a52cc8a2bfc99daf00af9cd928

data/bin/Changes

@@ -7,6 +7,47 @@ 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. 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
+  - 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 support for a new XMP-photomech tag
+  - Added a new Nikon LensID
+  - Added a new Canon LensType
+  - Added a new QuickTime ItemList tag
+  - 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 +176,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 +366,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

data/bin/MANIFEST

@@ -179,6 +179,7 @@ html/TagNames/VCard.html
 html/TagNames/Vorbis.html
 html/TagNames/WPG.html
 html/TagNames/WTV.html
+html/TagNames/XISF.html
 html/TagNames/XMP.html
 html/TagNames/ZIP.html
 html/TagNames/ZISRAW.html
@@ -432,6 +433,7 @@ lib/Image/ExifTool/WriteQuickTime.pl
 lib/Image/ExifTool/WriteRIFF.pl
 lib/Image/ExifTool/WriteXMP.pl
 lib/Image/ExifTool/Writer.pl
+lib/Image/ExifTool/XISF.pm
 lib/Image/ExifTool/XMP.pm
 lib/Image/ExifTool/XMP2.pl
 lib/Image/ExifTool/XMPStruct.pl
@@ -916,6 +918,8 @@ t/Writer_6.out
 t/Writer_60.out
 t/Writer_7.out
 t/Writer_9.out
+t/XISF.t
+t/XISF_2.out
 t/XMP.t
 t/XMP_10.out
 t/XMP_11.out
@@ -1144,6 +1148,7 @@ t/images/Vorbis.ogg
 t/images/WPG.wpg
 t/images/WTV.wtv
 t/images/Writer.jpg
+t/images/XISF.xisf
 t/images/XMP.inx
 t/images/XMP.jpg
 t/images/XMP.svg

data/bin/META.json

@@ -50,5 +50,5 @@
       }
    },
    "release_status" : "stable",
-   "version" : "12.65"
+   "version" : "12.68"
 }

data/bin/META.yml

@@ -31,4 +31,4 @@ recommends:
   Time::HiRes: 0
 requires:
   perl: 5.004
-version: 12.65
+version: 12.68

data/bin/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.68.tar.gz | tar -xf -
+  cd Image-ExifTool-12.68
   ./exiftool t/images/ExifTool.jpg
 
 Note:  These commands extract meta information from one of the test images. 

data/bin/exiftool

@@ -11,7 +11,7 @@ use strict;
 use warnings;
 require 5.004;
 
-my $version = '12.65';
+my $version = '12.68';
 
 # add our 'lib' directory to the include list BEFORE 'use Image::ExifTool'
 my $exePath;
@@ -4665,11 +4665,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
@@ -5582,7 +5582,7 @@ with this command:
 
 produces output like this:
 
-    -- Generated by ExifTool 12.65 --
+    -- Generated by ExifTool 12.68 --
     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
@@ -6418,10 +6418,14 @@ from the track log, and they are supported by the destination metadata
 format):  GPSLatitude, GPSLatitudeRef, 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, C<EXIF:Geotime> or C<XMP:Geotime>
-may be specified to write only EXIF or XMP tags respectively.  Note that
+GPSImgDirectionRef, 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, C<EXIF:Geotime>, C<XMP:Geotime> or
+C<QuickTime:Geotime> may be specified to write to write only to one group. 
+Also, C<ItemList:Geotime>, C<Keys:Geotime> or C<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.
 
@@ -6527,7 +6531,8 @@ load exiftool for each invocation.
 Set ExifTool API option.  I<OPT> is an API option name.  The option value is
 set to 1 if I<=VAL> is omitted.  If I<VAL> is omitted, the option value is
 set to undef if C<=> is used, or an empty string with C<^=>.  If I<OPT> is
-not specified a list of available options is returned.  See
+not specified a list of available options is returned.  The option name is
+not case senstive, but the option values are.  See
 L<Image::ExifTool Options|Image::ExifTool/Options> for option details.  This
 overrides API options set via the config file.
 
@@ -6543,11 +6548,12 @@ options on the command line.
 
 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 B<-execute>'d commands.  The I<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 I<CFGFILE> to an empty string (ie.
-"").  See L<https://exiftool.org/config.html> and
+line and applies to all B<-execute>'d commands.  This file is used to create
+user-defined tags as well as set default ExifTool options.  The I<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 I<CFGFILE> to an empty string
+(ie. "").  See L<https://exiftool.org/config.html> and
 config_files/example.config in the full ExifTool distribution for details
 about the configuration file syntax.
 
@@ -7323,10 +7329,13 @@ CreateDate and FileNumber tags, in the form "20060507_118-1861.jpg".
 
 =head1 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
-L<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
+L<https://exiftool.org/geotag.html> for additional documentation.  (Note
+that geotagging from known GPS coordinates is done by writing the
+L<GPS tags|Image::ExifTool::TagNames/GPS Tags> directly rather than using
+the B<-geotag> option.)
 
 =over 5
 

data/bin/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',

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

@@ -88,7 +88,7 @@ sub ProcessCTMD($$$);
 sub ProcessExifInfo($$$);
 sub SwapWords($);
 
-$VERSION = '4.67';
+$VERSION = '4.69';
 
 # 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
         },
     },

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

@@ -31,7 +31,7 @@ use vars qw($VERSION);
 use Image::ExifTool qw(:DataAccess :Utils);
 use Image::ExifTool::Exif;
 
-$VERSION = '1.88';
+$VERSION = '1.90';
 
 sub ProcessFujiDir($$$);
 sub ProcessFaceRec($$$);
@@ -428,6 +428,14 @@ my %faceCategories = (
         Name => 'ShadowTone',
         Writable => 'int32s',
         PrintConv => {
+            OTHER => sub {
+                my ($val, $inv) = @_;
+                if ($inv) {
+                    return int(-$val * 16);
+                } else {
+                    return -$val / 16;
+                }
+            },
             -64 => '+4 (hardest)',
             -48 => '+3 (very hard)',
             -32 => '+2 (hard)',
@@ -441,6 +449,14 @@ my %faceCategories = (
         Name => 'HighlightTone',
         Writable => 'int32s',
         PrintConv => {
+            OTHER => sub {
+                my ($val, $inv) = @_;
+                if ($inv) {
+                    return int(-$val * 16);
+                } else {
+                    return -$val / 16;
+                }
+            },
             -64 => '+4 (hardest)',
             -48 => '+3 (very hard)',
             -32 => '+2 (hard)',
@@ -670,6 +686,7 @@ my %faceCategories = (
             0x800 => 'Classic Negative', #forum10536
             0x900 => 'Bleach Bypass', #forum10890
             0xa00 => 'Nostalgic Neg', #forum12085
+            0xb00 => 'Reala ACE', #forum15190
         },
     },
     0x1402 => { #2
@@ -897,6 +914,8 @@ my %faceCategories = (
             25 => 'Aircraft Cockpit',
             26 => 'Train Front',
             27 => 'Train Cockpit',
+            28 => 'Animal Head (28)', #forum15192
+            29 => 'Animal Body (29)', #forum15192
         },'REPEAT'],
     },
     # 0x4202 int8u[-1] - number of cooredinates in each rectangle? (ref 11)

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

@@ -29,7 +29,7 @@ use vars qw($VERSION);
 use Image::ExifTool qw(:Public);
 use Image::ExifTool::GPS;
 
-$VERSION = '1.72';
+$VERSION = '1.73';
 
 sub JITTER() { return 2 }       # maximum time jitter
 
@@ -1109,7 +1109,7 @@ sub SetGeoValues($$;$)
                     $iExt = $i1;
                 }
                 if (abs($time - $tn) > $geoMaxExtSecs) {
-                    $err or $err = 'Time is too far from nearest GPS fix';
+                    $err or $err = 'Time is too far from nearest GPS fix'.' '.abs($time-$tn).' '.$geoMaxExtSecs;
                     $et->VPrint(2, '  Nearest fix:     ', PrintFixTime($tn), "\n") if $verbose > 2;
                     $fix = { } if $$geotag{DateTimeOnly};
                 } else {
@@ -1196,24 +1196,29 @@ Category:       foreach $category (qw{pos track alt orient atemp}) {
         # write GPSDateStamp if date included in track log, otherwise delete it
         $gpsDate = sprintf('%.2d:%.2d:%.2d', $t[5]+1900, $t[4]+1, $t[3]) unless $noDate;
         # write GPSAltitude tags if altitude included in track log, otherwise delete them
-        if (defined $$fix{alt}) {
-            $gpsAlt = abs $$fix{alt};
-            $gpsAltRef = ($$fix{alt} < 0 ? 1 : 0);
-        } elsif ($$has{alt} and defined $iExt) {
+        my $alt = $$fix{alt};
+        if (not defined $alt and $$has{alt} and defined $iExt) {
             my $tFix = FindFix($et,'alt',$times,$points,$iExt,$iDir,$geoMaxExtSecs);
-            if ($tFix) {
-                $gpsAlt = abs $$tFix{alt};
-                $gpsAltRef = ($$tFix{alt} < 0 ? 1 : 0);
-            }
+            $alt = $$tFix{alt} if $tFix;
         }
         # set new GPS tag values (EXIF, or XMP if write group is 'xmp')
-        my ($xmp, $exif, @r);
+        my ($xmp, $exif, $qt, @r);
         my %opts = ( Type => 'ValueConv' ); # write ValueConv values
         if ($writeGroup) {
             $opts{Group} = $writeGroup;
             $xmp = ($writeGroup =~ /xmp/i);
             $exif = ($writeGroup =~ /^(exif|gps)$/i);
+            $qt = $writeGroup =~ /^(quicktime|keys|itemlist|userdata)$/i;
+        }
+        # set QuickTime GPSCoordinates
+        my $coords = "$$fix{lat} $$fix{lon}";
+        if (defined $alt) {
+            $gpsAlt = abs $alt;
+            $gpsAltRef = ($alt < 0 ? 1 : 0);
+            $coords .= " $alt";
         }
+        @r = $et->SetNewValue(GPSCoordinates => $coords, %opts);
+        return $err if $qt; # all done if writing to QuickTime only
         # (capture error messages by calling SetNewValue in list context)
         @r = $et->SetNewValue(GPSLatitude => $$fix{lat}, %opts);
         @r = $et->SetNewValue(GPSLongitude => $$fix{lon}, %opts);
@@ -1288,7 +1293,7 @@ Category:       foreach $category (qw{pos track alt orient atemp}) {
                     GPSAltitude GPSAltitudeRef GPSDateStamp GPSTimeStamp GPSDateTime
                     GPSTrack GPSTrackRef GPSSpeed GPSSpeedRef GPSImgDirection
                     GPSImgDirectionRef GPSPitch GPSRoll CameraElevationAngle
-                    AmbientTemperature))
+                    AmbientTemperature GPSCoordinates))
         {
             my @r = $et->SetNewValue($_, undef, %opts);
         }

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.24';
+$VERSION = '4.26';
 
 sub LensIDConv($$$);
 sub ProcessNikonAVI($$$);
@@ -676,6 +676,7 @@ sub GetAFPointGrid($$;$);
     '07 40 30 45 2D 35 03 02.2' => 'Voigtlander Ultragon 19-35mm F3.5-4.5 VMV', #NJ
     '71 48 64 64 24 24 00 00' => 'Voigtlander APO-Skopar 90mm F2.8 SL IIs', #30
     'FD 00 50 50 18 18 DF 00' => 'Voigtlander APO-Lanthar 50mm F2 Aspherical', #35
+    'FD 00 44 44 18 18 DF 00' => 'Voigtlander APO-Lanthar 35mm F2', #30
 #
     '00 40 2D 2D 2C 2C 00 00' => 'Carl Zeiss Distagon T* 3.5/18 ZF.2',
     '00 48 27 27 24 24 00 00' => 'Carl Zeiss Distagon T* 2.8/15 ZF.2', #MykytaKozlov
@@ -1188,6 +1189,7 @@ my %subjectDetectionZ9 = (
     2 => 'People',
     3 => 'Animals',
     4 => 'Vehicles',
+    5 => 'Birds',
     6 => 'Airplanes',
 );
 
@@ -1983,6 +1985,14 @@ my %base64coord = (
         Writable => 'rational64s',
         Count => 2,
     },
+    0x0044 => { #28
+        Name => 'JPGCompression',
+        RawConv => '($val) ? $val : undef', # undef for raw files 
+        PrintConv => {
+            1 => 'Size Priority',
+            3 => 'Optimal Quality',
+        },
+    },
     0x0045 => { #IB
         Name => 'CropArea',
         Notes => 'left, top, width, height',
@@ -2413,8 +2423,8 @@ my %base64coord = (
             },
         },
         { # (Z6_2 firmware version 1.00 and Z7II firmware versions 1.00 & 1.01, ref 28)
-            # 0800=Z6/Z7  0801=Z50  0802=Z5   0803=Z6II/Z7II  0804=Zfc  0807=Z30
-            Condition => '$$valPt =~ /^080[012347]/',
+            # 0800=Z6/Z7  0801=Z50  0802=Z5   0803=Z6II/Z7II  0804=Zfc  0807=Z30 0808=Zf
+            Condition => '$$valPt =~ /^080[0123478]/',
             Name => 'ShotInfoZ7II',
             SubDirectory => {
                 TagTable => 'Image::ExifTool::Nikon::ShotInfoZ7II',
@@ -2473,7 +2483,7 @@ my %base64coord = (
     },
     0x0094 => { Name => 'SaturationAdj',    Writable => 'int16s' },
     0x0095 => { Name => 'NoiseReduction',   Writable => 'string' }, # ("Off" or "FPNR"=long exposure NR)
-    0x0096 => {
+    0x0096 => { # (not found in NRW files, but also not in all NEF's)
         Name => 'NEFLinearizationTable', # same table as DNG LinearizationTable (ref JD)
         Writable => 'undef',
         Flags => [ 'Binary', 'Protected' ],
@@ -6048,6 +6058,24 @@ my %nikonFocalConversions = (
         Format => 'int32u',
         Priority => 0,
     },
+    671.1 => { # 0x29f
+        Name => 'JPGCompression',
+        Mask => 0x40,
+        PrintConv => {
+            0 => 'Size Priority',
+            1 => 'Optimal Quality',
+        },
+    },
+    # this works for one set of D3S samples, but is 0 in some others
+    #671.2 => { # 0x29f
+    #    Name => 'Quality',
+    #    Mask => 0x03,
+    #    PrintConv => {
+    #        1 => 'Fine',
+    #        2 => 'Normal',
+    #        3 => 'Basic',
+    #    },
+    #},
     0x2ce => { #(NC)
         Name => 'CustomSettingsD3S',
         Format => 'undef[27]',
@@ -8840,7 +8868,7 @@ my %nikonFocalConversions = (
     %binaryDataAttrs,
     GROUPS => { 0 => 'MakerNotes', 2 => 'Camera' },
     DATAMEMBER => [ 90, 176, 180, 328, 352, 858 ],
-    NOTES => 'These tags are used by the Z5, Z6, Z7, Z6II, Z7II, Z50 and Zfc.',
+    NOTES => 'These tags are used by the Z5, Z6, Z7, Z6II, Z7II, Z50, Zfc and Zf.',
     #48 SelfTimer'   #0=> no 1=> yes    works for Z7II firmware 1.40, but not 1.30.  Follow-up required.
     90 => {
         Name => 'SingleFrame',    #0=> Single Frame 1=> one of the continuous modes
@@ -9808,6 +9836,7 @@ my %nikonFocalConversions = (
     290 => { Name => 'PhotoShootingMenuBank', PrintConv => \%banksZ9 },
     292 => { Name => 'ExtendedMenuBanks',     PrintConv => \%offOn }, # single tag from both Photo & Video menus
     328 => { Name => 'PhotoShootingMenuBankImageArea', PrintConv => \%imageAreaZ9 },
+    #334  JPGCompression     0 => 'Size Priority', 1 => 'Optimal Quality',
     342 => { Name => 'AutoISO', PrintConv => \%offOn },
     344 => {
         Name => 'ISOAutoHiLimit',