exiftool_vendored 11.63.0 → 11.64.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ea6e0dbd2fcc5d00e9ea0e5fdfa01cf96f64aaf6
-  data.tar.gz: 6448e540c1fa5c44c3ff28d6771c14ac3da1b02c
+  metadata.gz: ed8e2593ed82c4f03352524a9533ca0b8f58b029
+  data.tar.gz: da4126b33c5a53e17233ee3edf5977f0b676ec97
 SHA512:
-  metadata.gz: 73f15e2bb7259f5f1e08ba426f7dca7305d0ae2e71efc50173029a83efdc51ff2cc68ef1942a850ea8eafb56eb81f43f68756a57096fb222a39928ab6a994541
-  data.tar.gz: 8aaec703cd4a179de8e9acc3115e3d96c73a25c38a1f60396049db05a11a763fe8033f50da926f4ab08f0e25e44054e82a9e8add022f51e524f381c9c1a1477c
+  metadata.gz: ed09f33b6a3cff1381aa1e443ee3745e5d2ceb50746eb684bb3963128c283f3de519ed4850b992739f39ea7e4e5252f9a152c0362df7d61891a1d4be4c747e04
+  data.tar.gz: 2df102f545c23263b6549115915df802023d9bc1c9c75992edda90d9b61e312b94180434e2f7599a38e9bf883046359f9535e812b9b47eb88edefb9c28929940

data/bin/Changes

@@ -7,6 +7,24 @@ RSS feed: http://owl.phy.queensu.ca/~phil/exiftool/rss.xml
 Note: The most recent production release is Version 11.50. (Other versions are
 considered development releases, and are not uploaded to CPAN.)
 
+[I will be on vacation and without access to my computer
+from Sept. 3-24, so don't expect any updates or email/forum responses from
+me during this time - PH]
+
+Aug. 28, 2019 - Version 11.64
+
+  - Added a new Canon LensType (thanks LibRaw)
+  - Added a new Nikon LensID (thanks Bruno)
+  - Added config file for converting streaming GPS from BlueSkySea dashcam
+  - Decode FocusDistance for Nikon Z6/Z7
+  - Documented groups in families 5 and 6 (available but undocumented since
+    Exiftool version 8.22 and 11.50 respectively)
+  - Fixed some ordering problems when writing/copying nested XMP lang-alt lists
+  - Fixed some minor quirks with QuickTime language codes (thanks Hayo Baan)
+  - Fixed a CanonModelID value (thanks Dmitry)
+  - API Changes:
+      - Documented SavePath and SaveFormat options
+
 Aug. 20, 2019 - Version 11.63 - "PNG Early Text"
 
   - Added a few new Sigma lenses (thanks LibRaw)

data/bin/MANIFEST

@@ -17,6 +17,7 @@ arg_files/xmp2iptc.args
 arg_files/xmp2pdf.args
 config_files/age.config
 config_files/bibble.config
+config_files/blueskysea.config
 config_files/convert_regions.config
 config_files/dji.config
 config_files/example.config
@@ -885,6 +886,9 @@ t/XMP_47.out
 t/XMP_48.out
 t/XMP_49.out
 t/XMP_5.out
+t/XMP_50.out
+t/XMP_52.out
+t/XMP_53.out
 t/XMP_6.out
 t/XMP_7.out
 t/XMP_8.out
@@ -1061,6 +1065,7 @@ t/images/XMP5.xmp
 t/images/XMP6.xmp
 t/images/XMP7.xmp
 t/images/XMP8.xmp
+t/images/XMP9.xmp
 t/images/ZIP.gz
 t/images/ZIP.zip
 t/images/iWork.numbers

data/bin/META.json

@@ -47,6 +47,6 @@
       }
    },
    "release_status" : "stable",
-   "version" : "11.63",
+   "version" : "11.64",
    "x_serialization_backend" : "JSON::PP version 4.02"
 }

data/bin/META.yml

@@ -28,5 +28,5 @@ recommends:
   Time::HiRes: '0'
 requires:
   perl: '5.004'
-version: '11.63'
+version: '11.64'
 x_serialization_backend: 'CPAN::Meta::YAML version 0.018'

data/bin/README

@@ -104,8 +104,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-11.63.tar.gz | tar -xf -
-  cd Image-ExifTool-11.63
+  gzip -dc Image-ExifTool-11.64.tar.gz | tar -xf -
+  cd Image-ExifTool-11.64
   ./exiftool t/images/ExifTool.jpg
 
 Note:  These commands extract meta information from one of the test images. 
@@ -190,6 +190,7 @@ distribution package:
   config_files/             - Sample ExifTool configuration files:
     age.config                - Calculate Age of person in photo
     bibble.config             - Definitions for writing Bibble XMP tags
+    blueskysea.config         - Convert GPS from BlueSkySea dashcam
     convert_regions.config    - Convert between MWG and MP face regions
     dji.config                - Composite tags for metadata in DJI videos
     example.config            - General example showing config features

data/bin/config_files/blueskysea.config

@@ -0,0 +1,101 @@
+#------------------------------------------------------------------------------
+# File:         blueskysea.config
+#
+# Description:  This config file defines Composite tags to convert embedded
+#               metadata in videos from BlueSkySea traffic cameras
+#
+# Usage:        exiftool -config blueskysea.config -ee FILE
+#
+#               Example command to create .gpx log file from BlueSkySea video
+#               (requires gpx.fmt available in the full Exiftool distribution):
+#
+#               exiftool -config blueskysea.config -p gpx.fmt -ee FILE
+#
+# Requires:     ExifTool version 10.75 or later
+#
+# Revisions:    2019/08/23 - P. Harvey Created
+#------------------------------------------------------------------------------
+
+%Image::ExifTool::UserDefined = (
+    'Image::ExifTool::Composite' => {
+        GROUPS => { 2 => 'Location' },
+#
+# Note: SubDoc flag is set for all these tags so they will be generated for
+#       all embedded documents
+#
+        GPSDateTime => {
+            Description => 'GPS Date/Time',
+            Groups => { 2 => 'Time' },
+            SubDoc => 1,
+            Require => 'Text',
+            RawConv => q{
+                $val = pack('C*', map { $_ ^ 0xaa } unpack('C*', substr($val[0], 8, 14)));
+                return undef unless $val =~ /^(\d{4})(\d{2})(\d{2})(\d{2})(\d{2})(\d{2})$/;
+                return "$1:$2:$3 $4:$5:$6";
+            },
+            PrintConv => '$self->ConvertDateTime($val)',
+        },
+        GPSLatitude => {
+            SubDoc => 1,
+            Require => 'Text',
+            RawConv => q{
+                $val = pack('C*', map { $_ ^ 0xaa } unpack('C*', substr($val[0], 38, 9)));
+                return undef unless $val =~ /^([NS])(\d{2})(\d+$)$/;
+                return ($2 + $3 / 600000) * ($1 eq 'S' ? -1 : 1);
+            },
+            PrintConv => 'Image::ExifTool::GPS::ToDMS($self, $val, 1, "N")',
+        },
+        GPSLongitude => {
+            SubDoc => 1,
+            Require => 'Text',
+            RawConv => q{
+                $val = pack('C*', map { $_ ^ 0xaa } unpack('C*', substr($val[0], 47, 10)));
+                return undef unless $val =~ /^([EW])(\d{3})(\d+$)$/;
+                return ($2 + $3 / 600000) * ($1 eq 'W' ? -1 : 1);
+            },
+            PrintConv => 'Image::ExifTool::GPS::ToDMS($self, $val, 1, "E")',
+        },
+        GPSSpeed => {
+            SubDoc => 1,
+            Require => 'Text',
+            RawConv => q{
+                $val = pack('C*', map { $_ ^ 0xaa } unpack('C*', substr($val[0], 62, 3)));
+                return undef unless $val =~ /^\d+$/;
+                return $val + 0;
+            },
+        },
+        Accelerometer => {
+            SubDoc => 1,
+            Require => 'Text',
+            Notes => q{
+                the first X,Y,Z accelerometer readings from the AccelerometerData, stored in
+                text format
+            },
+            RawConv => q{
+                $val = pack('C*', map { $_ ^ 0xaa } unpack('C*', substr($val[0], 0xad, 12)));
+                return undef unless $val =~ /^([-+]\d{3})([-+]\d{3})([-+]\d{3})$/;
+                return "$1 $2 $3";
+            },
+        },
+        AccelerometerData => {
+            SubDoc => 1,
+            Require => 'Text',
+            Notes => q{
+                24 values in 6 groups of 4 values each.  For each group, the first value is
+                zero and the next 3 are the X,Y,Z components of acceleration.  The first 5
+                groups are likely samples taken at 5 Hz.  The last group often has zero
+                entries, and its meaning is unknown
+            },
+            RawConv => q{
+                $val = pack('C*', map { $_ ^ 0xaa } unpack('C*', substr($val[0], 0xba, 96)));
+                my $order = GetByteOrder();
+                SetByteOrder('II');
+                $val = ReadValue(\$val, 0, 'float');
+                SetByteOrder($order);
+                return $val;
+            },
+        }            
+    },
+);
+
+1;  #end

data/bin/exiftool

@@ -10,7 +10,7 @@
 use strict;
 require 5.004;
 
-my $version = '11.63';
+my $version = '11.64';
 
 # add our 'lib' directory to the include list BEFORE 'use Image::ExifTool'
 my $exeDir;
@@ -4961,14 +4961,17 @@ B<-csv>=I<CSVFILE> feature.
 
 Organize output by tag group.  I<NUM> specifies a group family number, and
 may be 0 (general location), 1 (specific location), 2 (category), 3
-(document number) or 4 (instance number).  B<-g0> is assumed if a family
-number is not specified, and family numbers may be added wherever B<-g> is
-mentioned in the documentation.  Multiple families may be specified by
-separating them with colons.  By default the resulting group name is
-simplified by removing any leading C<Main:> and collapsing adjacent
-identical group names, but this can be avoided by placing a colon before the
-first family number (eg. B<-g:3:1>).  Use the B<-listg> option to list group
-names for a specified family.
+(document number), 4 (instance number), 5 (metadata path) or 6 (EXIF/TIFF
+format).  B<-g0> is assumed if a family number is not specified, and family
+numbers may be added wherever B<-g> is mentioned in the documentation. 
+Multiple families may be specified by separating them with colons.  By
+default the resulting group name is simplified by removing any leading
+C<Main:> and collapsing adjacent identical group names, but this can be
+avoided by placing a colon before the first family number (eg. B<-g:3:1>). 
+Use the B<-listg> option to list group names for a specified family.  The
+SavePath and SaveFormat API options are automatically enabled if the
+respective family 5 or 6 group names are requested.  See the
+L<API GetGroup documentation|Image::ExifTool/GetGroup> for more information.
 
 =item B<-G>[I<NUM>][:I<NUM>...] (B<-groupNames>)
 
@@ -5168,7 +5171,7 @@ with this command:
 
 produces output like this:
 
-    -- Generated by ExifTool 11.63 --
+    -- Generated by ExifTool 11.64 --
     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

data/bin/lib/Image/ExifTool.pm

@@ -27,7 +27,7 @@ use vars qw($VERSION $RELEASE @ISA @EXPORT_OK %EXPORT_TAGS $AUTOLOAD @fileTypes
             %mimeType $swapBytes $swapWords $currentByteOrder %unpackStd
             %jpegMarker %specialTags %fileTypeLookup);
 
-$VERSION = '11.63';
+$VERSION = '11.64';
 $RELEASE = '';
 @ISA = qw(Exporter);
 %EXPORT_TAGS = (
@@ -1636,7 +1636,7 @@ my %systemTagsNotes = (
             causes GPS information to be written into the EXIF or XMP of the target
             files.  The local system timezone is assumed if the date/time value does not
             contain a timezone.  May be deleted to delete associated GPS tags.  A group
-            name of 'EXIF' or 'XMP' may be specified to write or delete only EXIF or XMP
+            name of "EXIF" or "XMP" may be specified to write or delete only EXIF or XMP
             GPS tags
         },
         DelCheck => q{
@@ -1674,12 +1674,12 @@ my %systemTagsNotes = (
         Writable => 1,
         WriteOnly => 1,
         Notes => q{
-            write-only tag used to force EXIF, IPTC, XMP or PNG metadata in a file to be
-            rewritten.  May be set to "EXIF", "IPTC", "XMP" or "PNG" to force the
-            corresponding metadata type to be rewritten, "FixBase" to cause EXIF to be
-            rewritten only if the MakerNotes offset base was fixed, or "All" to rewrite
-            all of these metadata types.  Values are case insensitive, and multiple
-            values may be separated with commas, eg. C<-ForceWrite=exif,xmp>
+            write-only tag used to force metadata in a file to be rewritten even if no
+            tag values are changed.  May be set to "EXIF", "IPTC", "XMP" or "PNG" to
+            force the corresponding metadata type to be rewritten, "FixBase" to cause
+            EXIF to be rewritten only if the MakerNotes offset base was fixed, or "All"
+            to rewrite all of these metadata types.  Values are case insensitive, and
+            multiple values may be separated with commas, eg. C<-ForceWrite=exif,xmp>
         },
     },
     EmbeddedVideo => { Groups => { 2 => 'Video' } },
@@ -2194,8 +2194,8 @@ sub ClearOptions($)
         QuickTimeUTC=> undef,   # assume that QuickTime date/time tags are stored as UTC
         RequestAll  => undef,   # extract all tags that must be specifically requested
         RequestTags => undef,   # extra tags to request (on top of those in the tag list)
-        SaveFormat  => undef,   # (undocumented) save family 6 tag TIFF format
-        SavePath    => undef,   # (undocumented) save family 5 location path
+        SaveFormat  => undef,   # save family 6 tag TIFF format
+        SavePath    => undef,   # save family 5 location path
         ScanForXMP  => undef,   # flag to scan for XMP information in all files
         Sort        => 'Input', # order to sort found tags (Input, File, Tag, Descr, Group#)
         Sort2       => 'File',  # secondary sort order for tags in a group (File, Tag, Descr)

data/bin/lib/Image/ExifTool.pod

@@ -853,6 +853,19 @@ current RequestTags list.  Groups are requested by adding a colon after the
 name (eg. "MacOS:").  Names are converted to lower case as they are added to
 the list.  Default is undef.
 
+=item SaveFormat
+
+Flag to save EXIF/TIFF format type as the family 6 group name when
+extracting information.  Without this option set, the family 6 group names
+are not generated.  Default is undef.  See the L</GetGroup> option for more
+details.
+
+=item SavePath
+
+Flag to save the metadata path as the family 5 group name when extracting
+information.  Without this option set, the family 5 group names are not
+generated.  Default is undef.  See the L</GetGroup> option for more details.
+
 =item ScanForXMP
 
 Flag to scan all files (even unrecognized formats) for XMP information
@@ -1044,8 +1057,8 @@ CharsetPhotoshop, CharsetQuickTime, CharsetRIFF, Composite, ExtendedXMP,
 ExtractEmbedded, FastScan, FixBase, HtmlDump, HtmlDumpBase,
 IgnoreMinorErrors, Lang, LargeFileSupport, MakerNotes, MDItemTags,
 NoPDFList, Password, QuickTimeUTC (enforced 1904 time zero), RequestAll,
-RequestTags, ScanForXMP, Struct, TextOut, Unknown, Verbose, XAttrTags and
-XMPAutoConv.
+RequestTags, SaveFormat, SavePath, ScanForXMP, Struct, TextOut, Unknown,
+Verbose, XAttrTags and XMPAutoConv.
 
 =item Return Value:
 
@@ -1451,9 +1464,9 @@ hash reference or a serialized string (see the last two examples above).
 =item AddValue
 
 Specifies that the value be added to an existing list in a file rather than
-overwriting.  Valid settings are 0 (overwrite any existing tag value), 1
-(add to an existing list and warn for non-list tags) or 2 (add to existing
-list and overwrite non-list tags).  Default is 0.
+overwriting the existing values.  Valid settings are 0 (overwrite any
+existing tag value), 1 (add to an existing list and warn for non-list tags)
+or 2 (add to existing list and overwrite non-list tags).  Default is 0.
 
 =item DelValue
 
@@ -1516,7 +1529,7 @@ set in previous calls to L</SetNewValue>).  This option is most commonly
 used to replace previously-set new values for list-type tags.  Valid values
 are 0 (set new value normally -- adds to new values for list-type tags), 1
 (reset any previous new values before setting new value) or 2 (reset
-previous new values only; new value argument is ignored).
+previous new values only; new value argument is ignored).  Default is 0.
 
 =item Shift
 
@@ -1999,6 +2012,8 @@ The group family numbers are currently available:
     2) Category                 (eg. Author, Time)
     3) Document Number          (eg. Main, Doc1, Doc3-2)
     4) Instance Number          (eg. Copy1, Copy2, Copy3...)
+    5) Metadata Path            (eg. JPEG-APP1-IFD0-ExifIFD)
+    6) EXIF/TIFF Format         (eg. int8u, int32u, undef, string)
 
 Families 0 and 1 are based on the file structure, and are similar except
 that family 1 is more specific and sub-divides some groups to give more
@@ -2034,6 +2049,14 @@ specified) has no family 4 group name, but additional instances have have
 family 4 group names of 'Copy1', 'Copy2', 'Copy3', etc.  For convenience,
 the primary tag may also be accessed using a group name of 'Copy0'.
 
+Family 5 is experimental, and gives the complete path for the metadata in
+the file.  Generated only if the L</SavePath> option is used when
+extracting.
+
+Family 6 is currently used only for EXIF/TIFF metadata, and gives the format
+type of the extracted value.  Generated only if the L</SaveFormat> option is
+used when extracting.
+
 See L</GetAllGroups [static]> for complete lists of group names.
 
 =back
@@ -2267,6 +2290,15 @@ Doc#, Main
 
 Copy#
 
+=item Family 5 (Metadata Path):
+
+eg. JPEG-APP1-IFD0-ExifIFD
+
+=item Family 6 (EXIF/TIFF Format):
+
+int8u, string, int16u, int32u, rational64u, int8s, undef, int16s, int32s,
+rational64s, float, double, ifd, unicode, complex, int64u, int64s, ifd64
+
 =back
 
 =head2 GetDeleteGroups [static]

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

@@ -88,7 +88,7 @@ sub ProcessCTMD($$$);
 sub ProcessExifInfo($$$);
 sub SwapWords($);
 
-$VERSION = '4.22';
+$VERSION = '4.23';
 
 # Note: Removed 'USM' from 'L' lenses since it is redundant - PH
 # (or is it?  Ref 32 shows 5 non-USM L-type lenses)
@@ -562,6 +562,7 @@ $VERSION = '4.22';
     61182.2 => 'Canon RF 24-105mm F4 L IS USM', #IB
     61182.3 => 'Canon RF 28-70mm F2 L USM', #IB
     61182.4 => 'Canon RF 85mm F1.2L USM', #IB
+    61182.5 => 'Canon RF 24-240mm F4-6.3 IS USM', #IB
     65535 => 'n/a',
 );
 
@@ -794,7 +795,7 @@ $VERSION = '4.22';
     0x4020000 => 'PowerShot SX420 IS',
     0x4030000 => 'PowerShot ELPH 190 IS / IXUS 180 / IXY 190',
     0x4040000 => 'PowerShot G1',
-    0x4040001 => 'IXY 180', # ?? (from Canon sample)
+    0x4040001 => 'PowerShot ELPH 180 IS / IXUS 175 / IXY 180', #forum10402
     0x4050000 => 'PowerShot SX720 HS',
     0x4060000 => 'PowerShot SX620 HS',
     0x4070000 => 'EOS M6',

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

@@ -19,7 +19,7 @@ use strict;
 use vars qw($VERSION %ttLang);
 use Image::ExifTool qw(:DataAccess :Utils);
 
-$VERSION = '1.08';
+$VERSION = '1.09';
 
 sub ProcessOTF($$);
 
@@ -88,20 +88,20 @@ my %ttCharset = (
     1 => 'fr',     25 => 'pl',    49 => 'az',    73 => 'kn',    130 => 'ca',
     2 => 'de',     26 => 'hu',    50 => 'az',    74 => 'ta',    131 => 'la',
     3 => 'it',     27 => 'et',    51 => 'hy',    75 => 'te',    132 => 'qu',
-    4 => 'nl',     28 => 'lv',    52 => 'ka',    76 => 'si',    133 => 'gn',
+    4 => 'nl-NL',  28 => 'lv',    52 => 'ka',    76 => 'si',    133 => 'gn',
     5 => 'sv',     29 => 'smi',   53 => 'ro',    77 => 'my',    134 => 'ay',
     6 => 'es',     30 => 'fo',    54 => 'ky',    78 => 'km',    135 => 'tt',
     7 => 'da',     31 => 'fa',    55 => 'tg',    79 => 'lo',    136 => 'ug',
     8 => 'pt',     32 => 'ru',    56 => 'tk',    80 => 'vi',    137 => 'dz',
     9 => 'no',     33 => 'zh-CN', 57 => 'mn-MN', 81 => 'id',    138 => 'jv',
-    10 => 'he',    34 => 'nl',    58 => 'mn-CN', 82 => 'tl',    139 => 'su',
+    10 => 'he',    34 => 'nl-BE', 58 => 'mn-CN', 82 => 'tl',    139 => 'su',
     11 => 'ja',    35 => 'ga',    59 => 'ps',    83 => 'ms-MY', 140 => 'gl',
     12 => 'ar',    36 => 'sq',    60 => 'ku',    84 => 'ms-BN', 141 => 'af',
     13 => 'fi',    37 => 'ro',    61 => 'ks',    85 => 'am',    142 => 'br',
-    14 => 'iu',    38 => 'cs',    62 => 'sd',    86 => 'ti',    144 => 'gd',
-    15 => 'is',    39 => 'sk',    63 => 'bo',    87 => 'om',    145 => 'vg',
+    14 => 'el',    38 => 'cs',    62 => 'sd',    86 => 'ti',    144 => 'gd',
+    15 => 'is',    39 => 'sk',    63 => 'bo',    87 => 'om',    145 => 'gv',
     16 => 'mt',    40 => 'sl',    64 => 'ne',    88 => 'so',    146 => 'ga',
-    17 => 'tr',    41 => 'yi',    65 => 'sa',    89 => 'sw',    147 => 'rar',
+    17 => 'tr',    41 => 'yi',    65 => 'sa',    89 => 'sw',    147 => 'to',
     18 => 'hr',    42 => 'sr',    66 => 'mr',    90 => 'rw',    148 => 'el',
     19 => 'zh-TW', 43 => 'mk',    67 => 'bn',    91 => 'rn',    149 => 'kl',
     20 => 'ur',    44 => 'bg',    68 => 'as',    92 => 'ny',    150 => 'az',

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

@@ -60,7 +60,7 @@ use Image::ExifTool qw(:DataAccess :Utils);
 use Image::ExifTool::Exif;
 use Image::ExifTool::GPS;
 
-$VERSION = '3.69';
+$VERSION = '3.70';
 
 sub LensIDConv($$$);
 sub ProcessNikonAVI($$$);
@@ -379,6 +379,7 @@ sub GetAFPointGrid($$;$);
     '99 48 76 76 24 24 4B 0E' => 'Sigma APO Macro 150mm F2.8 EX DG OS HSM', #(Christian Hesse)
     '48 4C 7C 7C 2C 2C 4B 02' => 'Sigma APO Macro 180mm F3.5 EX DG HSM',
     '48 4C 7D 7D 2C 2C 4B 02' => 'Sigma APO Macro 180mm F3.5 EX DG HSM',
+    'F4 4C 7C 7C 2C 2C 4B 02' => 'Sigma APO Macro 180mm F3.5 EX DG HSM', #Bruno
     '94 48 7C 7C 24 24 4B 0E' => 'Sigma APO Macro 180mm F2.8 EX DG OS HSM', #MichaelTapes (HSM from ref 8)
     '48 54 8E 8E 24 24 4B 02' => 'Sigma APO 300mm F2.8 EX DG HSM',
     'FB 54 8E 8E 24 24 4B 02' => 'Sigma APO 300mm F2.8 EX DG HSM', #26
@@ -4470,6 +4471,7 @@ my %nikonFocalConversions = (
     0x30 => {
         Name => 'LensID',
         Condition => '$$self{NewLensData}',
+        Notes => 'tags from here onward used for Nikkor Z lenses only',
         Format => 'int16u',
         PrintConv => {
              1 => 'Nikkor Z 24-70mm f/4 S',
@@ -4477,6 +4479,9 @@ my %nikonFocalConversions = (
              4 => 'Nikkor Z 35mm f/1.8 S',
              9 => 'Nikkor Z 50mm f/1.8 S',
             13 => 'Nikkor Z 24-70mm f/2.8 S',
+            # missing from this list:
+            # Nikkor Z 85mm f/1.8 S
+            # Nikkor Z 58mm f/0.95 S Noct (coming soon)
         },
     },
     0x36 => {
@@ -4507,6 +4512,15 @@ my %nikonFocalConversions = (
         PrintConv => '"$val mm"',
         PrintConvInv => '$val=~s/\s*mm$//;$val',
     },
+    0x4f => {
+        Name => 'FocusDistance',
+        Condition => '$$self{NewLensData}',
+        # (perhaps int16u Format? -- although upper byte would always be zero)
+        ValueConv => '0.01 * 10**($val/40)', # in m
+        ValueConvInv => '$val>0 ? 40*log($val*100)/log(10) : 0',
+        PrintConv => '$val ? sprintf("%.2f m",$val) : "inf"',
+        PrintConvInv => '$val eq "inf" ? 0 : $val =~ s/\s*m$//, $val',
+    },
 );
 
 # Unknown Nikon lens data (note: data may need decrypting after byte 4)

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

@@ -114,10 +114,10 @@ my %noLeapFrog = ( SAVE => 1, SEEK => 1, IHDR => 1, JHDR => 1, IEND => 1, MEND =
         Also according to the PNG specification, there is no restriction on the
         location of text-type chunks (tEXt, zTXt and iTXt).  However, certain
         utilities (including some Apple and Adobe utilities) won't read the XMP iTXt
-        chunk (and at least one utility won't read other text chunks) that come
-        after the IDAT chunk.  For this reason, ExifTool 11.63 and later write all
-        text chunks (including XMP) before IDAT, and will move existing text chunks
-        up from after IDAT.
+        chunk if it comes after the IDAT chunk, and at least one utility won't read
+        other text chunks like this.  For this reason, ExifTool 11.63 and later
+        create new text chunks (including XMP) before IDAT, and will move existing
+        text chunks up from after IDAT.
     },
     bKGD => {
         Name => 'BackgroundColor',
@@ -376,14 +376,17 @@ my %noLeapFrog = ( SAVE => 1, SEEK => 1, IHDR => 1, JHDR => 1, IEND => 1, MEND =
     0 => {
         Name => 'PixelsPerUnitX',
         Format => 'int32u',
+        Notes => 'default 2834',
     },
     4 => {
         Name => 'PixelsPerUnitY',
         Format => 'int32u',
+        Notes => 'default 2834',
     },
     8 => {
         Name => 'PixelUnits',
         PrintConv => { 0 => 'Unknown', 1 => 'meters' },
+        Notes => 'default meters',
     },
 );
 

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

@@ -44,7 +44,7 @@ use Image::ExifTool qw(:DataAccess :Utils);
 use Image::ExifTool::Exif;
 use Image::ExifTool::GPS;
 
-$VERSION = '2.36';
+$VERSION = '2.37';
 
 sub ProcessMOV($$;$);
 sub ProcessKeys($$$);
@@ -6021,7 +6021,7 @@ my %eeBox = (
         Format => 'int16u',
         RawConv => '$val ? $val : undef',
         # allow both Macintosh (for MOV files) and ISO (for MP4 files) language codes
-        ValueConv => '$val < 0x400 ? $val : pack "C*", map { (($val>>$_)&0x1f)+0x60 } 10, 5, 0',
+        ValueConv => '($val < 0x400 or $val == 0x7fff) ? $val : pack "C*", map { (($val>>$_)&0x1f)+0x60 } 10, 5, 0',
         PrintConv => q{
             return $val unless $val =~ /^\d+$/;
             require Image::ExifTool::Font;
@@ -8658,13 +8658,19 @@ ItemID:         foreach $id (keys %$items) {
                         next if not $len and $pos;
                         my $str = substr($val, $pos, $len);
                         my $langInfo;
-                        if ($lang < 0x400 and $str !~ /^\xfe\xff/) {
+                        if (($lang < 0x400 or $lang == 0x7fff) and $str !~ /^\xfe\xff/) {
                             # this is a Macintosh language code
                             # a language code of 0 is Macintosh english, so treat as default
                             if ($lang) {
-                                # use Font.pm to look up language string
-                                require Image::ExifTool::Font;
-                                $lang = $Image::ExifTool::Font::ttLang{Macintosh}{$lang};
+                                if ($lang == 0x7fff) {
+                                    # technically, ISO 639-2 doesn't have a 2-character
+                                    # equivalent for 'und', but use 'un' anyway
+                                    $lang = 'un';
+                                } else {
+                                    # use Font.pm to look up language string
+                                    require Image::ExifTool::Font;
+                                    $lang = $Image::ExifTool::Font::ttLang{Macintosh}{$lang};
+                                }
                             }
                             # the spec says only "Macintosh text encoding", but
                             # allow this to be configured by the user

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

@@ -2588,7 +2588,7 @@ my %tagLookup = (
 	'focusareaselection' => { 273 => '15.2' },
 	'focuscontinuous' => { 34 => 0x20 },
 	'focusdisplayaiservoandmf' => { 79 => 0x515 },
-	'focusdistance' => { 155 => 'FocusDistance', 172 => 0x13, 178 => 0x49bb, 208 => 0x9, 209 => 0xa, 213 => 0xb, 282 => 0x305, 296 => 0x0, 300 => 0x304, 301 => 0x304 },
+	'focusdistance' => { 155 => 'FocusDistance', 172 => 0x13, 178 => 0x49bb, 208 => 0x9, 209 => 0xa, 213 => [0xb,0x4f], 282 => 0x305, 296 => 0x0, 300 => 0x304, 301 => 0x304 },
 	'focusdistancelower' => { 7 => 0x45, 9 => 0x8e, 11 => 0x45, 13 => 0x56, 14 => 0x45, 15 => 0x45, 16 => 0x52, 17 => 0x52, 18 => 0x56, 20 => 0x52, 21 => 0x8e, 22 => 0x59, 23 => 0x57, 24 => 0x8e, 25 => 0x94, 26 => 0x95, 27 => 0xa7, 28 => 0x56, 29 => 0xa7, 55 => 0x15, 73 => 0x14 },
 	'focusdistanceupper' => { 7 => 0x43, 9 => 0x8c, 11 => 0x43, 13 => 0x54, 14 => 0x43, 15 => 0x43, 16 => 0x50, 17 => 0x50, 18 => 0x54, 20 => 0x50, 21 => 0x8c, 22 => 0x57, 23 => 0x55, 24 => 0x8c, 25 => 0x92, 26 => 0x93, 27 => 0xa5, 28 => 0x54, 29 => 0xa5, 55 => 0x14, 73 => 0x13 },
 	'focusholdbutton' => { 175 => 0x44 },

data/bin/lib/Image/ExifTool/TagNames.pod

@@ -12,7 +12,7 @@ meta information extracted from or written to a file.
 =head1 TAG TABLES
 
 The tables listed below give the names of all tags recognized by ExifTool.
-They contain a total of 22996 tags, with 15044 unique tag names.
+They contain a total of 22997 tags, with 15044 unique tag names.
 
 B<Tag ID>, B<Index#> or B<Sequence> is given in the first column of each
 table.  A B<Tag ID> is the computer-readable equivalent of a tag name, and
@@ -12070,6 +12070,7 @@ Tags found in the encrypted LensData from cameras such as the Z6 and Z7.
      54    MaxAperture                          int16u
      56    FNumber                              int16u
      60    FocalLength                          int16u
+     79    FocusDistance                        int8u
 
 =head3 Nikon LensDataUnknown Tags
 
@@ -22535,10 +22536,10 @@ this data as additional PNG chunks.
 Also according to the PNG specification, there is no restriction on the
 location of text-type chunks (tEXt, zTXt and iTXt).  However, certain
 utilities (including some Apple and Adobe utilities) won't read the XMP iTXt
-chunk (and at least one utility won't read other text chunks) that come
-after the IDAT chunk.  For this reason, ExifTool 11.63 and later write all
-text chunks (including XMP) before IDAT, and will move existing text chunks
-up from after IDAT.
+chunk if it comes after the IDAT chunk, and at least one utility won't read
+other text chunks like this.  For this reason, ExifTool 11.63 and later
+create new text chunks (including XMP) before IDAT, and will move existing
+text chunks up from after IDAT.
 
   Tag ID             Tag Name                   Writable
   ------             --------                   --------

data/bin/lib/Image/ExifTool/WriteXMP.pl

@@ -892,7 +892,7 @@ sub WriteXMP($$;$)
     # get hash of all information we want to change
     # (sorted by tag name so alternate languages come last, but with structures
     # first so flattened tags may be used to override individual structure elements)
-    my @tagInfoList;
+    my (@tagInfoList, $delLangPath, %delLangPaths, %delAllLang, $firstNewPath);
     my $writeGroup = $$dirInfo{WriteGroup};
     foreach $tagInfo (sort ByTagName $et->GetNewTagInfoList()) {
         next unless $et->GetGroup($tagInfo, 0) eq 'XMP';
@@ -1021,7 +1021,30 @@ sub WriteXMP($$;$)
         my $nvHash = $et->GetNewValueHash($tagInfo);
         my $overwrite = $et->IsOverwriting($nvHash);
         my $writable = $$tagInfo{Writable} || '';
-        my (%attrs, $deleted, $added, $existed);
+        my (%attrs, $deleted, $added, $existed, $newLang);
+        # set up variables to save/restore paths of deleted lang-alt tags
+        if ($writable eq 'lang-alt') {
+            $newLang = lc($$tagInfo{LangCode} || 'x-default');
+            if ($delLangPath and $delLangPath eq $path) {
+                # restore paths of deleted entries for this language
+                @delPaths = @{$delLangPaths{$newLang}} if $delLangPaths{$newLang};
+            } else {
+                undef %delLangPaths;
+                $delLangPath = $path;   # base path for deleted lang-alt tags
+                undef %delAllLang;
+                undef $firstNewPath;    # reset first path for new lang-alt tag
+            }
+            if (%delAllLang) {
+                # add missing paths to delete list for entries where all languages were deleted
+                my ($prefix, $reSort);
+                foreach $prefix (keys %delAllLang) {
+                    next if grep /^$prefix/, @delPaths;
+                    push @delPaths, "${prefix}10";
+                    $reSort = 1;
+                }
+                @delPaths = sort @delPaths if $reSort;
+            }
+        }
         # delete existing entry if necessary
         if ($isStruct) {
             # delete all structure (or pseudo-structure) elements
@@ -1034,7 +1057,7 @@ sub WriteXMP($$;$)
             # take attributes from old values if they exist
             %attrs = %{$$cap[1]};
             if ($overwrite) {
-                my ($oldLang, $delLang, $addLang, @matchingPaths, $langPathPat);
+                my ($oldLang, $delLang, $addLang, @matchingPaths, $langPathPat, %langsHere);
                 # check to see if this is an indexed list item
                 if ($path =~ / /) {
                     my $pp;
@@ -1047,19 +1070,20 @@ sub WriteXMP($$;$)
                 foreach $path (@matchingPaths) {
                     my ($val, $attrs) = @{$capture{$path}};
                     if ($writable eq 'lang-alt') {
+                        # get original language code (lc for comparisons)
+                        $oldLang = lc($$attrs{'xml:lang'} || 'x-default');
                         # revert to original overwrite flag if this is in a different structure
                         if (not $langPathPat or $path !~ /^$langPathPat$/) {
                             $overwrite = $oldOverwrite;
                             ($langPathPat = $path) =~ s/\d+$/\\d+/;
                         }
+                        # remember languages in this lang-alt list
+                        $langsHere{$langPathPat}{$oldLang} = 1;
                         unless (defined $addLang) {
                             # add to lang-alt list by default if creating this tag from scratch
                             $addLang = $$nvHash{IsCreating} ? 1 : 0;
                         }
-                        # get original language code (lc for comparisons)
-                        $oldLang = lc($$attrs{'xml:lang'} || 'x-default');
                         if ($overwrite < 0) {
-                            my $newLang = lc($$tagInfo{LangCode} || 'x-default');
                             next unless $oldLang eq $newLang;
                             # only add new tag if we are overwriting this one
                             # (note: this won't match if original XML contains CDATA!)
@@ -1100,7 +1124,23 @@ sub WriteXMP($$;$)
                     # save attributes and path from first deleted property
                     # so we can replace it exactly
                     %attrs = %$attrs unless @delPaths;
-                    push @delPaths, $path;
+                    if ($writable eq 'lang-alt') {
+                        $langsHere{$langPathPat}{$oldLang} = 0; # (lang was deleted)
+                    }
+                    # save deleted paths so we can replace the same elements
+                    # (separately for each language of a lang-alt list)
+                    if ($writable ne 'lang-alt' or $oldLang eq $newLang) {
+                        push @delPaths, $path;
+                    } else {
+                        $delLangPaths{$oldLang} or $delLangPaths{$oldLang} = [ ];
+                        push @{$delLangPaths{$oldLang}}, $path;
+                    }
+                    # keep track of paths where we deleted all languages of a lang-alt tag
+                    if ($delLang) {
+                        my $p;
+                        ($p = $path) =~ s/\d+$//;
+                        $delAllLang{$p} = 1;
+                    }
                     # delete this tag
                     delete $capture{$path};
                     ++$changed;
@@ -1114,11 +1154,25 @@ sub WriteXMP($$;$)
                 next unless @delPaths or $$tagInfo{List} or $addLang;
                 if (@delPaths) {
                     $path = shift @delPaths;
+                    # make sure new path is unique
+                    while ($capture{$path}) {
+                        last unless $path =~ s/ \d(\d+)$/' '.length($1+1).($1+1)/e;
+                    }
                     $deleted = 1;
                 } else {
                     # don't change tag if we couldn't delete old copy
                     # unless this is a list or an lang-alt tag
                     next unless $$tagInfo{List} or $oldLang;
+                    # avoid adding duplicate entry to lang-alt in a list
+                    if ($writable eq 'lang-alt' and %langsHere) {
+                        foreach (sort keys %langsHere) {
+                            next unless $path =~ /^$_$/;
+                            last unless $langsHere{$_}{$newLang};
+                            $path =~ /(.* )\d(\d+)(.*? \d+)$/ or $et->Error('Internal error writing lang-alt list'), last;
+                            my $nxt = $2 + 1;
+                            $path = $1 . length($nxt) . ($nxt) . $3; # step to next index
+                        }
+                    }
                     # (match last index to put in same lang-alt list for Bag of lang-alt items)
                     $path =~ m/.* (\d+)/g or warn "Internal error: no list index!\n", next;
                     $added = $1;
@@ -1126,7 +1180,15 @@ sub WriteXMP($$;$)
             } else {
                 # we are never overwriting, so we must be adding to a list
                 # match the last index unless this is a list of lang-alt lists
-                my $pat = $writable eq 'lang-alt' ? '.* (\d+)(.*? \d+)' : '.* (\d+)';
+                my $pat = '.* (\d+)';
+                if ($writable eq 'lang-alt') {
+                    if ($firstNewPath) {
+                        $path = $firstNewPath;
+                        $overwrite = 1; # necessary to put x-default entry first below
+                    } else {
+                        $pat = '.* (\d+)(.*? \d+)';
+                    }
+                }
                 if ($path =~ m/$pat/g) {
                     $added = $1;
                     # set position to end of matching index number
@@ -1143,7 +1205,7 @@ sub WriteXMP($$;$)
                     $$tagInfo{LangCode} eq 'x-default'))
                 {
                     my $saveCap = $capture{$path};
-                    for (;;) {
+                    while ($saveCap) {
                         my $p = $path;
                         substr($p, $pos, $len) = length($nxt) . $nxt;
                         # increment index in the path of the existing item
@@ -1155,10 +1217,9 @@ sub WriteXMP($$;$)
                     }
                 } else {
                     # add to end of list
-                    for (;;) {
+                    while ($capture{$path}) {
                         my $try = length($nxt) . $nxt;
                         substr($path, $pos, $len) = $try;
-                        last unless $capture{$path};
                         $len = length $try;
                         ++$nxt;
                     }
@@ -1181,8 +1242,10 @@ sub WriteXMP($$;$)
         my @newValues = $et->GetNewValue($nvHash) or next;
 
         # set language attribute for lang-alt lists
-        $attrs{'xml:lang'} = $$tagInfo{LangCode} || 'x-default' if $writable eq 'lang-alt';
-
+        if ($writable eq 'lang-alt') {
+            $attrs{'xml:lang'} = $$tagInfo{LangCode} || 'x-default';
+            $firstNewPath = $path if defined $added;  # save path of first lang-alt tag added
+        }
         # add new value(s) to %capture hash
         my $subIdx;
         for (;;) {
@@ -1234,6 +1297,10 @@ sub WriteXMP($$;$)
                 $subIdx = length($subIdx) . $subIdx;
             } elsif (@delPaths) {
                 $path = shift @delPaths;
+                # make sure new path is unique
+                while ($capture{$path}) {
+                    last unless $path =~ s/ \d(\d+)$/' '.length($1+1).($1+1)/e;
+                }
                 next;
             } else {
                 $subIdx = '10';

data/bin/lib/Image/ExifTool/Writer.pl

@@ -1273,6 +1273,8 @@ sub SetNewValuesFromFile($$;@)
         QuickTimeUTC    => $$options{QuickTimeUTC},
         RequestAll      => $$options{RequestAll} || 1, # (is this still necessary now that RequestTags are being set?)
         RequestTags     => $$options{RequestTags},
+        SaveFormat      => $$options{SaveFormat},
+        SavePath        => $$options{SavePath},
         ScanForXMP      => $$options{ScanForXMP},
         StrictDate      => defined $$options{StrictDate} ? $$options{StrictDate} : 1,
         Struct          => $structOpt,
@@ -1738,6 +1740,8 @@ sub SaveNewValues($)
 # Notes: Restores saved new values, but currently doesn't restore them in the
 # original order, so there may be some minor side-effects when restoring tags
 # with overlapping groups. eg) XMP:Identifier, XMP-dc:Identifier
+# Also, this doesn't do the right thing for list-type tags which accumulate
+# values across a save point
 sub RestoreNewValues($)
 {
     my $self = shift;
@@ -2621,6 +2625,8 @@ sub GetAllGroups($)
 
     $family == 3 and return('Doc#', 'Main');
     $family == 4 and return('Copy#');
+    $family == 5 and return('[too many possibilities to list]');
+    $family == 6 and return(@Image::ExifTool::Exif::formatName[1..$#Image::ExifTool::Exif::formatName]);
 
     LoadAllTables();    # first load all our tables
 

data/bin/perl-Image-ExifTool.spec

@@ -1,6 +1,6 @@
 Summary: perl module for image data extraction
 Name: perl-Image-ExifTool
-Version: 11.63
+Version: 11.64
 Release: 1
 License: Artistic/GPL
 Group: Development/Libraries/Perl

data/lib/exiftool_vendored/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ExiftoolVendored
-  VERSION = Gem::Version.new('11.63.0')
+  VERSION = Gem::Version.new('11.64.0')
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: exiftool_vendored
 version: !ruby/object:Gem::Version
-  version: 11.63.0
+  version: 11.64.0
 platform: ruby
 authors:
 - Matthew McEachen
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-08-20 00:00:00.000000000 Z
+date: 2019-08-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: exiftool
@@ -192,6 +192,7 @@ files:
 - bin/arg_files/xmp2pdf.args
 - bin/config_files/age.config
 - bin/config_files/bibble.config
+- bin/config_files/blueskysea.config
 - bin/config_files/convert_regions.config
 - bin/config_files/dji.config
 - bin/config_files/example.config