exiftool_vendored 11.89.0 → 11.90.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0d3946a9b1b7c50a6864746de47d3c8a0818df3c
-  data.tar.gz: 71ff7c97951c9a108372db26f1192cea9eca2002
+  metadata.gz: 5677eed13951b747ce733d83056cd3ae7955318d
+  data.tar.gz: '0387be38d3952cedb4a7c641370bc6b131ad79e4'
 SHA512:
-  metadata.gz: 13d128e73009d6d931223324a9f54d4692da494db474d2030c6b7b8fb00f96a180ef0cbec2e788ff9440d4b6c7e875a620600766b885aa9957fecd4d8b5dc2cf
-  data.tar.gz: f233de0cbbfc34b207ecb59e9ac8d7247e338ec93443ce8278c1096b549d894db3a5b2767d0055064f1d90233ef386fea79337a2206ec38122c58d172b0ace28
+  metadata.gz: 0d54ba249ad0f882b0d647160227a456d97ae11ee56a2f39770bc85dfd1b355b98b7f587fc5eaed17d7056dd4a220c761ce8942449d893acdb65a63c476db927
+  data.tar.gz: ae57fea277abb94cacd789c4b36c077bdb76e4bf3c30dd8bc72d445eab9a3e6651fabd0c1a758364a085cd1a533dfa724618db3adf58adc7f4ab635b77e00f80

data/bin/Changes

@@ -7,13 +7,26 @@ RSS feed: https://exiftool.org/rss.xml
 Note: The most recent production release is Version 11.85. (Other versions are
 considered development releases, and are not uploaded to CPAN.)
 
+Mar. 3, 2020 - Version 11.90
+
+  - Added a new Sony LensType (thanks LibRaw and Jos Roost)
+  - Aded two new Olypus LensType values
+  - Added a new Canon LensType
+  - Added some new Canon RecordMode values
+  - Added some new QuickTime GeneralProfileIDC values
+  - Added new values for a couple of FujiFilm tags
+  - Added a number of new QuickTime GenreID values
+  - Decode Nikon Z6/Z7 phase-detect AF points (thanks Andy Dragon)
+  - Patched to avoid possible "Undefined subroutine" error in MacOS 10.15
+  - Fixed incorrect offsets in -htmlDump output for some file types
+
 Feb. 25, 2020 - Version 11.89
 
   - Added support for Exif 2.32 for XMP
   - Recognize the HIF file extension
   - Improved verbose output for QuickTime iref items
-  - Patched to use same byte ordering as IFD0 by default when creating new GPS
-    metadata in Canon CR3 files
+  - Patched to create new GPS metadata in Canon CR3 images using a default byte
+    order that is the same as existing EXIF boxes
   - Patched to add missing newline that could occur in XMP with the API Compact
     Shorthand option
 
@@ -8944,7 +8957,7 @@ Apr. 6, 2004 - Version 3.37
 Apr. 6, 2004 - Version 3.36
 
   - Added support for Sanyo and Minolta maker notes
-  - Added skeleton for interpeting Sony maker notes
+  - Added skeleton for interpreting Sony maker notes
   - Interpret Pentax PrintIM
 
 Apr. 6, 2004 - Version 3.35

data/bin/META.json

@@ -47,6 +47,6 @@
       }
    },
    "release_status" : "stable",
-   "version" : "11.89",
+   "version" : "11.90",
    "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.89'
+version: '11.90'
 x_serialization_backend: 'CPAN::Meta::YAML version 0.018'

data/bin/README

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

data/bin/exiftool

@@ -10,7 +10,7 @@
 use strict;
 require 5.004;
 
-my $version = '11.89';
+my $version = '11.90';
 
 # add our 'lib' directory to the include list BEFORE 'use Image::ExifTool'
 my $exeDir;
@@ -4369,7 +4369,7 @@ interpreted as tag names (for this reason, multiple single-character options
 may NOT be combined into one argument).  Contrary to standard practice,
 options may appear after source file names on the exiftool command line.
 
-=head2 Option Summary
+=head2 Option Overview
 
 L<Tag operations|/Tag operations>
 
@@ -5173,10 +5173,11 @@ when writing.  For example, the following commands all have the same effect:
 Print output in the format specified by the given file or string.  The
 argument is interpreted as a string unless a file of that name exists, in
 which case the string is loaded from the contents of the file.  Tag names in
-the format file or string begin with a C<$> symbol and may contain a leading
-group names and/or a trailing C<#>.  Case is not significant.  Braces C<{}>
-may be used around the tag name to separate it from subsequent text.  Use
-C<$$> to represent a C<$> symbol, and C<$/> for a newline.
+the format file or string begin with a C<$> symbol and may contain leading
+group names and/or a trailing C<#> (to disable print conversion).  Case is
+not significant.  Braces C<{}> may be used around the tag name to separate
+it from subsequent text.  Use C<$$> to represent a C<$> symbol, and C<$/>
+for a newline.
 
 Multiple B<-p> options may be used, each contributing a line (or more) of
 text to the output.  Lines beginning with C<#[HEAD]> and C<#[TAIL]> are
@@ -5202,7 +5203,7 @@ with this command:
 
 produces output like this:
 
-    -- Generated by ExifTool 11.89 --
+    -- Generated by ExifTool 11.90 --
     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
@@ -5787,12 +5788,12 @@ option when also writing the FileName and/or Directory tags.
 
 Preserve the filesystem modification date/time (C<FileModifyDate>) of the
 original file when writing.  Note that some filesystems store a creation
-date (Windows C<FileCreateDate> or Mac C<MDItemFSCreationDate>)
-which is not affected by this option.  The creation date is preserved on
-Windows systems where Win32API::File and Win32::API are available regardless
-of this setting.  For other systems, the B<-overwrite_original_in_place>
-option may be used if necessary to preserve the creation date.  This option
-is superseded by any value written to the FileModifyDate tag.
+date (ie. C<FileCreateDate> on Windows and Mac systems) which is not
+affected by this option.  This creation date is preserved on Windows systems
+where Win32API::File and Win32::API are available regardless of this
+setting.  For other systems, the B<-overwrite_original_in_place> option may
+be used if necessary to preserve the creation date.  The B<-P> option is
+superseded by any value written to the FileModifyDate tag.
 
 =item B<-password> I<PASSWD>
 

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

@@ -88,7 +88,7 @@ sub ProcessCTMD($$$);
 sub ProcessExifInfo($$$);
 sub SwapWords($);
 
-$VERSION = '4.34';
+$VERSION = '4.35';
 
 # Note: Removed 'USM' from 'L' lenses since it is redundant - PH
 # (or is it?  Ref 32 shows 5 non-USM L-type lenses)
@@ -524,6 +524,7 @@ $VERSION = '4.34';
     749 => 'Tamron 100-400mm f/4.5-6.3 Di VC USD A035E + 2x', #IB
     750 => 'Canon EF 35mm f/1.4L II USM or Tamron Lens', #42
     750.1 => 'Tamron SP 85mm f/1.8 Di VC USD (F016)', #Exiv2#1072
+    750.2 => 'Tamron SP 45mm f/1.8 Di VC USD (F013)', #PH
     751 => 'Canon EF 16-35mm f/2.8L III USM', #42
     752 => 'Canon EF 24-105mm f/4L IS II USM', #42
     753 => 'Canon EF 85mm f/1.4L IS USM', #42
@@ -1796,6 +1797,7 @@ my %offOn = ( 0 => 'Off', 1 => 'On' );
         PrintConv => {
             1 => 'sRGB',
             2 => 'Adobe RGB',
+            65535 => 'n/a',
         },
     },
     0xb6 => {
@@ -2059,7 +2061,7 @@ my %offOn = ( 0 => 'Off', 1 => 'On' );
     4 => {
         Name => 'CanonFlashMode',
         PrintConv => {
-            -1 => "n/a", # (PH, EOS M MOV video)
+            -1 => 'n/a', # (PH, EOS M MOV video)
             0 => 'Off',
             1 => 'Auto',
             2 => 'On',
@@ -2120,6 +2122,8 @@ my %offOn = ( 0 => 'Off', 1 => 'On' );
             11 => 'CRM', #PH (C200 CRM)
             12 => 'CR3', #PH (EOS R)
             13 => 'CR3+JPEG', #PH (EOS R)
+            14 => 'HIF', #PH (NC)
+            15 => 'CR3+HIF', #PH (1DXmkIII)
         },
     },
     10 => {

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

@@ -1328,7 +1328,7 @@ my %convPFn = ( PrintConv => \&ConvertPfn, PrintConvInv => \&ConvertPfnInv );
     },
     0x0109 => {
         Name => 'UsableShootingModes',
-        Count => 2,
+        Count => 2, # (Count is 1 for 1DXmkIII -- need to decode this)
         PrintConv => [
             \%disableEnable,
             'sprintf("Flags 0x%x",$val)', # (M, Tv, Av, P, Bulb)
@@ -1340,7 +1340,7 @@ my %convPFn = ( PrintConv => \&ConvertPfn, PrintConvInv => \&ConvertPfnInv );
     },
     0x010a => {
         Name => 'UsableMeteringModes',
-        Count => 2,
+        Count => 2, # (Count is 1 for 1DXmkIII -- need to decode this)
         PrintConv => [
             \%disableEnable,
             'sprintf("Flags 0x%x",$val)', # (evaluative,partial,spot,center-weighted average)
@@ -2094,7 +2094,7 @@ my %convPFn = ( PrintConv => \&ConvertPfn, PrintConvInv => \&ConvertPfnInv );
     },
     0x0612 => { # (1DX)
         Name => 'RestrictDriveModes',
-        Count => 2,
+        Count => 2, # (Count is 1 for 1DXmkIII -- need to decode this)
         PrintConv => [
             \%disableEnable,
             'sprintf("Flags 0x%x",$val)', # (Single,Cont Hi,Cont Lo,Timer 10,Timer 2,Silent,Super Hi)

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

@@ -6152,7 +6152,8 @@ sub ProcessExif($$$)
                           "Format: $fstr\nSize: $size bytes\n";
                 if ($size > 4) {
                     my $offPt = Get32u($dataPt,$entry+8);
-                    my $actPt = $valuePtr + $valueDataPos + $base - ($$et{EXIF_POS} || 0);
+                    # (test this with ../pics/{CanonEOS-1DXMarkIII.hif,PanasonicDC-G9.rw2})
+                    my $actPt = $valuePtr + $valueDataPos + $base + $$et{BASE};
                     $tip .= sprintf("Value offset: 0x%.4x\n", $offPt);
                     # highlight tag name (red for bad size)
                     my $style = ($bad or not defined $tval) ? 'V' : 'H';
@@ -6180,7 +6181,7 @@ sub ProcessExif($$$)
                     } elsif ($tagInfo and Image::ExifTool::IsInt($tval)) {
                         if ($$tagInfo{IsOffset} or $$tagInfo{SubIFD}) {
                             $tval = sprintf('0x%.4x', $tval);
-                            my $actPt = $val + $base - ($$et{EXIF_POS} || 0);
+                            my $actPt = $val + $base + $$et{BASE};
                             if ($actPt != $val) {
                                 $tval .= sprintf("\nActual offset: 0x%.4x", $actPt);
                                 my $sign = $actPt < $val ? '-' : '';

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

@@ -117,7 +117,7 @@ my %ttCharset = (
   #  0x048c - no ISO equivalent
   #  0x081a/0x83c - sr-SP
   #  0x0c0a - modern?
-  #  0x2409 - Carribbean country code not found in ISO 3166-1
+  #  0x2409 - Caribbean country code not found in ISO 3166-1
   Windows => {
     0x0401 => 'ar-SA', 0x0438 => 'fo',    0x0481 => 'mi',    0x1409 => 'en-NZ',
     0x0402 => 'bg',    0x0439 => 'hi',    0x0482 => 'oc',    0x140a => 'es-CR',

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.77';
+$VERSION = '1.78';
 
 sub ProcessFujiDir($$$);
 sub ProcessFaceRec($$$);
@@ -145,6 +145,8 @@ my %faceCategories = (
         Writable => 'int16u',
         PrintConv => {
             0x0   => 'Auto',
+            0x1   => 'Auto (white priority)', #forum10890
+            0x2   => 'Auto (ambiance priority)', #forum10890
             0x100 => 'Daylight',
             0x200 => 'Cloudy',
             0x300 => 'Daylight Fluorescent',
@@ -620,6 +622,7 @@ my %faceCategories = (
             0x600 => 'Classic Chrome', #forum6109
             0x700 => 'Eterna', #12
             0x800 => 'Classic Negative', #forum10536
+            0x900 => 'Bleach Bypass', #forum10890
         },
     },
     0x1402 => { #2

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

@@ -228,7 +228,7 @@ sub ProcessXCF($$)
 
     # skip over precision for XCV version 4 or later
     $raf->Seek(4, 1) if $$et{XCFVersion} =~ /^v0*(\d+)/ and $1 >= 4;
-     
+
     # loop through image properties
     for (;;) {
         $raf->Read($buff, 8) == 8 or last;

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

@@ -48,6 +48,7 @@
 #              35) David Puschel private communication
 #              36) Hayo Baann (forum10207)
 #              37) Tom Lachecki, private communication
+#              38) https://github.com/exiftool/exiftool/pull/40 (and forum10893)
 #              IB) Iliah Borg private communication (LibRaw)
 #              JD) Jens Duttke private communication
 #              NJ) Niels Kristian Bech Jensen private communication
@@ -61,7 +62,7 @@ use Image::ExifTool qw(:DataAccess :Utils);
 use Image::ExifTool::Exif;
 use Image::ExifTool::GPS;
 
-$VERSION = '3.78';
+$VERSION = '3.79';
 
 sub LensIDConv($$$);
 sub ProcessNikonAVI($$$);
@@ -944,6 +945,43 @@ my %afPoints153 = (
     31 => 'B8',  62 => 'H13', 93 => 'C17', 124 => 'G4',
 );
 
+# AF point indices for models with 81 focus points, eg. Z6/Z7/Z50 (ref 38)
+# - 9 rows (A-I) with 9 columns (1-9), center is E5
+# NOTE: the AF points start 2 bytes into the data, so the map starts
+#       at 17 instead of 1
+#
+#        7   6   5   4   3   2   1   0
+# 00 : [H5][G5][F5][A5][B5][C5][D5][E5]
+# 01 : [G6][F6][A6][B6][C6][D6][E6][I5]
+# 02 : [F4][A4][B4][C4][D4][E4][I6][H6]
+# 03 : [A7][B7][C7][D7][E7][I4][H4][G4]
+# 04 : [B3][C3][D3][E3][I7][H7][G7][F7]
+# 05 : [C8][D8][E8][I3][H3][G3][F3][A3]
+# 06 : [D2][E2][I8][H8][G8][F8][A8][B8]
+# 07 : [E9][I2][H2][G2][F2][A2][B2][C2]
+# 08 : [I9][H9][G9][F9][A9][B9][C9][D9]
+# 09 : [H1][G1][F1][A1][B1][C1][D1][E1]
+# 0a : [  ][  ][  ][  ][  ][  ][  ][I1]
+my %afPoints81 = (
+     17 => 'E5',  34 => 'I6',  51 => 'H7',  68 => 'G8',  85 => 'F9',
+     18 => 'D5',  35 => 'E4',  52 => 'I7',  69 => 'H8',  86 => 'G9',
+     19 => 'C5',  36 => 'D4',  53 => 'E3',  70 => 'I8',  87 => 'H9',
+     20 => 'B5',  37 => 'C4',  54 => 'D3',  71 => 'E2',  88 => 'I9',
+     21 => 'A5',  38 => 'B4',  55 => 'C3',  72 => 'D2',  89 => 'E1',
+     22 => 'F5',  39 => 'A4',  56 => 'B3',  73 => 'C2',  90 => 'D1',
+     23 => 'G5',  40 => 'F4',  57 => 'A3',  74 => 'B2',  91 => 'C1',
+     24 => 'H5',  41 => 'G4',  58 => 'F3',  75 => 'A2',  92 => 'B1',
+     25 => 'I5',  42 => 'H4',  59 => 'G3',  76 => 'F2',  93 => 'A1',
+     26 => 'E6',  43 => 'I4',  60 => 'H3',  77 => 'G2',  94 => 'F1',
+     27 => 'D6',  44 => 'E7',  61 => 'I3',  78 => 'H2',  95 => 'G1',
+     28 => 'C6',  45 => 'D7',  62 => 'E8',  79 => 'I2',  96 => 'H1',
+     29 => 'B6',  46 => 'C7',  63 => 'D8',  80 => 'E9',  97 => 'I1',
+     30 => 'A6',  47 => 'B7',  64 => 'C8',  81 => 'D9',
+     31 => 'F6',  48 => 'A7',  65 => 'B8',  82 => 'C9',
+     32 => 'G6',  49 => 'F7',  66 => 'A8',  83 => 'B9',
+     33 => 'H6',  50 => 'G7',  67 => 'F8',  84 => 'A9',
+);
+
 my %cropHiSpeed = ( #IB
     0 => 'Off',
     1 => '1.3x Crop', # (1.3x Crop, Large)
@@ -3314,7 +3352,7 @@ my %binaryDataAttrs = (
             5 => 'On (5)', #PH (1S2[128/129], 1J4/1V3[129])
             6 => 'On (105-point)', #PH (1J4/1V3[128/130])
             7 => 'On (153-point)', #PH (D5/D500/D850)
-            8 => 'On (8)', #PH (Z7)
+            8 => 'On (81-point)', #38
         },
     },
     7 => [
@@ -3559,18 +3597,18 @@ my %binaryDataAttrs = (
             PrintConv => sub { PrintAFPoints(shift, \%afPoints153); },
             PrintConvInv => sub { PrintAFPointsInv(shift, \%afPoints153); },
         },
-        { #PH (Z7) (NC)
+        { #38 (Z6/Z7/Z50)
             Name => 'AFPointsUsed',
-            Condition => '$$self{PhaseDetectAF} == 8',
+            Condition => '$$self{PhaseDetectAF} == 8 and $$self{Model} =~ /^NIKON Z/',
             Notes => q{
-                models with 493-point AF -- 17 rows (A-Q) and 29 columns (1-29). Center
-                point is I15
+                models with 81-selectable point AF -- 9 rows (A-I) and 9 columns (1-9) for
+                phase detect AF points. Center point is E5
             },
-            Format => 'undef[62]',
-            ValueConv => 'join(" ", unpack("H2"x62, $val))',
+            Format => 'undef[13]',
+            ValueConv => 'join(" ", unpack("H2"x13, $val))',
             ValueConvInv => '$val=~tr/ //d; pack("H*",$val)',
-            PrintConv => sub { PrintAFPointsGrid(shift, 29); },
-            PrintConvInv => sub { PrintAFPointsGridInv(shift, 29, 62); },
+            PrintConv => sub { PrintAFPoints(shift, \%afPoints81); },
+            PrintConvInv => sub { PrintAFPointsInv(shift, \%afPoints81); },
         },
         { #PH
             Name => 'AFPointsUsed',
@@ -4659,7 +4697,7 @@ my %nikonFocalConversions = (
         Priority => 0,
     },
     # note: DecryptLen currently set to 0x251
-    
+
     # 0x55c - int16u[2400] TiffMeteringImage2: 60x40 image (ShotInfoVersion 0800, ref JR)
     # 0x181c - int16u[1200] TiffMeteringImage?: 60x20 image for some NEF's (ShotInfoVersion 0800, ref JR)
     # 0x217c - int16u[2400] TiffMeteringImage3: 60x40 image (ShotInfoVersion 0800, ref JR)

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

@@ -39,7 +39,7 @@ use Image::ExifTool qw(:DataAccess :Utils);
 use Image::ExifTool::Exif;
 use Image::ExifTool::APP12;
 
-$VERSION = '2.64';
+$VERSION = '2.65';
 
 sub PrintLensInfo($$$);
 
@@ -172,7 +172,9 @@ my %olympusLensTypes = (
     '2 28 10' => 'Lumix G Vario 12-60mm F3.5-5.6 Asph. Power OIS', #NJ
     '2 29 10' => 'Leica DG Summilux 12mm F1.4 Asph.', #IB
     '2 30 10' => 'Leica DG Vario-Elmarit 12-60mm F2.8-4 Asph. Power OIS', #IB
+    '2 32 10' => 'Lumix G Vario 100-300mm F4.0-5.6 II', #PH
     '2 33 10' => 'Lumix G X Vario 12-35mm F2.8 II Asph. Power OIS', #IB
+    '2 34 10' => 'Lumix G Vario 35-100mm F2.8 II', #forum3833
     '2 35 10' => 'Leica DG Vario-Elmarit 8-18mm F2.8-4 Asph.', #IB
     '2 36 10' => 'Leica DG Elmarit 200mm F2.8 Power OIS', #IB
     '2 37 10' => 'Leica DG Vario-Elmarit 50-200mm F2.8-4 Asph. Power OIS', #IB

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

@@ -92,7 +92,7 @@ my %isDatChunk = ( IDAT => 1, JDAT => 1, JDAA => 1 );
 my %isTxtChunk = ( tEXt => 1, zTXt => 1, iTXt => 1 );
 
 # chunks that we shouldn't move other chunks across (ref 3)
-my %noLeapFrog = ( SAVE => 1, SEEK => 1, IHDR => 1, JHDR => 1, IEND => 1, MEND => 1, 
+my %noLeapFrog = ( SAVE => 1, SEEK => 1, IHDR => 1, JHDR => 1, IEND => 1, MEND => 1,
                    DHDR => 1, BASI => 1, CLON => 1, PAST => 1, SHOW => 1, MAGN => 1 );
 
 # PNG chunks

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

@@ -4309,15 +4309,15 @@ my %binaryDataAttrs = (
         Name => 'LC3',
         %lensCode,
     },
-    5 => { # LC4 = aberation correction, near distance data
+    5 => { # LC4 = aberration correction, near distance data
         Name => 'LC4',
         %lensCode,
     },
-    6 => { # LC5 = light color aberation correction data
+    6 => { # LC5 = light color aberration correction data
         Name => 'LC5',
         %lensCode,
     },
-    7 => { # LC6 = open aberation data
+    7 => { # LC6 = open aberration data
         Name => 'LC6',
         %lensCode,
     },