exiftool_vendored 11.69.0 → 11.70.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ea39081a30f1851114ef9949045a7650418f1347
-  data.tar.gz: 3c8964dbcd6b93e20c44f009dace3dac33555658
+  metadata.gz: 99342b0e056690256fd202039dbf7b678e57e74f
+  data.tar.gz: abc9d3a16667124e8920041f816acc514d004b1f
 SHA512:
-  metadata.gz: '0941ec0ddebab6a0b9690d46a752e831c9ded4923dd86f7a13cb001f2deb41a6ae9c96c8c9ad1cad187aad08f7208a3a70d741bd31f9ba1a9d80e68247b91e80'
-  data.tar.gz: fcc84333736485e86b37961b89fa9ab9e8368f2517f36f0f1b36242c0e5faf9ef4eb029b03ea78a50378dafc8b93f0f47b98cd81237f978c233cd0c938f2054b
+  metadata.gz: 4cedd4a547029020891081d81be3a9e0356f06fad6bca85df5e0a799ef9eba06e0ea48345e921c066b8c1e74bc1caf7fff084e95da64f2deb23210ee4a29ccf3
+  data.tar.gz: 591846ec033b7e216d05037ee6c503d291e55b67c36255c48c4b32d2835475ef15c12c3dbc328ec9a9f9ce3b10207d8ed4b4c42e3e3d90e955385fc47ba165e1

data/bin/Changes

@@ -4,13 +4,28 @@ ExifTool Version History
 
 RSS feed: http://owl.phy.queensu.ca/~phil/exiftool/rss.xml
 
-Note: The most recent production release is Version 11.50. (Other versions are
+Note: The most recent production release is Version 11.70. (Other versions are
 considered development releases, and are not uploaded to CPAN.)
 
+Oct. 10, 2019 - Version 11.70 (production release)
+
+  - Added a new CanonModelID (thanks Laurent Clevy)
+  - Improved identification of Office Open XML files
+  - Removed RAF version check when writing FujiFilm RAF files
+  - Limited the number of accelerometer records that ExifTool will read by
+    default with the -ee option from INSV files to avoid excessive processing
+    times and memory usage
+  - Patched Windows version to allow reading of shared files with Unicode names
+    (thanks Eriksson)
+  - Patched to avoid converting some bad GPS coordinates (thanks Csaba Toth)
+  - Fixed verbose output to include YCbCrSubSampling for JPEG files
+  - Fixed conversion and group names for the new FujiFilm tag added in 11.68
+  - Fixed format of GeoTiffDirectory and GeoTiffDoubleParams when writing
+
 Oct. 2, 2019 - Version 11.69
 
-  - Fixed bug where signed coordinates between -1 and 0 were written as positive
-    values when writing QuickTime:GPSCoordinates
+  - Fixed bug introduced in version 11.66 where the sign was lost when writing
+    coordinate values between 0 and -1 to QuickTime:GPSCoordinates
 
 Oct. 1, 2019 - Version 11.68
 
@@ -18,7 +33,7 @@ Oct. 1, 2019 - Version 11.68
   - Added a number of new FujiFlashMode values
   - Decode a new FujiFilm tag
   - Made NikonCaptureOffsets and NikonCaptureVersion deletable
-  - Enhanced tag name documentation to indicate deletable makernote tags
+  - Enhanced tag name documentation to indicate deletable MakerNotes tags
 
 Sept. 30, 2019 - Version 11.67
 

data/bin/META.json

@@ -47,6 +47,6 @@
       }
    },
    "release_status" : "stable",
-   "version" : "11.69",
+   "version" : "11.70",
    "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.69'
+version: '11.70'
 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.69.tar.gz | tar -xf -
-  cd Image-ExifTool-11.69
+  gzip -dc Image-ExifTool-11.70.tar.gz | tar -xf -
+  cd Image-ExifTool-11.70
   ./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.69';
+my $version = '11.70';
 
 # add our 'lib' directory to the include list BEFORE 'use Image::ExifTool'
 my $exeDir;
@@ -5173,7 +5173,7 @@ with this command:
 
 produces output like this:
 
-    -- Generated by ExifTool 11.69 --
+    -- Generated by ExifTool 11.70 --
     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.69';
+$VERSION = '11.70';
 $RELEASE = '';
 @ISA = qw(Exporter);
 %EXPORT_TAGS = (
@@ -434,6 +434,8 @@ my %createTypes = map { $_ => 1 } qw(XMP ICC MIE VRD DR4 EXIF EXV);
     POT  => ['FPX',  'Microsoft PowerPoint Template'],
     POTM => [['ZIP','FPX'], 'Office Open XML Presentation Template Macro-enabled'],
     POTX => [['ZIP','FPX'], 'Office Open XML Presentation Template'],
+    PPAM => [['ZIP','FPX'], 'Office Open XML Presentation Addin Macro-enabled'],
+    PPAX => [['ZIP','FPX'], 'Office Open XML Presentation Addin'],
     PPM  => ['PPM',  'Portable Pixel Map'],
     PPS  => ['FPX',  'Microsoft PowerPoint Slideshow'],
     PPSM => [['ZIP','FPX'], 'Office Open XML Presentation Slideshow Macro-enabled'],
@@ -683,6 +685,8 @@ my %fileDescription = (
     POT  => 'application/vnd.ms-powerpoint',
     POTM => 'application/vnd.ms-powerpoint.template.macroEnabled',
     POTX => 'application/vnd.openxmlformats-officedocument.presentationml.template',
+    PPAM => 'application/vnd.ms-powerpoint.addin.macroEnabled',
+    PPAX => 'application/vnd.openxmlformats-officedocument.presentationml.addin', # (NC, PH invented)
     PPM  => 'image/x-portable-pixmap',
     PPS  => 'application/vnd.ms-powerpoint',
     PPSM => 'application/vnd.ms-powerpoint.slideshow.macroEnabled',
@@ -3882,7 +3886,11 @@ sub Open($*$;$)
                     $create  = Win32API::File::OPEN_EXISTING();
                 }
             }
-            my $wh = eval { Win32API::File::CreateFileW($file, $access, 0, [], $create, 0, []) };
+            my $share = 0;
+            eval {
+                $share = Win32API::File::FILE_SHARE_READ() unless $access & Win32API::File::GENERIC_WRITE();
+            };
+            my $wh = eval { Win32API::File::CreateFileW($file, $access, $share, [], $create, 0, []) };
             return undef unless $wh;
             my $fd = eval { Win32API::File::OsFHandleOpenFd($wh, 0) };
             if (not defined $fd or $fd < 0) {
@@ -3910,7 +3918,8 @@ sub Exists($$)
     if ($self->EncodeFileName($file)) {
         local $SIG{'__WARN__'} = \&SetWarning;
         my $wh = eval { Win32API::File::CreateFileW($file,
-                        Win32API::File::GENERIC_READ(), 0, [],
+                        Win32API::File::GENERIC_READ(),
+                        Win32API::File::FILE_SHARE_READ(), [],
                         Win32API::File::OPEN_EXISTING(), 0, []) };
         return 0 unless $wh;
         eval { Win32API::File::CloseHandle($wh) };
@@ -6037,7 +6046,7 @@ sub ProcessJPEG($$)
             }
             if ($hmin and $vmin) {
                 my ($hs, $vs) = ($hmax / $hmin, $vmax / $vmin);
-                $self->FoundTag($$sof{YCbCrSubSampling}, "$hs $vs");
+                $self->HandleTag($sof, 'YCbCrSubSampling', "$hs $vs");
             }
             next;
         } elsif ($marker == 0xd9) {         # EOI

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

@@ -35,7 +35,7 @@ use Image::ExifTool::Sony;
 use Image::ExifTool::Validate;
 use Image::ExifTool::MacOS;
 
-$VERSION = '3.29';
+$VERSION = '3.30';
 @ISA = qw(Exporter);
 
 sub NumbersFirst($$);
@@ -2560,6 +2560,7 @@ sub WriteTagNames($$)
                     my ($smallNote, @values);
                     foreach (@$values) {
                         if (/^\(/) {
+                            $_ = Doc2Html($_);
                             # set the note font
                             $smallNote = 1 if $numTags < 2;
                             push @values, ($smallNote ? $noteFontSmall : $noteFont) . "$_</span>";
@@ -2570,6 +2571,7 @@ sub WriteTagNames($$)
                             if (s/^\[!HTML\]//) {
                                 push @values, $_;
                             } else {
+                                $_ = Doc2Html($_);
                                 push @values, "<span class=s>$_</span>";
                             }
                             next;

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

@@ -88,7 +88,7 @@ sub ProcessCTMD($$$);
 sub ProcessExifInfo($$$);
 sub SwapWords($);
 
-$VERSION = '4.25';
+$VERSION = '4.26';
 
 # Note: Removed 'USM' from 'L' lenses since it is redundant - PH
 # (or is it?  Ref 32 shows 5 non-USM L-type lenses)
@@ -814,6 +814,7 @@ $VERSION = '4.25';
     0x805     => 'PowerShot SX70 HS',
     0x808     => 'PowerShot G7 X Mark III',
     0x811     => 'EOS M6 Mark II', #IB
+    0x812     => 'EOS M200', #25
 
 # (see http://cweb.canon.jp/e-support/faq/answer/digitalcamera/10447-1.html for PowerShot/IXUS/IXY names)
 
@@ -2185,6 +2186,7 @@ my %offOn = ( 0 => 'Off', 1 => 'On' );
             61 => 'Smooth Skin', #51
             62 => 'Soft Focus', #PH (SX260,IXUS240)
             68 => 'Food', #PH (250D)
+            # 83 - seen for EOS M200 (ref PH)
             84 => 'HDR Art Standard', #PH (80D)
             85 => 'HDR Art Vivid', #PH (80D)
             93 => 'HDR Art Bold', #PH (80D)
@@ -7890,7 +7892,7 @@ my %ciMaxFocal = (
             16 => '16 (M50)',
             17 => '17 (EOS R)',     # (and PowerShot SX740HS)
             18 => '18 (EOS RP)',    # (and PowerShot SX70HS)
-            19 => '19 (90D/M6mkII)',# (and PowerShot G7XmkIII)
+            19 => '19 (90D/M6mkII/M200)',# (and PowerShot G7XmkIII)
         },
     },
     0x47 => { Name => 'WB_RGGBLevelsAsShot',     Format => 'int16s[4]' },

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

@@ -683,7 +683,7 @@ sub ProcessCanonRaw($$$)
         my ($value, $delRawConv);
         if ($valueInDir) {  # is the value data in the directory?
             # this type of tag stores the value in the 'size' and 'ptr' fields
-            $valueDataPos = $dirOffset + $pt + 4;
+            $valueDataPos = $dirOffset + $pt + 4; # (remember, +2 for the entry count)
             $size = 8;
             $value = substr($buff, $pt+2, $size);
             # set count to 1 by default for normal values in directory

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

@@ -56,7 +56,7 @@ use vars qw($VERSION $AUTOLOAD @formatSize @formatName %formatNumber %intFormat
 use Image::ExifTool qw(:DataAccess :Utils);
 use Image::ExifTool::MakerNotes;
 
-$VERSION = '4.23';
+$VERSION = '4.24';
 
 sub ProcessExif($$$);
 sub WriteExif($$$);
@@ -1810,14 +1810,14 @@ my %sampleFormat = (
     0x87af => { #30
         Name => 'GeoTiffDirectory',
         Format => 'undef',
-        Binary => 1,
+        Writable => 'int16u',
         Notes => q{
             these "GeoTiff" tags may read and written as a block, but they aren't
             extracted unless specifically requested.  Byte order changes are handled
             automatically when copying between TIFF images with different byte order
         },
-        Writable => 'undef',
         WriteGroup => 'IFD0',
+        Binary => 1,
         RawConv => '$val . GetByteOrder()', # save byte order
         # swap byte order if necessary
         RawConvInv => q{
@@ -1832,9 +1832,9 @@ my %sampleFormat = (
     0x87b0 => { #30
         Name => 'GeoTiffDoubleParams',
         Format => 'undef',
-        Binary => 1,
-        Writable => 'undef',
+        Writable => 'double',
         WriteGroup => 'IFD0',
+        Binary => 1,
         RawConv => '$val . GetByteOrder()', # save byte order
         # swap byte order if necessary
         RawConvInv => q{
@@ -1849,6 +1849,7 @@ my %sampleFormat = (
     },
     0x87b1 => { #30
         Name => 'GeoTiffAsciiParams',
+        Format => 'undef',
         Writable => 'string',
         WriteGroup => 'IFD0',
         Binary => 1,

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

@@ -31,12 +31,13 @@ use vars qw($VERSION);
 use Image::ExifTool qw(:DataAccess :Utils);
 use Image::ExifTool::Exif;
 
-$VERSION = '1.74';
+$VERSION = '1.75';
 
 sub ProcessFujiDir($$$);
 sub ProcessFaceRec($$$);
 
 # the following RAF version numbers have been tested for writing:
+# (as of ExifTool 11.70, this lookup is no longer used if the version number is numerical)
 my %testedRAF = (
     '0100' => 'E550, E900, F770, S5600, S6000fd, S6500fd, HS10/HS11, HS30, S200EXR, X100, XF1, X-Pro1, X-S1, XQ2 Ver1.00, X-T100, GFX 50R, XF10',
     '0101' => 'X-E1, X20 Ver1.01, X-T3',
@@ -776,10 +777,11 @@ my %faceCategories = (
         Writable => 'int16u',
         Groups => { 2 => 'Video' },
     },
-    0x3824 => { #forum10480 (X-T3)
+    0x3824 => { #forum10480 (X series)
         Name => 'FullHDHighSpeedRec',
         Writable => 'int32u',
-        Groups => { 1 => 'Off', 2 => 'On' },
+        Groups => { 2 => 'Video' },
+        PrintConv => { 1 => 'Off', 2 => 'On' },
     },
     0x4005 => { #forum9634
         Name => 'FaceElementSelected', # (could be face or eye)
@@ -1467,9 +1469,10 @@ sub WriteRAF($$)
         return 1;
     }
     # check to make sure this version of RAF has been tested
-    unless ($testedRAF{$ver}) {
-        $et->Warn("RAF version $ver not yet tested", 1);
-    }
+    #(removed in ExifTool 11.70)
+    #unless ($testedRAF{$ver}) {
+    #    $et->Warn("RAF version $ver not yet tested", 1);
+    #}
     # read the embedded JPEG
     unless ($raf->Seek($jpos, 0) and $raf->Read($jpeg, $jlen) == $jlen) {
         $et->Error('Error reading RAF meta information');

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

@@ -12,7 +12,7 @@ use strict;
 use vars qw($VERSION);
 use Image::ExifTool::Exif;
 
-$VERSION = '1.50';
+$VERSION = '1.51';
 
 my %coordConv = (
     ValueConv    => 'Image::ExifTool::GPS::ToDegrees($val)',
@@ -534,6 +534,7 @@ sub ToDMS($$;$$)
 sub ToDegrees($;$)
 {
     my ($val, $doSign) = @_;
+    return '' if $val =~ /\b(inf|undef)\b/; # ignore invalid values
     # extract decimal or floating point values out of any other garbage
     my ($d, $m, $s) = ($val =~ /((?:[+-]?)(?=\d|\.\d)\d*(?:\.\d*)?(?:[Ee][+-]\d+)?)/g);
     return '' unless defined $d;

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

@@ -160,6 +160,10 @@ my $debug;          # set to 1 to enable debugging code
             Start => '$valuePtr',
             Base => 0, # (avoids warnings since maker notes are not self-contained)
         },
+        # 0x0011 - sensor code (ref IB)
+        # 0x0012 - camera model id?
+        # 0x0015 - camera model name
+        # 0x0016 - coating code (ref IB)
     },
     # (the GE X5 has really messed up EXIF-like maker notes starting with
     #  "GENIC\x0c\0" --> currently not decoded)

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

@@ -2284,6 +2284,7 @@ my %binaryDataAttrs = (
         Name => 'NikonCaptureVersion',
         Writable => 'string',
         Permanent => 0,
+        PrintConv => undef, # (avoid applying default print conversion to string)
     },
     # 0x0e0e is in D70 Nikon Capture files (not out-of-the-camera D70 files) - PH
     0x0e0e => { #PH
@@ -3840,6 +3841,8 @@ my %binaryDataAttrs = (
 %Image::ExifTool::Nikon::CaptureOffsets = (
     PROCESS_PROC => \&ProcessNikonCaptureOffsets,
     GROUPS => { 0 => 'MakerNotes', 2 => 'Camera' },
+    # (note that these are duplicates of offsets in the normal TIFF structure,
+    #  and that these offsets are not updated when ExifTool rewrites the file)
     1 => 'IFD0_Offset',
     2 => 'PreviewIFD_Offset',
     3 => 'SubIFD_Offset',

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

@@ -14,13 +14,14 @@ use Image::ExifTool qw(:DataAccess :Utils);
 use Image::ExifTool::XMP;
 use Image::ExifTool::ZIP;
 
-$VERSION = '1.07';
+$VERSION = '1.08';
 
 # test for recognized OOXML document extensions
 my %isOOXML = (
     DOCX => 1,  DOCM => 1,
     DOTX => 1,  DOTM => 1,
     POTX => 1,  POTM => 1,
+    PPAX => 1,  PPAM => 1,
     PPSX => 1,  PPSM => 1,
     PPTX => 1,  PPTM => 1,  THMX => 1,
     XLAM => 1,

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

@@ -70,9 +70,15 @@ my %processByMetaFormat = (
 
 # data lengths for each INSV record type
 my %insvDataLen = (
-    0x300 => 56,
-    0x400 => 16,
-    0x700 => 53,
+    0x300 => 56,    # accelerometer
+    0x400 => 16,    # unknown
+    0x700 => 53,    # GPS
+);
+
+# limit the default amount of data we read for some record types
+# (to avoid running out of memory)
+my %insvLimit = (
+    0x300 => [ 'accelerometer', 20000 ],    # maximum of 20000 accelerometer records
 );
 
 # tags extracted from various QuickTime data streams
@@ -1392,7 +1398,7 @@ sub Process_mebx($$$)
 }
 
 #------------------------------------------------------------------------------
-# Process QuickTime '3gf' timed metadata (Pittasoft Blackvue dashcam)
+# Process QuickTime '3gf' timed metadata (ref PH, Pittasoft Blackvue dashcam)
 # Inputs: 0) ExifTool ref, 1) dirInfo ref, 2) tag table ref
 # Returns: 1 on success
 sub Process_3gf($$$)
@@ -1652,7 +1658,7 @@ sub ProcessTTAD($$$)
 }
 
 #------------------------------------------------------------------------------
-# Extract information from Insta360 trailer
+# Extract information from Insta360 trailer (ref PH)
 # Inputs: 0) ExifTool ref
 sub ProcessINSVTrailer($)
 {
@@ -1667,23 +1673,29 @@ sub ProcessINSVTrailer($)
     my $tagTbl = GetTagTable('Image::ExifTool::QuickTime::Stream');
     my $fileEnd = $raf->Tell();
     my $trailerLen = unpack('x38V', $buff);
-    my $trailerStart = $fileEnd - $trailerLen;
+    $trailerLen > $fileEnd and $et->Warn('Bad INSV trailer size'), return;
     my $unknown = $et->Options('Unknown');
     my $verbose = $et->Options('Verbose');
-    my $pos = $fileEnd - 78;
+    my $epos = -78;   # position relative to EOF (avoids using large offsets for files > 2 GB)
     my ($i, $p);
     SetByteOrder('II');
     # loop through all records in the trailer, from last to first
     for (;;) {
         my ($id, $len) = unpack('vV', $buff);
-        ($pos -= $len) < $trailerStart and last;
-        $raf->Seek($pos, 0) or last;
-        $raf->Read($buff, $len) == $len or last;
+        ($epos -= $len) + $trailerLen < 0 and last;
+        $raf->Seek($epos, 2) or last;
+        my $dlen = $insvDataLen{$id};
         if ($verbose) {
-            $et->VPrint(0, sprintf("INSV Record 0x%x (offset 0x%x, %d bytes):\n", $id, $pos, $len));
-            $et->VerboseDump(\$buff);
+            $et->VPrint(0, sprintf("INSV Record 0x%x (offset 0x%x, %d bytes):\n", $id, $fileEnd + $epos, $len));
         }
-        my $dlen = $insvDataLen{$id};
+        # limit the number of records we read if necessary
+        if ($insvLimit{$id} and $len > $insvLimit{$id}[1] * $dlen and
+            $et->Warn("INSV $insvLimit{$id}[0] data is huge. Processing only the first $insvLimit{$id}[1] records",2))
+        {
+            $len = $insvLimit{$id}[1] * $dlen;
+        }
+        $raf->Read($buff, $len) == $len or last;
+        $et->VerboseDump(\$buff) if $verbose > 2;
         if ($dlen) {
             $len % $dlen and $et->Warn(sprintf('Unexpected INSV record 0x%x length',$id)), last;
             if ($id == 0x300) {
@@ -1719,7 +1731,7 @@ sub ProcessINSVTrailer($)
                     $et->HandleTag($tagTbl, GPSTrack => $a[9]);
                     $et->HandleTag($tagTbl, GPSTrackRef => 'T');
                     $et->HandleTag($tagTbl, GPSAltitude => $a[10]);
-                    $et->HandleTag($tagTbl, Unknown02 => "@a[1,2]");
+                    $et->HandleTag($tagTbl, Unknown02 => "@a[1,2]") if $unknown;
                 }
             }
         } elsif ($id == 0x101) {
@@ -1733,8 +1745,8 @@ sub ProcessINSVTrailer($)
                 $p += 2 + $n;
             }
         }
-        ($pos -= 6) < $trailerStart and last;   # step back to previous record
-        $raf->Seek($pos, 0) or last;
+        ($epos -= 6) + $trailerLen < 0 and last;    # step back to previous record
+        $raf->Seek($epos, 2) or last;
         $raf->Read($buff, 6) == 6 or last;
     }
     SetByteOrder('MM');

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

@@ -545,8 +545,8 @@ official EXIF 2.32 specification.
   0x8781   SharedData                -          no
   0x8782   T88Options                -          no
   0x87ac   ImageLayer                -          no
-  0x87af   GeoTiffDirectory          IFD0       undef
-  0x87b0   GeoTiffDoubleParams       IFD0       undef
+  0x87af   GeoTiffDirectory          IFD0       int16u[0.5]
+  0x87b0   GeoTiffDoubleParams       IFD0       double[0.125]
   0x87b1   GeoTiffAsciiParams        IFD0       string
   0x87be   JBIGOptions               -          no
   0x8822   ExposureProgram           ExifIFD    int16u

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

@@ -19,7 +19,7 @@ use strict;
 use vars qw($VERSION $warnString);
 use Image::ExifTool qw(:DataAccess :Utils);
 
-$VERSION = '1.25';
+$VERSION = '1.26';
 
 sub WarnProc($) { $warnString = $_[0]; }
 
@@ -456,7 +456,14 @@ sub ProcessZIP($$)
         my $cType = $zip->memberNamed('[Content_Types].xml');
         if ($cType) {
             ($buff, $status) = $zip->contents($cType);
-            if (not $status and $buff =~ /ContentType\s*=\s*(['"])([^"']+)\.main(\+xml)?\1/) {
+            if (not $status and (
+                # first look for the main document with the expected name
+                $buff =~ m{\sPartName\s*=\s*['"](?:/ppt/presentation.xml|/word/document.xml|/xl/workbook.xml)['"][^>]*\sContentType\s*=\s*(['"])([^"']+)\.main(\+xml)?\1} or
+                # then look for the main part
+                $buff =~ /<Override[^>]*\sPartName[^<]+\sContentType\s*=\s*(['"])([^"']+)\.main(\+xml)?\1/ or
+                # and if all else fails, use the default main
+                $buff =~ /ContentType\s*=\s*(['"])([^"']+)\.main(\+xml)?\1/))
+            {
                 $mime = $2;
             }
         }

data/bin/perl-Image-ExifTool.spec

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: exiftool_vendored
 version: !ruby/object:Gem::Version
-  version: 11.69.0
+  version: 11.70.0
 platform: ruby
 authors:
 - Matthew McEachen
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-10-02 00:00:00.000000000 Z
+date: 2019-10-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: exiftool