Merge pull request #64 from photostructure/update-exiftool-13.47

Update ExifTool to v13.47

Author: mceachen

bin/exiftool.exe

@@ -11,7 +11,7 @@
 use warnings;
 require 5.004;
 
-my $version = '13.46';
+my $version = '13.47';
 
 $^W = 1;    # enable global warnings
 

bin/exiftool_files/exiftool.pl

@@ -29,7 +29,7 @@ use vars qw($VERSION $RELEASE @ISA @EXPORT_OK %EXPORT_TAGS $AUTOLOAD @fileTypes
             %jpegMarker %specialTags %fileTypeLookup $testLen $exeDir
             %static_vars $advFmtSelf $configFile @configFiles $noConfig);
 
-$VERSION = '13.46';
+$VERSION = '13.47';
 $RELEASE = '';
 @ISA = qw(Exporter);
 %EXPORT_TAGS = (
@@ -1147,7 +1147,7 @@ my @availableOptions = (
     [ 'GeoMinSats',       undef,  'geotag minimum satellites' ],
     [ 'GeoHPosErr',       undef,  'geotag GPSHPositioningError based on $GPSDOP' ],
     [ 'GeoSpeedRef',      undef,  'geotag GPSSpeedRef' ],
-    [ 'GeoUserTag',       undef,  'user-defined GPX tags for geotagging' ],
+    [ 'GeoUserTag',       undef,  'user-defined tags for geotagging' ],
     [ 'GlobalTimeShift',  undef,  'apply time shift to all extracted date/time values' ],
     [ 'GPSQuadrant',      undef,  'quadrant for GPS if not otherwise known' ],
     [ 'Group#',           undef,  'return tags for specified groups in family #' ],

bin/exiftool_files/lib/Image/ExifTool.pm

@@ -817,12 +817,13 @@ Reference units for writing GPSSpeed when geotagging:
 
 =item GeoUserTag
 
-Additional user-defined tags to write when geotagging from GPX files. 
+Additional user-defined tags to write when geotagging from GPX or CSV files.
 Format is 'I<TAG>=I<TOKEN>,...' where I<TAG> is an ExifTool tag name (with
-optional group name), and I<TOKEN> is is the property name in the GPX file. 
-eg) C<Location=desc> will write the Location tag based on the GPX 'desc'
-property.  The tag value is taken from the nearest fix in time.  Multiple
-tags may be specified using comma separators. Default is undef.
+optional group name), and I<TOKEN> is is the property name in the GPX file
+or the column name in the CSV file.  eg) C<Location=desc> will write the
+Location tag based on the value of 'desc' in the GPS log file.  The tag
+value is taken from the nearest fix in time.  Multiple tags may be specified
+using comma separators. Default is undef.
 
 =item GlobalTimeShift
 

bin/exiftool_files/lib/Image/ExifTool.pod

@@ -36,7 +36,7 @@ use vars qw($VERSION);
 use Image::ExifTool qw(:Public);
 use Image::ExifTool::GPS;
 
-$VERSION = '1.85';
+$VERSION = '1.86';
 
 sub JITTER() { return 2 }       # maximum time jitter
 
@@ -336,6 +336,8 @@ sub LoadTrackLog($$;$)
                         $param = 'roll';
                     } elsif (/^Img ?Dir/i) {
                         $param = 'dir';
+                    } elsif ($userTag{lc $_}) {
+                        $param = $userTag{lc $_};
                     }
                     if ($param) {
                         $et->VPrint(2, "CSV column '${head}' is $param$xtra\n");
@@ -581,6 +583,8 @@ DoneFix:    $isDate = 1;
                 } elsif ($param eq 'runtime') {
                     $date = $trackTime;
                     $secs = $val;
+                } elsif ($param =~ /^_/) {
+                    $$fix{$param} = $val;
                 } else {
                     $val /= $scaleSpeed if $scaleSpeed and $param eq 'speed';
                     $$fix{$param} = $val;

bin/exiftool_files/lib/Image/ExifTool/Geotag.pm

@@ -15,7 +15,7 @@ use vars qw($VERSION);
 use Image::ExifTool qw(:DataAccess :Utils);
 use Image::ExifTool::XMP;
 
-$VERSION = '1.00';
+$VERSION = '1.01';
 
 sub ProcessHDRP($$$);
 
@@ -672,8 +672,11 @@ sub ProcessHDRP($$$)
     my $tagInfo = $$dirInfo{TagInfo};
     my $tagName = $tagInfo ? $$tagInfo{Name} : '';
     my $verbose = $et->Options('Verbose');
+    my $fast = $et->Options('FastScan') || 0;
     my ($ver, $valPt);
 
+    return undef if $fast > 1;
+
     if ($$dirInfo{DirStart}) {
         my $dat = substr($$dataPt, $$dirInfo{DirStart}, $$dirInfo{DirLen});
         $dataPt = \$dat;

bin/exiftool_files/lib/Image/ExifTool/Google.pm

@@ -21,7 +21,7 @@ use strict;
 use vars qw($VERSION);
 use Image::ExifTool qw(:DataAccess :Utils);
 
-$VERSION = '1.06';
+$VERSION = '1.07';
 
 sub ProcessProtobuf($$$;$);
 
@@ -59,12 +59,14 @@ sub VarInt($)
     my $val = ord($buff) & 0x7f;
     $$dirInfo{Bit0} = $val & 0x01;
     my $mult = 128;
+    my $i = 0;
     for (;;) {
         last unless ord($buff) & 0x80;
         $buff = GetBytes($dirInfo, 1);
         return undef unless defined $buff;
         $val += (ord($buff) & 0x7f) * $mult;
         last unless ord($buff) & 0x80;
+        return undef if ++$i > 32;    # set a reasonable limit
         $mult *= 128;   # (Note: don't use integer bit shift to avoid integer overflow)
     }
     return $val;
@@ -73,7 +75,7 @@ sub VarInt($)
 #------------------------------------------------------------------------------
 # Read protobuf record
 # Inputs: 0) dirInfo ref
-# Returns: 0) record payload (plus tag id and format type in list context)
+# Returns: 0) record payload (plus tag id and format type in list context) or undef on error
 # Notes: Updates $$dirInfo{Pos} to start of next record, and sets $$dirInfo{Bit0}
 #        according to the least significant bit of type 0 (varInt) records
 sub ReadRecord($)
@@ -138,7 +140,6 @@ sub ProcessProtobuf($$$;$)
 
     $$dirInfo{Pos} = $$dirInfo{DirStart} || 0; # initialize buffer Pos
     $et->VerboseDir('Protobuf', undef, $dirLen);
-
     unless ($prefix) {
         $prefix = '';
         $$et{ProtoPrefix}{$dirName} = '' unless defined $$et{ProtoPrefix}{$dirName};

bin/exiftool_files/lib/Image/ExifTool/Protobuf.pm

@@ -49,7 +49,7 @@ use Image::ExifTool qw(:DataAccess :Utils);
 use Image::ExifTool::Exif;
 use Image::ExifTool::GPS;
 
-$VERSION = '3.26';
+$VERSION = '3.27';
 
 sub ProcessMOV($$;$);
 sub ProcessKeys($$$);
@@ -10638,7 +10638,7 @@ QTLang: foreach $tag (@{$$et{QTLang}}) {
     }
     # brute force scan for metadata embedded in media data
     # (and process Insta360 trailer if it exists)
-    ScanMediaData($et) if $ee and $topLevel;
+    ScanMediaData($et) if $ee and $topLevel and not $$et{OPTIONS}{FastScan};
 
     # restore any changed options
     $et->Options($_ => $saveOptions{$_}) foreach keys %saveOptions;

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

@@ -1107,7 +1107,7 @@ OPTIONS
 
          produces output like this:
 
-             -- Generated by ExifTool 13.46 --
+             -- Generated by ExifTool 13.47 --
              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