exiftool_vendored 11.51.0 → 11.52.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 14d2ae1044ed8d62a0b4efcae5b775fb16db5f4c
-  data.tar.gz: 9ff9933b519b5ad645b675891ea048cf077b0d36
+  metadata.gz: 708b8f54e7785c774043632d9e5dcefe98ae0a8d
+  data.tar.gz: 1d0693dcecc6c821a9ae9aab22427cd42d63ea8a
 SHA512:
-  metadata.gz: a246e28c731ee0349cbf2782052eba51249f4df03dc623046f65250b258bed7179c3c179cb1dd64eddb0965f2518a2631c7cb492339ee54184cf66bd6df46542
-  data.tar.gz: 923d024c05145f18099dfc1f8cf6bbd6ccb4cd839ccd7d7af2ff3497298f8aba17ee110adb9e1787ffd1c801b93e656b73d065efaa413c0a8db37b16231608a0
+  metadata.gz: 457d788e530ab3b621d414c6ad4c23bac4427b584886f5667cb1b3865dcd6ec77897a944a6b7ff5820e03e955826f37bd42c80269a75f30f47481ff5aec27ec4
+  data.tar.gz: dc5b34c896e756158c04c3ceb286746fe813fd2b0a1f37aca9faa517df5ce4706c53fc38e514647ed845d1bdbf519d2d2618087e8dcb6b84084ff0c82eba4e9e

data/bin/Changes

@@ -7,6 +7,15 @@ 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.)
 
+June 17, 2019 - Version 11.52
+
+  - Added a few new Nikon CropHiSpeed values (thanks Hayo Baan)
+  - Added a couple of new Nikon LensID's
+  - Fixed problem where processing large, corrupt AIFF files may could take an
+    excessively long time
+  - API Changes:
+      - Enhanced Compact option to add levels 3, 4 and 5
+
 June 13, 2019 - Version 11.51
 
   - Decode Canon DistortionCorrection tags

data/bin/META.json

@@ -47,6 +47,6 @@
       }
    },
    "release_status" : "stable",
-   "version" : "11.51",
+   "version" : "11.52",
    "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.51'
+version: '11.52'
 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.51.tar.gz | tar -xf -
-  cd Image-ExifTool-11.51
+  gzip -dc Image-ExifTool-11.52.tar.gz | tar -xf -
+  cd Image-ExifTool-11.52
   ./exiftool t/images/ExifTool.jpg
 
 Note:  These commands extract meta information from one of the test images. 

data/bin/exiftool

@@ -12,7 +12,7 @@
 use strict;
 require 5.004;
 
-my $version = '11.51';
+my $version = '11.52';
 
 # add our 'lib' directory to the include list BEFORE 'use Image::ExifTool'
 my $exeDir;
@@ -5119,7 +5119,7 @@ with this command:
 
 produces output like this:
 
-    -- Generated by ExifTool 11.51 --
+    -- Generated by ExifTool 11.52 --
     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.51';
+$VERSION = '11.52';
 $RELEASE = '';
 @ISA = qw(Exporter);
 %EXPORT_TAGS = (
@@ -2167,6 +2167,7 @@ sub ClearOptions($)
         WriteMode   => 'wcg',   # enable all write modes by default
         XAttrTags   => undef,   # extract MacOS extended attribute tags
         XMPAutoConv => 1,       # automatic conversion of unknown XMP tag values
+        XMPShorthand=> 0,       # short form XMP
     };
     # keep necessary member variables in sync with options
     delete $$self{CUR_LANG};

data/bin/lib/Image/ExifTool.pod

@@ -529,12 +529,15 @@ without recoding.  Default is 0.
 
 =item Compact
 
-Option to write compact XMP output.  The XMP specification suggests that the
-data be padded with blanks to allow in-place editing. With this flag set to
-1, the 2 kB of padding is not written.  Note that this only effects embedded
-XMP since padding is never written for stand-alone XMP files.  When set to
-2, spaces to indent XMP for readability are also dropped.  Default is undef.
-Also see the XMPShorthand option for reducing the size of XMP.
+Option to write compact XMP output.  The XMP specification recommends that
+the XMP packet be padded with 2 kB of blanks to allow in-place editing. With
+this option set to 1, the padding is not written.  Note that this effects
+only embedded XMP since padding is never written for stand-alone XMP files. 
+When set to 2, spaces to indent XMP for readability are also dropped.  A
+setting of 3 places all tags in a single rdf:Description element, and 4
+removes newlines from between XMP elements.  A setting of 5 also writes XMP
+in shorthand format (to save setting the XMPShorthand option separately). 
+Default is undef.
 
 =item Composite
 

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

@@ -18,7 +18,7 @@ use vars qw($VERSION);
 use Image::ExifTool qw(:DataAccess :Utils);
 use Image::ExifTool::ID3;
 
-$VERSION = '1.09';
+$VERSION = '1.10';
 
 # information for time/date-based tags (time zero is Jan 1, 1904)
 my %timeInfo = (
@@ -185,7 +185,7 @@ sub ProcessAIFF($$)
 {
     my ($et, $dirInfo) = @_;
     my $raf = $$dirInfo{RAF};
-    my ($buff, $err, $tagTablePtr, $page, $type);
+    my ($buff, $err, $tagTablePtr, $page, $type, $n);
 
     # verify this is a valid AIFF file
     return 0 unless $raf->Read($buff, 12) == 12;
@@ -217,14 +217,24 @@ sub ProcessAIFF($$)
 #
 # Read through the IFF chunks
 #
-    for (;;) {
+    for ($n=0;;++$n) {
         $raf->Read($buff, 8) == 8 or last;
         $pos += 8;
         my ($tag, $len) = unpack('a4N', $buff);
         my $tagInfo = $et->GetTagInfo($tagTablePtr, $tag);
-        $et->VPrint(0, "AIFF '${tag}' chunk ($len bytes of data):\n");
+        $et->VPrint(0, "AIFF '${tag}' chunk ($len bytes of data): ", $raf->Tell(),"\n");
         # AIFF chunks are padded to an even number of bytes
         my $len2 = $len + ($len & 0x01);
+        if ($len2 > 100000000) {
+            if ($len2 >= 0x80000000 and not $et->Options('LargeFileSupport')) {
+                $et->Warn('End of processing at large chunk (LargeFileSupport not enabled)');
+                last;
+            }
+            if ($tagInfo) {
+                $et->Warn("Skipping large $$tagInfo{Name} chunk (> 100 MB)");
+                undef $tagInfo;
+            }
+        }
         if ($tagInfo) {
             if ($$tagInfo{TypeOnly}) {
                 $len = $len2 = 4;
@@ -241,6 +251,10 @@ sub ProcessAIFF($$)
                 Start => 0,
                 Size => $len,
             );
+        } elsif (not $len) {
+            next if ++$n < 100;
+            $et->Warn('Aborting scan.  Too many empty chunks');
+            last;
         } elsif ($verbose > 2 and $len2 < 1024000) {
             $raf->Read($buff, $len2) == $len2 or $err = 1, last;
             $et->VerboseDump(\$buff);
@@ -248,6 +262,7 @@ sub ProcessAIFF($$)
             $raf->Seek($len2, 1) or $err=1, last;
         }
         $pos += $len2;
+        $n = 0;
     }
     $err and $et->Warn("Error reading $type file (corrupted?)");
     return 1;

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

@@ -798,7 +798,7 @@ sub ProcessMKV($$)
             # just skip unknown and large data blocks
             if (not $tagInfo or $more > 10000000) {
                 # don't try to skip very large blocks unless LargeFileSupport is enabled
-                last if $more > 0x80000000 and not $et->Options('LargeFileSupport');
+                last if $more >= 0x80000000 and not $et->Options('LargeFileSupport');
                 $raf->Seek($more, 1) or last;
                 $buff = '';
                 $dataPos += $dataLen + $more;

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

@@ -46,6 +46,7 @@
 #              32) Stefan http://u88.n24.queensu.ca/exiftool/forum/index.php/topic,4494.0.html
 #              34) Stewart Bennett private communication (D4S, D810)
 #              35) David Puschel private communication
+#              36) Hayo Baann (forum10207)
 #              IB) Iliah Borg private communication (LibRaw)
 #              JD) Jens Duttke private communication
 #              NJ) Niels Kristian Bech Jensen private communication
@@ -59,7 +60,7 @@ use Image::ExifTool qw(:DataAccess :Utils);
 use Image::ExifTool::Exif;
 use Image::ExifTool::GPS;
 
-$VERSION = '3.64';
+$VERSION = '3.65';
 
 sub LensIDConv($$$);
 sub ProcessNikonAVI($$$);
@@ -514,6 +515,7 @@ sub GetAFPointGrid($$;$);
     'E8 4C 44 44 14 14 DF 0E' => 'Tamron SP 35mm f/1.8 Di VC USD (F012)', #35
     'E7 4C 4C 4C 14 14 DF 0E' => 'Tamron SP 45mm f/1.8 Di VC USD (F013)',
     'F4 54 56 56 18 18 84 06' => 'Tamron SP AF 60mm f/2.0 Di II Macro 1:1 (G005)', #24
+    'E5 4C 62 62 14 14 C9 4E' => 'Tamron SP 85mm f/1.8 Di VC USD (F016)', #30
     '1E 5D 64 64 20 20 13 00' => 'Tamron SP AF 90mm f/2.5 (52E)',
     '20 5A 64 64 20 20 14 00' => 'Tamron SP AF 90mm f/2.5 Macro (152E)',
     '22 53 64 64 24 24 E0 02' => 'Tamron SP AF 90mm f/2.8 Macro 1:1 (72E)',
@@ -572,6 +574,7 @@ sub GetAFPointGrid($$;$);
     'F7 53 5C 80 24 24 84 06' => 'Tamron SP AF 70-200mm f/2.8 Di LD (IF) Macro (A001)',
     'FE 53 5C 80 24 24 84 06' => 'Tamron SP AF 70-200mm f/2.8 Di LD (IF) Macro (A001)',
     'F7 53 5C 80 24 24 40 06' => 'Tamron SP AF 70-200mm f/2.8 Di LD (IF) Macro (A001)',
+    'E2 47 5C 80 24 24 DF 4E' => 'Tamron SP 70-200mm f/2.8 Di VC USD G2 (A025)', #30
   # 'FE 54 5C 80 24 24 DF 0E' => 'Tamron SP AF 70-200mm f/2.8 Di VC USD (A009)',
     'FE 54 5C 80 24 24 DF 0E' => 'Tamron SP 70-200mm f/2.8 Di VC USD (A009)', #NJ
     'E2 47 5C 80 24 24 DF 4E' => 'Tamron SP 70-200mm f/2.8 Di VC USD G2 (A025)', #forum9549
@@ -938,13 +941,16 @@ my %afPoints153 = (
 my %cropHiSpeed = ( #IB
     0 => 'Off',
     1 => '1.3x Crop', # (1.3x Crop, Large)
-    2 => 'DX Crop',
+    2 => 'DX Crop', # (1.5x)
     3 => '5:4 Crop',
-    4 => '3:2 Crop',
+    4 => '3:2 Crop', # (1.2x, ref 36)
     6 => '16:9 Crop',
+    8 => '2.7x Crop', #36 (D4/D500)
     9 => 'DX Movie Crop', # (DX during movie recording, Large)
+    10 => '1.3x Movie Crop', #36 (D4/D500)
     11 => 'FX Uncropped',
     12 => 'DX Uncropped',
+    15 => '1.5x Movie Crop', #36 (D4/D500)
     17 => '1:1 Crop',
     OTHER => sub {
         my ($val, $inv, $conv) = @_;

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

@@ -604,13 +604,13 @@ sub LimitXMPSize($$$$$$)
     push @$startPt, length($$dataPt);  # add end offset to list
     my $newData = substr($$dataPt, 0, $$startPt[0]);
     my $guid = '0' x 32;
-    my $sp = $noPad ? '' : ' ';
+    my ($sp, $nl) = $noPad ? ('', $noPad > 1 ? '' : "\n") : (' ',"\n");
     # write the required xmpNote:HasExtendedXMP property
-    $newData .= "\n$sp<$rdfDesc rdf:about='${about}'\n$sp${sp}xmlns:xmpNote='$nsURI{xmpNote}'";
-    if ($et->Options('XMPShorthand')) {
+    $newData .= "$nl$sp<$rdfDesc rdf:about='${about}'\n$sp${sp}xmlns:xmpNote='$nsURI{xmpNote}'";
+    if ($$et{OPTIONS}{XMPShorthand} or ($$et{OPTIONS}{Compact} and $$et{OPTIONS}{Compact} > 4)) {
         $newData .= "\n$sp${sp}xmpNote:HasExtendedXMP='${guid}'/>\n";
     } else {
-        $newData .= ">\n$sp$sp<xmpNote:HasExtendedXMP>$guid</xmpNote:HasExtendedXMP>\n$sp</$rdfDesc>\n";
+        $newData .= ">$nl$sp$sp<xmpNote:HasExtendedXMP>$guid</xmpNote:HasExtendedXMP>$nl$sp</$rdfDesc>\n";
     }
 
     my ($i, %descSize, $start);
@@ -652,42 +652,49 @@ sub CloseProperty($$$$)
 
     my $prop = pop @$curPropList;
     $prop =~ s/ .*//;       # remove list index if it exists
-    my $pad = $noPad ? '' : ' ' x (scalar(@$curPropList) + 1);
+    my ($pad, $nl);
+    if ($noPad) {
+        $pad = '';
+        $nl = $noPad > 1 ? '' : "\n";
+    } else {
+        $pad = ' ' x (scalar(@$curPropList) + 1);
+        $nl = "\n";
+    }
     if ($$resFlag[@$curPropList]) {
         # close this XMP structure with possible shorthand properties
         if (length $$short[-1]) {
             if (length $$long[-1]) {
                 # require a new Description if both longhand and shorthand properties
-                $$long[-2] .= ">\n$pad<$rdfDesc";
-                $$short[-1] .= ">\n";
-                $$long[-1] .= "$pad</$rdfDesc>\n";
+                $$long[-2] .= ">$pad<$rdfDesc";
+                $$short[-1] .= ">$nl";
+                $$long[-1] .= "$pad</$rdfDesc>$nl";
             } else {
                 # simply close empty property if all shorthand
-                $$short[-1] .= "/>\n";
+                $$short[-1] .= "/>$nl";
             }
         } else {
             # use "parseType" instead of opening a new Description
             $$long[-2] .= ' rdf:parseType="Resource"';
-            $$short[-1] = length $$long[-1] ? ">\n" : "/>\n";
+            $$short[-1] = length $$long[-1] ? ">$nl" : "/>$nl";
         }
-        $$long[-1] .= "$pad</$prop>\n" if length $$long[-1];
+        $$long[-1] .= "$pad</$prop>$nl" if length $$long[-1];
         $$long[-2] .= $$short[-1] . $$long[-1];
         pop @$short;
         pop @$long;
     } elsif (defined $$resFlag[@$curPropList]) {
         # close this top level Description with possible shorthand values
         if (length $$long[-1]) {
-            $$long[-2] .= $$short[-1] . ">\n" . $$long[-1] . "$pad</$prop>\n";
+            $$long[-2] .= $$short[-1] . ">$nl" . $$long[-1] . "$pad</$prop>$nl";
         } else {
-            $$long[-2] .= $$short[-1] . "/>\n"; # empty element (ie. all shorthand)
+            $$long[-2] .= $$short[-1] . "/>$nl"; # empty element (ie. all shorthand)
         }
         $$short[-1] = $$long[-1] = '';
     } else {
         # close this property (no chance of shorthand)
-        $$long[-1] .= "$pad</$prop>\n";
+        $$long[-1] .= "$pad</$prop>$nl";
         unless (@$curPropList) {
             # add properties now that this top-level Description is complete
-            $$long[-2] .= ">\n" . $$long[-1];
+            $$long[-2] .= ">$nl" . $$long[-1];
             $$long[-1] = '';
         }
     }
@@ -715,11 +722,11 @@ sub WriteXMP($$;$)
     my $xmpFile = (not $tagTablePtr);   # this is an XMP data file if no $tagTablePtr
     # prefer XMP over other metadata formats in some types of files
     my $preferred = $xmpFile || ($$et{PreferredGroup} and $$et{PreferredGroup} eq 'XMP');
-    my $verbose = $et->Options('Verbose');
-    my $compact = $et->Options('Compact') || 0;
+    my $verbose = $$et{OPTIONS}{Verbose};
+    my $compact = $$et{OPTIONS}{Compact} || 0;
     my $dirLen = $$dirInfo{DirLen};
     $dirLen = length($$dataPt) if not defined $dirLen and $dataPt;
-    $noPad = ($compact > 1);
+    $noPad = $compact > 1 ? ($compact > 3 ? 2 : 1) : undef;
 #
 # extract existing XMP information into %capture hash
 #
@@ -1229,7 +1236,7 @@ sub WriteXMP($$;$)
 # write out the new XMP information (serialize it)
 #
     # start writing the XMP data
-    my $useShorthand = $et->Options('XMPShorthand');
+    my $useShorthand = $$et{OPTIONS}{XMPShorthand} || $compact > 4;
     my (@long, @short, @resFlag);
     $long[0] = $long[1] = $short[0] = '';
     if ($$et{XMP_NO_XPACKET}) {
@@ -1272,6 +1279,8 @@ sub WriteXMP($$;$)
         }
     }
 
+    my ($sp, $nl) = $noPad ? ('', $noPad > 1 ? '' : "\n") : (' ',"\n");
+
     # write out all properties
     for (;;) {
         my (%nsNew, $newDesc);
@@ -1307,7 +1316,7 @@ sub WriteXMP($$;$)
             my ($path2, $ns2);
             foreach $path2 (@pathList) {
                 my @ns2s = ($path2 =~ m{(?:^|/)([^/]+?):}g);
-                my $opening = 0;
+                my $opening = $compact > 2 ? 1 : 0;
                 foreach $ns2 (@ns2s) {
                     next if $ns2 eq 'rdf';
                     $nsNew{$ns2} and ++$opening, next;
@@ -1336,9 +1345,8 @@ sub WriteXMP($$;$)
             # open the new description
             $prop = $rdfDesc;
             %nsCur = %nsNew;            # save current namespaces
-            my $sp = $noPad ? '' : ' ';
             my @ns = sort keys %nsCur;
-            $long[-2] .= "\n$sp<$prop rdf:about='${about}'";
+            $long[-2] .= "$nl$sp<$prop rdf:about='${about}'";
             # generate et:toolkit attribute if this is an exiftool RDF/XML output file
             if (@ns and $nsCur{$ns[0]} =~ m{^http://ns.exiftool.ca/}) {
                 $long[-2] .= "\n$sp${sp}xmlns:et='http://ns.exiftool.ca/1.0/'" .
@@ -1365,7 +1373,7 @@ sub WriteXMP($$;$)
             {
                 # check for empty structure
                 if ($propList[$n+1] =~ /:~dummy~$/) {
-                    $long[-1] .= " rdf:parseType='Resource'/>\n";
+                    $long[-1] .= " rdf:parseType='Resource'/>$nl";
                     pop @curPropList;
                     $dummy = 1;
                     last;
@@ -1376,10 +1384,10 @@ sub WriteXMP($$;$)
                     push @short, '';
                 } else {
                     # use rdf:parseType='Resource' to avoid new 'rdf:Description'
-                    $long[-1] .= " rdf:parseType='Resource'>\n";
+                    $long[-1] .= " rdf:parseType='Resource'>$nl";
                 }
             } else {
-                $long[-1] .= ">\n"; # (will be no shorthand properties)
+                $long[-1] .= ">$nl"; # (will be no shorthand properties)
             }
         }
         my $prop2 = pop @propList;  # get new property name
@@ -1398,7 +1406,7 @@ sub WriteXMP($$;$)
                     my $quot = ($attrVal =~ /'/) ? '"' : "'";
                     $long[-1] .= " $attr=$quot$attrVal$quot";
                 }
-                $long[-1] .= length $val ? ">$val</$prop2>\n" : "/>\n";
+                $long[-1] .= length $val ? ">$val</$prop2>$nl" : "/>$nl";
             }
         }
     }
@@ -1415,9 +1423,9 @@ sub WriteXMP($$;$)
         $$dirInfo{ExtendedXMP} = $rtn[0];
         $$dirInfo{ExtendedGUID} = $rtn[1];
         # compact if necessary to fit
-        $compact = 1 if length($long[-2]) + 101 * $numPadLines > $maxDataLen;
+        $compact = 1 if length($long[-2]) + 101 * $numPadLines > $maxDataLen and not $compact;
     }
-    $compact = 1 if $$dirInfo{Compact};
+    $compact = 1 if $$dirInfo{Compact} and not $compact;
 #
 # close out the XMP, clean up, and return our data
 #
@@ -1439,7 +1447,7 @@ sub WriteXMP($$;$)
             # pad to specified DirLen
             if ($len > $dirLen) {
                 my $str = 'Not enough room to edit XMP in place';
-                $str .= '. Try XMPShorthand option' unless $$et{OPTIONS}{XMPShorthand};
+                $str .= '. Try XMPShorthand option' unless $$et{OPTIONS}{XMPShorthand} or $compact > 4;
                 $et->Warn($str);
                 return undef;
             }

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

@@ -282,7 +282,7 @@ sub ProcessRAR($$)
         last if $size < 0;
         next unless $size;  # ignore blocks with no data
         # don't try to read very large blocks unless LargeFileSupport is enabled
-        if ($size > 0x80000000 and not $et->Options('LargeFileSupport')) {
+        if ($size >= 0x80000000 and not $et->Options('LargeFileSupport')) {
             $et->Warn('Large block encountered. Aborting.');
             last;
         }

data/bin/perl-Image-ExifTool.spec

@@ -1,6 +1,6 @@
 Summary: perl module for image data extraction
 Name: perl-Image-ExifTool
-Version: 11.51
+Version: 11.52
 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.51.0')
+  VERSION = Gem::Version.new('11.52.0')
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: exiftool_vendored
 version: !ruby/object:Gem::Version
-  version: 11.51.0
+  version: 11.52.0
 platform: ruby
 authors:
 - Matthew McEachen
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-06-13 00:00:00.000000000 Z
+date: 2019-06-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: exiftool