exiftool_vendored 11.97.0 → 11.98.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7221434022aae95d2a68084a499a8b114bbec64edfb43daeefd3e3f33c8b4178
-  data.tar.gz: 51610e0fb64869f5c989ab9dca28ed73156893d2c5ec19b4374fee27fb9bc87b
+  metadata.gz: dd206618b02e9bdc096dbaf8dc497c6bce6a27e5782b42db0a308ba043752c49
+  data.tar.gz: 783ecd5157f77b7f56d7c85a3ddcb86aebc170e6e937ebfacfa7141a90f74cd8
 SHA512:
-  metadata.gz: 9b8bb1e623b568a39c28c6d9eda0b92a00730de352e48c1aa226624323c403a4a5a5b5b6358b247ae3604006f290c088ae64352be741e1206ff4fb938f55bdcb
-  data.tar.gz: 343021ad049d3d2443b0a29060ddad05f691f8ed77b5a175f0c6113a880b13ca86ec21b8cff62c24b95040ae28f0755b6f83acb6c388dbdf60510a5d68536ba1
+  metadata.gz: c4e18ca046d054a9a06289921a7ebd70801a64f3ac133de19156969077a1618841926104c9eef4cfdcd57ead9aed13ef2b1cd53b16a7b204fd6bba4342b633ef
+  data.tar.gz: 397e4a867443f593c3d73be6e549e9b0df9256ef551cad3ff39ef335bada1a47bf63fcdc58435672f39873418d74ecfec7ecc385008da471cd6cb34904f5c26a

data/bin/Changes

@@ -7,6 +7,16 @@ 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.)
 
+May 1, 2020 - Version 11.98
+
+  - Added a new Nikon LensID (thanks Warren Hatch)
+  - Added a new Sony LensType (thanks LibRaw)
+  - Added a new Canon LensType
+  - Patched to extract EXIF with an "Exif\0\0" header from WebP images
+  - Enhanced -efile option and added to the documentation
+  - Minor tweak to -htmlDump output (disallow locking of empty selection)
+  - Fixed problem determining Duration of some M2TS videos
+
 Apr. 27, 2020 - Version 11.97
 
   - Added experimental -efile option (undocumented)

data/bin/META.json

@@ -47,5 +47,5 @@
       }
    },
    "release_status" : "stable",
-   "version" : "11.97"
+   "version" : "11.98"
 }

data/bin/META.yml

@@ -28,4 +28,4 @@ recommends:
   Time::HiRes: 0
 requires:
   perl: 5.004
-version: 11.97
+version: 11.98

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.97.tar.gz | tar -xf -
-  cd Image-ExifTool-11.97
+  gzip -dc Image-ExifTool-11.98.tar.gz | tar -xf -
+  cd Image-ExifTool-11.98
   ./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.97';
+my $version = '11.98';
 
 # add our 'lib' directory to the include list BEFORE 'use Image::ExifTool'
 my $exeDir;
@@ -90,6 +90,7 @@ my @csvFiles;       # list of files when reading with CSV option (in ExifTool Ch
 my @csvTags;        # order of tags for first file with CSV option (lower case)
 my @delFiles;       # list of files to delete
 my @dynamicFiles;   # list of -tagsFromFile files with dynamic names and -TAG<=FMT pairs
+my @efile;          # files for writing list of error/fail/same file names
 my @exclude;        # list of excluded tags
 my (@echo3, @echo4);# stdout and stderr echo after processing is complete
 my @files;          # list of files and directories to scan
@@ -140,8 +141,6 @@ my $deleteOrig;     # 0=restore original files, 1=delete originals, 2=delete w/o
 my $disableOutput;  # flag to disable normal output
 my $doSetFileName;  # flag set if FileName may be written
 my $doUnzip;        # flag to extract info from .gz and .bz2 files
-my $efile;          # file for writing list of error file names
-my $efile2;         # file for writing list of failed file names
 my $escapeC;        # C-style escape
 my $escapeHTML;     # flag to escape printed values for html
 my $evalWarning;    # warning from eval
@@ -242,7 +241,8 @@ my %optArgs = (
     '-d' => 1, '-dateformat' => 1,
     '-D' => 0, # necessary to avoid matching lower-case equivalent
     '-echo' => 1, '-echo1' => 1, '-echo2' => 1, '-echo3' => 1, '-echo4' => 1,
-    '-efile' => 1, '-efile1' => 1, '-efile2' => 1,
+    '-efile' => 1, '-efile1' => 1, '-efile2' => 1, '-efile3' => 1, '-efile4' => 1,
+    '-efile!' => 1, '-efile1!' => 1, '-efile2!' => 1, '-efile3!' => 1, '-efile4!' => 1,
     '-ext' => 1, '--ext' => 1, '-ext+' => 1, '--ext+' => 1,
         '-extension' => 1, '--extension' => 1, '-extension+' => 1, '--extension+' => 1,
     '-fileorder' => 1,
@@ -409,6 +409,7 @@ undef @delFiles;
 undef @dynamicFiles;
 undef @echo3;
 undef @echo4;
+undef @efile;
 undef @exclude;
 undef @files;
 undef @newValues;
@@ -442,8 +443,6 @@ undef $deleteOrig;
 undef $disableOutput;
 undef $doSetFileName;
 undef $doUnzip;
-undef $efile;
-undef $efile2;
 undef $escapeHTML;
 undef $escapeC;
 undef $evalWarning;
@@ -873,13 +872,13 @@ for (;;) {
         $mt->Options(Duplicates => 1);
         next;
     }
-    if (/^efile([12])?$/i) {
-        @ARGV or Error("Expecting file name for -$_ option\n"), $badCmd=1, next;
-        if (defined $1 and $1 eq '2') {
-            $efile2 = shift;
-        } else {
-            $efile = shift;
-        }
+    if (/^efile(\d)?(!)?$/i) {
+        my $arg = shift;
+        defined $arg or Error("Expecting file name for -$_ option\n"), $badCmd=1, next;
+        $efile[0] = $arg if not $1 or $1 & 0x01;
+        $efile[1] = $arg if $1 and $1 & 0x02;
+        $efile[2] = $arg if $1 and $1 & 0x04;
+        unlink $arg if $2;
         next;
     }
     # (-execute handled at top of loop)
@@ -1925,6 +1924,7 @@ sub GetImageInfo($$)
     if (@condition) {
         unless ($file eq '-' or $et->Exists($file)) {
             Warn "Error: File not found - $file\n";
+            EFile($file);
             FileNotFound($file);
             ++$countBad;
             return;
@@ -1970,15 +1970,7 @@ sub GetImageInfo($$)
         }
         unless ($result) {
             $verbose and print $vout "-------- $file (failed condition)$progStr\n";
-            if ($efile2) {
-                if ($et->Open(\*FAIL_FILE, $efile2, '>>')) {
-                    print FAIL_FILE $file, "\n" or Warn("Error writing to $efile2\n"), undef $efile2;
-                    close FAIL_FILE;
-                } else {
-                    Warn("Error opening '${efile2}' for append\n");
-                    undef $efile2;
-                }
-            }
+            EFile($file, 2);
             ++$countFailed;
             return;
         }
@@ -1999,6 +1991,7 @@ sub GetImageInfo($$)
             ++$countGoodWr;
         } else {
             Warn "Error renaming $original\n";
+            EFile($file);
             ++$countBad;
         }
         return;
@@ -2009,7 +2002,7 @@ sub GetImageInfo($$)
     my ($fp, $outfile, $append);
     if ($textOut and $verbose and not $tagOut) {
         ($fp, $outfile, $append) = OpenOutputFile($orig);
-        $fp or ++$countBad, return;
+        $fp or EFile($file), ++$countBad, return;
         # delete file if we exit prematurely (unless appending)
         $tmpText = $outfile unless $append;
         $et->Options(TextOut => $fp);
@@ -2041,6 +2034,7 @@ sub GetImageInfo($$)
         Warn "Error: File not found - $file\n";
         FileNotFound($file);
         $outfile and close($fp), undef($tmpText), $et->Unlink($outfile);
+        EFile($file);
         ++$countBad;
         return;
     }
@@ -2090,6 +2084,7 @@ sub GetImageInfo($$)
         }
         if ($info->{Error}) {
             Warn "Error: $info->{Error} - $file\n";
+            EFile($file);
             ++$countBad;
             return;
         }
@@ -2100,7 +2095,7 @@ sub GetImageInfo($$)
     # or if there is none of the requested information available
     if ($binaryOutput or not %$info) {
         my $errs = $et->GetInfo('Warning', 'Error');
-        PrintErrors($et, $errs, $file) and $rtnVal = 1;
+        PrintErrors($et, $errs, $file) and EFile($file), $rtnVal = 1;
     } elsif ($et->GetValue('Error') or ($$et{Validate} and $et->GetValue('Warning'))) {
         $rtnVal = 1;
     }
@@ -2108,7 +2103,7 @@ sub GetImageInfo($$)
     # open output file (or stdout if no output file) if not done already
     unless ($outfile or $tagOut) {
         ($fp, $outfile, $append) = OpenOutputFile($orig);
-        $fp or ++$countBad, return;
+        $fp or EFile($file), ++$countBad, return;
         $tmpText = $outfile unless $append;
     }
 
@@ -2167,7 +2162,7 @@ sub GetImageInfo($$)
         }
         delete $printFmt{HEAD} unless $outfile; # print header only once per output file
         my $errs = $et->GetInfo('Warning', 'Error');
-        PrintErrors($et, $errs, $file);
+        PrintErrors($et, $errs, $file) and EFile($file);
     } elsif (not $disableOutput) {
         my ($tag, $line, %noDups, %csvInfo, $bra, $ket, $sep);
         if ($fp) {
@@ -2659,6 +2654,7 @@ sub SetImageInfo($$$)
             $outfile = FilenameSPrintf($outOpt, $orig);
             if ($outfile eq '') {
                 Warn "Error: Can't create file with zero-length name from $orig\n";
+                EFile($infile);
                 ++$countBadCr;
                 return 0;
             }
@@ -2675,6 +2671,7 @@ sub SetImageInfo($$$)
                 unless (CanCreate($outType)) {
                     my $what = $srcType ? 'other types' : 'scratch';
                     WarnOnce "Error: Can't create $outType files from $what\n";
+                    EFile($infile);
                     ++$countBadCr;
                     return 0;
                 }
@@ -2712,6 +2709,7 @@ sub SetImageInfo($$$)
             $outfile = NextUnusedFilename($outfile);
             if ($et->Exists($outfile) and not $doSetFileName) {
                 Warn "Error: '${outfile}' already exists - $infile\n";
+                EFile($infile);
                 ++$countBadWr;
                 return 0;
             }
@@ -2732,7 +2730,7 @@ sub SetImageInfo($$$)
                     $setTags = $tagsFromSrc || $setTags{$dyFile};
                 } else {
                     $fromFile = FilenameSPrintf($dyFile, $orig);
-                    ++$countBadWr, return 0 unless defined $fromFile;
+                    defined $fromFile or EFile($infile), ++$countBadWr, return 0;
                     $setTags = $setTags{$dyFile};
                 }
                 # do we have multiple -tagsFromFile options with this file?
@@ -2817,7 +2815,7 @@ sub SetImageInfo($$$)
             my $err;
             $err = "You shouldn't write FileName or Directory with TestFile" if defined $newFileName or defined $newDir;
             $err = "The -o option shouldn't be used with TestFile" if defined $outfile;
-            $err and Warn("Error: $err - $infile\n"), ++$countBadWr, return 0;
+            $err and Warn("Error: $err - $infile\n"), EFile($infile), ++$countBadWr, return 0;
             $testName = FilenameSPrintf($testName, $orig);
             $testName = Image::ExifTool::GetNewFileName($file, $testName) if $file ne '';
         }
@@ -2844,6 +2842,7 @@ sub SetImageInfo($$$)
                     $sameFile = $outfile;   # same file, but the name has a different case
                 } else {
                     Warn "Error: '${outfile}' already exists - $infile\n";
+                    EFile($infile);
                     ++$countBadWr;
                     return 0;
                 }
@@ -2863,6 +2862,7 @@ sub SetImageInfo($$$)
                 unless ($numSet) {
                     # no need to write if no tags set
                     print $vout "Nothing changed in $file\n" if defined $verbose;
+                    EFile($infile, 1);
                     ++$countSameWr;
                     return 1;
                 }
@@ -2870,6 +2870,7 @@ sub SetImageInfo($$$)
                 if ($numSet == $numPseudo) {
                     # no need to write if no real tags
                     Warn("Error: Nothing to write - $file\n");
+                    EFile($infile, 1);
                     ++$countBadWr;
                     return 0;
                 }
@@ -2881,6 +2882,7 @@ sub SetImageInfo($$$)
             } else {
                 # file doesn't exist, and we can't create it
                 Warn "Error: File not found - $file\n";
+                EFile($infile);
                 FileNotFound($file);
                 ++$countBadWr;
                 return 0;
@@ -2895,9 +2897,11 @@ sub SetImageInfo($$$)
                 if ($r1 > 0 or $r2 > 0 or $r3 > 0 or $r4 > 0) {
                     ++$countGoodWr;
                 } elsif ($r1 < 0 or $r2 < 0 or $r3 < 0 or $r4 < 0) {
+                    EFile($infile);
                     ++$countBadWr;
                     return 0;
                 } else {
+                    EFile($infile, 1);
                     ++$countSameWr;
                 }
                 if (defined $hardLink or defined $symLink or defined $testName) {
@@ -2911,6 +2915,7 @@ sub SetImageInfo($$$)
                 $outfile = "${file}_exiftool_tmp";
                 if ($et->Exists($outfile)) {
                     Warn("Error: Temporary file already exists: $outfile\n");
+                    EFile($infile);
                     ++$countBadWr;
                     return 0;
                 }
@@ -3007,6 +3012,7 @@ sub SetImageInfo($$$)
                         } else {
                             close(NEW_FILE);
                             Warn "Error opening $file for writing\n";
+                            EFile($infile);
                             $et->Unlink($newFile);
                             ++$countBadWr;
                         }
@@ -3024,11 +3030,13 @@ sub SetImageInfo($$$)
                         # unlink may fail if already renamed or no permission
                         if (not $et->Unlink($file)) {
                             Warn "Error renaming temporary file to $dstFile\n";
+                            EFile($infile);
                             $et->Unlink($newFile);
                             ++$countBadWr;
                         # try renaming again now that the target has been deleted
                         } elsif (not $et->Rename($newFile, $dstFile)) {
                             Warn "Error renaming temporary file to $dstFile\n";
+                            EFile($infile);
                             # (don't delete tmp file now because it is all we have left)
                             ++$countBadWr;
                         } else {
@@ -3050,6 +3058,7 @@ sub SetImageInfo($$$)
             ++$countGoodWr;
         }
     } elsif ($success) {
+        EFile($infile, 1);
         if ($isTemporary) {
             # just erase the temporary file since no changes were made
             $et->Unlink($tmpFile);
@@ -3063,6 +3072,7 @@ sub SetImageInfo($$$)
         }
         print $vout "Nothing changed in $file\n" if defined $verbose;
     } else {
+        EFile($infile);
         $et->Unlink($tmpFile) if defined $tmpFile;
         ++$countBadWr;
     }
@@ -3450,7 +3460,7 @@ sub DoSetFromFile($$$)
         ++$warns while $$info{"Warning ($warns)"};
         $numSet -= $warns;
     }
-    PrintErrors($et, $info, $file) and ++$countBadWr, return 0;
+    PrintErrors($et, $info, $file) and EFile($file), ++$countBadWr, return 0;
     Warn "Warning: No writable tags set from $file\n" unless $numSet;
     return 1;
 }
@@ -3649,6 +3659,7 @@ sub ScanDir($$;$)
         {
             Warn("Not writing $path\n");
             WarnOnce("Use -overwrite_original_in_place to write files with Unicode surrogate characters\n");
+            EFile($file);
             ++$countBad;
             next;
         }
@@ -3723,6 +3734,7 @@ sub FindFileWindows($$)
         $evalWarning =~ s/ at .*//s;
         Warn "Error: [Win32::FindFile] $evalWarning - $wildfile\n";
         undef @files;
+        EFile($wildfile);
         ++$countBad;
     }
     return @files;
@@ -4049,8 +4061,8 @@ sub CreateDirectory($)
             }
             $dir .= '/';
         }
+        ++$countNewDir if $created;
     }
-    ++$countNewDir if $created;
     return $created;
 }
 
@@ -4237,6 +4249,29 @@ sub ReadStayOpen($)
     }
 }
 
+#------------------------------------------------------------------------------
+# Add new entry to -efile output file
+# Inputs: 0) file name, 1) -efile option number (0=error, 1=same, 2=failed)
+sub EFile($$)
+{
+    my $entry = shift;
+    my $efile = $efile[shift || 0];
+    if (defined $efile and length $entry and $entry ne '-') {
+        my $err;
+        CreateDirectory($efile);
+        if ($mt->Open(\*EFILE_FILE, $efile, '>>')) {
+            print EFILE_FILE $entry, "\n" or Warn("Error writing to $efile\n"), $err = 1;
+            close EFILE_FILE;
+        } else {
+            Warn("Error opening '${efile}' for append\n");
+            $err = 1;
+        }
+        if ($err) {
+            defined $_ and $_ eq $efile and undef $_ foreach @efile;
+        }
+    }
+}
+
 #------------------------------------------------------------------------------
 # Print list of tags
 # Inputs: 0) message, 1-N) list of tag names
@@ -4282,15 +4317,6 @@ sub PrintErrors($$$)
             Warn "$tag: $info->{$key} - $file\n";
         }
     }
-    if ($$info{Error} and $efile) {
-        if ($et->Open(\*ERR_FILE, $efile, '>>')) {
-            print ERR_FILE $file, "\n" or Warn("Error writing to $efile\n"), undef $efile;
-            close ERR_FILE;
-        } else {
-            Warn("Error opening '${efile}' for append\n");
-            undef $efile;
-        }
-    }
     return $$info{Error};
 }
 
@@ -4523,6 +4549,7 @@ L<Advanced options|/Advanced options>
   -common_args                     Define common arguments
   -config CFGFILE                  Specify configuration file name
   -echo[NUM] TEXT                  Echo text to stdout or stderr
+  -efile[NUM][!] ERRFILE           Save names of files with errors
   -execute[NUM]                    Execute multiple commands on one line
   -srcfile FMT                     Process a different source file
   -stay_open FLAG                  Keep reading -@ argfile even after EOF
@@ -5259,7 +5286,7 @@ with this command:
 
 produces output like this:
 
-    -- Generated by ExifTool 11.97 --
+    -- Generated by ExifTool 11.98 --
     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
@@ -6206,6 +6233,17 @@ is output as the command line is parsed, before the processing of any input
 files.  I<NUM> may also be 3 or 4 to output text (to stdout or stderr
 respectively) after processing is complete.
 
+=item B<-efile>[I<NUM>][!] I<ERRFILE>
+
+Save the names of files giving errors (I<NUM> missing or 1), files that were
+unchanged (I<NUM> is 2), files that fail the B<-if> condition (I<NUM> is 4),
+or any combination thereof (by summing I<NUM>, eg. B<-efile3> is the same
+has having both B<-efile> and B<-efile2> options with the same I<ERRFILE>).
+By default, file names are appended to any existing I<ERRFILE>, but
+I<ERRFILE> is overwritten if an exclamation point is added to the option
+(eg. B<-efile!>).  Saves the name of the file specified by the B<-srcfile>
+option if applicable.
+
 =item B<-execute>[I<NUM>]
 
 Execute command for all arguments up to this point on the command line (plus

data/bin/lib/Image/ExifTool.pm

@@ -28,7 +28,7 @@ use vars qw($VERSION $RELEASE @ISA @EXPORT_OK %EXPORT_TAGS $AUTOLOAD @fileTypes
             %mimeType $swapBytes $swapWords $currentByteOrder %unpackStd
             %jpegMarker %specialTags %fileTypeLookup $testLen $exePath);
 
-$VERSION = '11.97';
+$VERSION = '11.98';
 $RELEASE = '';
 @ISA = qw(Exporter);
 %EXPORT_TAGS = (

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

@@ -88,7 +88,7 @@ sub ProcessCTMD($$$);
 sub ProcessExifInfo($$$);
 sub SwapWords($);
 
-$VERSION = '4.36';
+$VERSION = '4.37';
 
 # Note: Removed 'USM' from 'L' lenses since it is redundant - PH
 # (or is it?  Ref 32 shows 5 non-USM L-type lenses)
@@ -486,6 +486,7 @@ $VERSION = '4.36';
     368.7 => 'Sigma 85mm f/1.4 DG HSM | A', #IB (016)
     368.8 => 'Sigma 105mm f/1.4 DG HSM', #IB (A018)
     368.9 => 'Sigma 14-24mm f/2.8 DG HSM', #IB (A018)
+    368.10 => 'Sigma 35mm f/1.4 DG HSM | A', #PH (012)
    '368.10' => 'Sigma 70mm f/2.8 DG Macro', #IB (A018)
     # Note: LensType 488 (0x1e8) is reported as 232 (0xe8) in 7D CameraSettings
     488 => 'Canon EF-S 15-85mm f/3.5-5.6 IS USM', #PH
@@ -532,7 +533,7 @@ $VERSION = '4.36';
     757 => 'Canon EF 400mm f/2.8L IS III USM', #IB
     758 => 'Canon EF 600mm f/4L IS III USM', #IB
 
-    1136 => 'Sigma 24-70mm f/2.8 DG OS HSM | Art 017', #IB
+    1136 => 'Sigma 24-70mm f/2.8 DG OS HSM | A', #IB (017)
     # (STM lenses - 0x10xx)
     4142 => 'Canon EF-S 18-135mm f/3.5-5.6 IS STM',
     4143 => 'Canon EF-M 18-55mm f/3.5-5.6 IS STM or Tamron Lens',

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

@@ -13,7 +13,7 @@ use vars qw($VERSION);
 use Image::ExifTool;    # only for FinishTiffDump()
 use Image::ExifTool::HTML qw(EscapeHTML);
 
-$VERSION = '1.38';
+$VERSION = '1.39';
 
 sub DumpTable($$$;$$$$$$);
 sub Open($$$;@);
@@ -122,7 +122,7 @@ function doClick(e)
   if (!clicked) {
     firstOutEvt = lastInEvt = undefined;
     high(e, 2);
-    clicked = 1;
+    if (hlist) clicked = 1;
   } else {
     clicked = 0;
     if (firstOutEvt) high(firstOutEvt, 0);

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

@@ -31,7 +31,7 @@ use strict;
 use vars qw($VERSION);
 use Image::ExifTool qw(:DataAccess :Utils);
 
-$VERSION = '1.16';
+$VERSION = '1.17';
 
 # program map table "stream_type" lookup (ref 6/1)
 my %streamType = (
@@ -313,7 +313,7 @@ sub ProcessM2TS($$)
     my $raf = $$dirInfo{RAF};
     my ($buff, $pLen, $upkPrefix, $j, $fileType, $eof);
     my (%pmt, %pidType, %data, %sectLen);
-    my ($startTime, $endTime, $backScan, $maxBack);
+    my ($startTime, $endTime, $fwdTime, $backScan, $maxBack);
     my $verbose = $et->Options('Verbose');
     my $out = $et->Options('TextOut');
 
@@ -330,7 +330,7 @@ sub ProcessM2TS($$)
         $upkPrefix = 'x4N';
     }
     my $prePos = $pLen - 188;       # byte position of packet prefix
-    my $readSize = 64 * $pLen;      # read 64 packets at once
+    my $readSize = 64 * $pLen;      # size of our read buffer
     $raf->Seek(0,0);                # rewind to start
     $raf->Read($buff, $readSize) >= $pLen * 4 or return 0;  # require at least 4 packets
     # validate the sync byte in the next 3 packets
@@ -351,39 +351,58 @@ sub ProcessM2TS($$)
     my %didPID = ( 1 => 0, 2 => 0, 0x1fff => 0 );
     my %needPID = ( 0 => 1 );       # lookup for stream PID's that we still need to parse
     my $pEnd = 0;
-    my $i = 0;
 
     # parse packets from MPEG-2 Transport Stream
     for (;;) {
 
         unless (%needPID) {
             last unless defined $startTime;
-            # seek backwards to find last PCR
-            if (defined $backScan) {
-                last if defined $endTime;
-                $backScan -= $pLen;
-                last if $backScan < $maxBack;
-            } else {
-                undef $endTime;
-                last if $et->Options('FastScan');
+            # reconfigure to seek backwards for last PCR
+            unless (defined $backScan) {
+                $et->Options('FastScan') and undef($endTime), last;
                 $verbose and print "[Starting backscan for last PCR]\n";
-                # calculate position of last complete packet
-                my $fwdPos = $raf->Tell();
+                $fwdTime = $endTime;
+                undef $endTime;
+                # remember how far we got when reading forward through the file
+                my $fwdPos = $raf->Tell() - length($buff) + $pEnd;
+                # determine the number of whole packets in the file
                 $raf->Seek(0, 2) or last;
                 my $fsize = $raf->Tell();
                 my $nPack = int($fsize / $pLen);
-                $backScan = ($nPack - 1) * $pLen - $fsize;
+                $backScan = $nPack * $pLen - $fsize;
                 # set limit on how far back we will go
                 $maxBack = $fwdPos - $fsize;
-                $maxBack = -256000 if $maxBack < -256000;
+                # scan back a maximum of 512k (have seen last PCR at -276k)
+                my $nMax = int(512000 / $pLen);     # max packets to scan
+                my $nRem = int(-$maxBack / $pLen);  # packets remaining in file
+                $maxBack = $backScan - $nMax * $pLen if $nRem > $nMax;
+                $pEnd = 0;
             }
-            $raf->Seek($backScan, 2) or last;
         }
-        my $pos = $pEnd;
+        my $pos;
         # read more if necessary
-        if ($pos + $pLen > length $buff) {
-            $raf->Read($buff, $readSize) >= $pLen or $eof = 1, last;
-            $pos = $pEnd = 0;
+        if (defined $backScan) {
+            last if defined $endTime;
+            $pos = $pEnd = $pEnd - 2 * $pLen;   # step back to previous packet
+            if ($pos < 0) {
+                # read another buffer from end of file
+                last if $backScan <= $maxBack;
+                my $readThis = $readSize;
+                $backScan -= $readSize;
+                if ($backScan < $maxBack) {
+                    $readThis = $readSize - ($maxBack - $backScan);
+                    $backScan = $maxBack;
+                }
+                $raf->Seek($backScan, 2) or last;
+                $raf->Read($buff, $readThis) == $readThis or last;
+                $pos = $pEnd = $readThis - $pLen;
+            }
+        } else {
+            $pos = $pEnd;
+            if ($pos + $pLen > length $buff) {
+                $raf->Read($buff, $readSize) >= $pLen or $eof = 1, last;
+                $pos = $pEnd = 0;
+            }
         }
         $pEnd += $pLen;
         # decode the packet prefix
@@ -404,8 +423,8 @@ sub ProcessM2TS($$)
       # my $continuity_counter           = $prefix & 0x0000000f;
 
         if ($verbose > 1) {
+            my $i = ($raf->Tell() - length($buff) + $pEnd) / $pLen - 1;
             print  $out "Transport packet $i:\n";
-            ++$i;
             $et->VerboseDump(\$buff, Len => $pLen, Addr => $i * $pLen, Start => $pos - $prePos);
             my $str = $pidName{$pid} ? " ($pidName{$pid})" : '';
             printf $out "  Timecode:   0x%.4x\n", Get32u(\$buff, $pos - $prePos) if $pLen == 192;
@@ -646,7 +665,8 @@ sub ProcessM2TS($$)
     }
 
     # calculate Duration if available
-    if (defined $startTime and defined $endTime and $startTime != $endTime) {
+    $endTime = $fwdTime unless defined $endTime;
+    if (defined $startTime and defined $endTime) {
         $endTime += 0x80000000 * 1200 if $startTime > $endTime; # handle 33-bit wrap
         $et->HandleTag($tagTablePtr, 'Duration', $endTime - $startTime);
     }

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

@@ -62,7 +62,7 @@ use Image::ExifTool qw(:DataAccess :Utils);
 use Image::ExifTool::Exif;
 use Image::ExifTool::GPS;
 
-$VERSION = '3.81';
+$VERSION = '3.82';
 
 sub LensIDConv($$$);
 sub ProcessNikonAVI($$$);
@@ -297,6 +297,7 @@ sub GetAFPointGrid($$;$);
     'B8 40 2D 44 2C 34 BA 06' => 'AF-S Nikkor 18-35mm f/3.5-4.5G ED',
     'A0 40 2D 74 2C 3C BB 0E' => 'AF-S DX Nikkor 18-140mm f/3.5-5.6G ED VR', #PH
     'A1 54 55 55 0C 0C BC 06' => 'AF-S Nikkor 58mm f/1.4G', #IB
+    'A1 48 6E 8E 24 24 DB 4E' => 'AF-S Nikkor 120-300mm f/2.8E FL ED SR VR', #28
     'A2 40 2D 53 2C 3C BD 0E' => 'AF-S DX Nikkor 18-55mm f/3.5-5.6G VR II',
     'A4 40 2D 8E 2C 40 BF 0E' => 'AF-S DX Nikkor 18-300mm f/3.5-6.3G ED VR',
     'A5 4C 44 44 14 14 C0 06' => 'AF-S Nikkor 35mm f/1.8G ED', #35 ("ED" ref 11)

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

@@ -46,7 +46,7 @@ use Image::ExifTool qw(:DataAccess :Utils);
 use Image::ExifTool::Exif;
 use Image::ExifTool::GPS;
 
-$VERSION = '2.47';
+$VERSION = '2.48';
 
 sub ProcessMOV($$;$);
 sub ProcessKeys($$$);
@@ -1628,10 +1628,14 @@ my %eeBox = (
         Avoid => 1,
         Format => 'string', # (necessary to remove the trailing NULL)
     },
-    date => { # (NC)
+    date => {
         Name => 'DateTimeOriginal',
         Description => 'Date/Time Original',
         Groups => { 2 => 'Time' },
+        Notes => q{
+            Apple Photos has been reported to show a crazy date/time for some MP4 files
+            containing this tag
+        }, #forum10690/11125
         Shift => 'Time',
         ValueConv => q{
             require Image::ExifTool::XMP;
@@ -8232,6 +8236,11 @@ sub HandleItemInfo($)
                 if ($buff =~ /^(MM\0\x2a|II\x2a\0)/) {
                     $et->Warn('Missing Exif header');
                     $start = 0;
+                } elsif ($buff =~ /^Exif\0\0/) {
+                    # (haven't seen this yet, but it is just a matter of time
+                    #  until someone screws it up like this)
+                    $et->Warn('Missing Exif header size');
+                    $start = 6;
                 } else {
                     my $n = unpack('N', $buff);
                     $start = 4 + $n; # skip "Exif\0\0" header if it exists

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

@@ -29,7 +29,7 @@ use strict;
 use vars qw($VERSION);
 use Image::ExifTool qw(:DataAccess :Utils);
 
-$VERSION = '1.55';
+$VERSION = '1.56';
 
 sub ConvertTimecode($);
 sub ProcessSGLT($$$);
@@ -485,14 +485,26 @@ my %code2charset = (
 #
 # WebP-specific tags
 #
-    EXIF => { # (WebP)
+    EXIF => [{ # (WebP)
         Name => 'EXIF',
+        Condition => '$$valPt =~ /^(II\x2a\0|MM\0\x2a)/',
         Notes => 'WebP files',
         SubDirectory => {
             TagTable => 'Image::ExifTool::Exif::Main',
             ProcessProc => \&Image::ExifTool::ProcessTIFF,
         },
-    },
+    },{ # (WebP) - have also seen with "Exif\0\0" header - PH
+        Name => 'EXIF',
+        Condition => '$$valPt =~ /^Exif\0\0(II\x2a\0|MM\0\x2a)/',
+        SubDirectory => {
+            TagTable => 'Image::ExifTool::Exif::Main',
+            ProcessProc => \&Image::ExifTool::ProcessTIFF,
+            Start => 6,
+        },
+    },{
+        Name => 'UnknownEXIF',
+        Binary => 1,
+    }],
    'XMP ' => { #14 (WebP)
         Name => 'XMP',
         Notes => 'WebP files',

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

@@ -34,7 +34,7 @@ use Image::ExifTool qw(:DataAccess :Utils);
 use Image::ExifTool::Exif;
 use Image::ExifTool::Minolta;
 
-$VERSION = '3.23';
+$VERSION = '3.24';
 
 sub ProcessSRF($$$);
 sub ProcessSR2($$$);
@@ -232,7 +232,7 @@ sub PrintInvLensSpec($;$$);
     51507 => 'Samyang AF 35mm F1.4', #IB
     51508 => 'Samyang AF 45mm F1.8',
     51510 => 'Samyang AF 18mm F2.8', #JR
-
+    51512 => 'Samyang AF 75mm F1.8 FE', #IB
 );
 
 # ExposureProgram values (ref PH, mainly decoded from A200)

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

@@ -10651,6 +10651,7 @@ my %tagExists = (
 	'unknown_slmt' => 1,
 	'unknownd30' => 1,
 	'unknowndata' => 1,
+	'unknownexif' => 1,
 	'unknowninfo' => 1,
 	'unknowninfo2' => 1,
 	'unknowninfo2version' => 1,

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 23364 tags, with 15306 unique tag names.
+They contain a total of 23365 tags, with 15307 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
@@ -28940,6 +28940,7 @@ sub-documents, but the Duration is calculated for the full video.
   'ANMF'               ANMF                     RIFF ANMF
   'CSET'               CharacterSet             RIFF CSET
   'EXIF'               EXIF                     EXIF
+                       UnknownEXIF              no
   'ICCP'               ICC_Profile              ICC_Profile
   'IDIT'               DateTimeOriginal         no
   'JUNK'               OlympusJunk              Olympus AVI

data/bin/perl-Image-ExifTool.spec

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: exiftool_vendored
 version: !ruby/object:Gem::Version
-  version: 11.97.0
+  version: 11.98.0
 platform: ruby
 authors:
 - Matthew McEachen
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-28 00:00:00.000000000 Z
+date: 2020-05-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: exiftool