exiftool_vendored 11.94.0 → 11.96.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: f8d1a45ceed2fce06b008315885667eccd1652c9
-  data.tar.gz: 1d0c0e626deab2d61cd1e3c29e1314ac1817b342
+SHA256:
+  metadata.gz: 5a75cdf33b026b2b63463fbcb090685d29bbcbc336814074ab715d6c6218bea7
+  data.tar.gz: 0c75f45324460338a833b814fa05a6a9b6c9737380b5e0d47e0dfa00d9edfcbe
 SHA512:
-  metadata.gz: f0699566c7325efa24c989da7db409805a24f487a716ca96a0e4146858f667c72e0b77a429dcad2a06e0e790f5b74a800dc1cf2d576a365fb355c93ede814bba
-  data.tar.gz: aa2d82f8be53730bb76ae38d68fc311c4ea0b68ba138e1f14afd98e2cbf2a801a5806a410516e910d7652899769b7d1fb62044d1ed18a42414de50a1e4f92564
+  metadata.gz: c3e543aba5a56b22240e4f76d84665bf0c0912410062e70b503f157c87023c8db7f1386ea50ece249a38c8e903056f9bb6bfa45a17d266834d940cf485010350
+  data.tar.gz: 810e53957fbe2aecb16a80a9ae9364c8160bcbe68050bc0432399cefb92da1e3ad3b45ffd5919877614809ec1e007a16de539f7bb4c77171cc3cb3a919548e8f

data/bin/Changes

@@ -7,12 +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.)
 
+Apr. 24, 2020 - Version 11.96
+
+  - Decode streaming GPS from Lucas LK-7900 Ace AVI videos
+  - Changed new Exit/ExitDir function names to End/EndDir
+  - Fixed inconsistencies when using "-use mwg" together with the -wm option
+
+Apr. 23, 2020 - Version 11.95
+
+  - Added Exit() and ExitDir() functions for use in -if conditions
+  - Enhanced -geotag feature to support a more flexible input CSV file format
+  - Enhanced -if and API Filter options to allow access to ExifTool object via
+    $self
+  - Fixed problem reading HEIC Exif with a missing header
+
 Apr. 17, 2020 - Version 11.94
 
-  - Added a new Sony LensType (thanks Jos Roost)
+  - Added support for QuickTime ItemList:GPSCoordinates
   - Added additional Validate test for overlapping EXIF values
+  - Added a new Sony LensType (thanks Jos Roost)
   - Added a new Nikon LensID
-  - Added support for QuickTime ItemList:GPSCoordinates
   - Decode a few more Nikon tags (thanks Warren Hatch)
   - Decode Pentax ShutterType
   - Changed color of locked highlighted selection in -htmlDump output

data/bin/META.json

@@ -47,5 +47,5 @@
       }
    },
    "release_status" : "stable",
-   "version" : "11.94"
+   "version" : "11.96"
 }

data/bin/META.yml

@@ -28,4 +28,4 @@ recommends:
   Time::HiRes: 0
 requires:
   perl: 5.004
-version: 11.94
+version: 11.96

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.94.tar.gz | tar -xf -
-  cd Image-ExifTool-11.94
+  gzip -dc Image-ExifTool-11.96.tar.gz | tar -xf -
+  cd Image-ExifTool-11.96
   ./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.94';
+my $version = '11.96';
 
 # add our 'lib' directory to the include list BEFORE 'use Image::ExifTool'
 my $exeDir;
@@ -289,6 +289,10 @@ my %altRecommends = (
 
 my %unescapeChar = ( 't'=>"\t", 'n'=>"\n", 'r'=>"\r" );
 
+# special subroutines used in -if condition
+sub Image::ExifTool::EndDir() { return $$mt{EndDir} = 1 }
+sub Image::ExifTool::End()    { return $$mt{End} = 1 }
+
 # exit routine
 sub Exit {
     if ($pause) {
@@ -1932,7 +1936,8 @@ sub GetImageInfo($$)
                     # set package so eval'd functions are in Image::ExifTool namespace
                     package Image::ExifTool;
 
-                    #### eval "-if" condition (%info)
+                    my $self = $et;
+                    #### eval "-if" condition (%info, $self)
                     $result = eval $cond;
 
                     $@ and $evalWarning = $@;
@@ -3508,9 +3513,11 @@ sub ProcessFiles($;$)
                 push(@$list, $file);
             } else {
                 GetImageInfo($et, $file);
+                $$et{End} and Warn("End called - $file\n");
             }
         }
         $et->Options(CharsetFileName => $enc) if $utf8FileName{$file};
+        last if $$et{End};
     }
 }
 
@@ -3588,6 +3595,7 @@ sub ScanDir($$;$)
             next if $file =~ /^\./ and ($recurse == 1 or $file eq '.' or $file eq '..');
             next if $ignore{$file} or ($ignore{SYMLINKS} and -l $path);
             ScanDir($et, $path, $list);
+            last if $$et{End};
             next;
         }
         # apply rules from -ext options
@@ -3626,6 +3634,15 @@ sub ScanDir($$;$)
             push(@$list, $path);
         } else {
             GetImageInfo($et, $path);
+            if ($$et{End}) {
+                Warn("End called - $file\n");
+                last;
+            }
+            if ($$et{EndDir}) {
+                $dir =~ s(/$)();
+                Warn("EndDir called - $path\n");
+                last;
+            }
         }
     }
     ++$countDir;
@@ -5210,7 +5227,7 @@ with this command:
 
 produces output like this:
 
-    -- Generated by ExifTool 11.94 --
+    -- Generated by ExifTool 11.96 --
     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
@@ -5687,6 +5704,14 @@ processing pass is done at the level specified by the B<-fast> option.  For
 example, using B<-if4> is possible if I<EXPR> uses only pseudo System tags,
 and may significantly speed processing if enough files fail the condition.
 
+The expression has access to the current ExifTool object through C<$self>,
+and the following special functions are available to allow short-circuiting
+of the file processing.  Both functions have a return value of 1.  Case is
+significant for function names.
+
+    End()    - end processing after this file
+    EndDir() - end processing of files in this directory
+
 Notes:
 
 1) The B<-n> and B<-b> options also apply to tags used in I<EXPR>.

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.94';
+$VERSION = '11.96';
 $RELEASE = '';
 @ISA = qw(Exporter);
 %EXPORT_TAGS = (
@@ -91,7 +91,7 @@ sub GetExtended($$);
 sub Set64u(@);
 sub DecodeBits($$;$);
 sub EncodeBits($$;$$);
-sub Filter($@);
+sub Filter($$@);
 sub HexDump($;$%);
 sub DumpTrailer($$);
 sub DumpUnknownTrailer($$);
@@ -3198,7 +3198,7 @@ sub GetValue($$;$)
             # $valueConv is undefined if there was no print conversion done
             $valueConv = $value;
         }
-        Filter($$self{OPTIONS}{Filter}, \$value);
+        $self->Filter($$self{OPTIONS}{Filter}, \$value);
         # return Both values as a list (ValueConv, PrintConv)
         return ($valueConv, $value);
     }
@@ -3206,7 +3206,7 @@ sub GetValue($$;$)
     DoEscape($value, $$self{ESCAPE_PROC}) if $$self{ESCAPE_PROC};
 
     # filter if necessary
-    Filter($$self{OPTIONS}{Filter}, \$value) if $$self{OPTIONS}{Filter} and $type eq 'PrintConv';
+    $self->Filter($$self{OPTIONS}{Filter}, \$value) if $$self{OPTIONS}{Filter} and $type eq 'PrintConv';
 
     if (ref $value eq 'ARRAY') {
         if (defined $$self{OPTIONS}{ListItem}) {
@@ -5415,11 +5415,12 @@ sub GetDescriptions($$)
 
 #------------------------------------------------------------------------------
 # Apply filter to value(s) if necessary
-# Inputs: 0) filter expression, 1-N) references to values(s) to filter
+# Inputs: 0) ExifTool ref, 1) filter expression, 2-N) references to value(s) to filter
 # Returns: nothing, but changes values if necessary
-sub Filter($@)
+sub Filter($$@)
 {
     local $_;
+    my $self = shift;
     my $filter = shift;
     return unless defined $filter;
     while (@_) {
@@ -5427,20 +5428,20 @@ sub Filter($@)
         next unless defined $$valPt;
         if (not ref $$valPt) {
             $_ = $$valPt;
-            #### eval Filter ($_)
+            #### eval Filter ($_, $self)
             eval $filter;
             $$valPt = $_ if defined $_;
         } elsif (ref $$valPt eq 'SCALAR') {
             my $val = $$$valPt; # make a copy to avoid filtering twice
-            Filter($filter, \$val);
+            $self->Filter($filter, \$val);
             $$valPt = \$val;
         } elsif (ref $$valPt eq 'ARRAY') {
             my @val = @{$$valPt}; # make a copy to avoid filtering twice
-            Filter($filter, \$_) foreach @val;
+            $self->Filter($filter, \$_) foreach @val;
             $$valPt = \@val;
         } elsif (ref $$valPt eq 'HASH') {
             my %val = %{$$valPt}; # make a copy to avoid filtering twice
-            Filter($filter, \$val{$_}) foreach keys %val;
+            $self->Filter($filter, \$val{$_}) foreach keys %val;
             $$valPt = \%val;
         }
     }
@@ -5644,7 +5645,7 @@ sub ConvertUnixTime($;$$)
 
 #------------------------------------------------------------------------------
 # Get Unix time from EXIF-formatted date/time string with optional timezone
-# Inputs: 0) EXIF date/time string, 1) non-zero if time is local
+# Inputs: 0) EXIF date/time string, 1) non-zero if time is local, or 2 to assume UTC
 # Returns: Unix time (seconds since 0:00 GMT Jan 1, 1970) or undefined on error
 sub GetUnixTime($;$)
 {
@@ -5655,10 +5656,14 @@ sub GetUnixTime($;$)
     my ($tzStr, $tzSec) = (pop(@tm), 0);
     # use specified timezone offset (if given) instead of local system time
     # if we are converting a local time value
-    if ($isLocal and $tzStr =~ /(?:Z|([-+])(\d+):(\d+))/i) {
-        # use specified timezone if one exists
-        $tzSec = ($2 * 60 + $3) * ($1 eq '-' ? -60 : 60) if $1;
-        undef $isLocal; # convert using GMT corrected for specified timezone
+    if ($isLocal) {
+        if ($tzStr =~ /(?:Z|([-+])(\d+):(\d+))/i) {
+            # use specified timezone if one exists
+            $tzSec = ($2 * 60 + $3) * ($1 eq '-' ? -60 : 60) if $1;
+            undef $isLocal; # convert using GMT corrected for specified timezone
+        } elsif ($isLocal eq '2') {
+            undef $isLocal;
+        }
     }
     $tm[1] -= 1;        # convert month
     @tm = reverse @tm;  # change to order required by timelocal()

data/bin/lib/Image/ExifTool.pod

@@ -652,16 +652,17 @@ based on the file's extension.  Default is undef.
 
 Perl expression used to filter values for all tags.  The expression acts on
 the value of the Perl default variable ($_), and changes the value of this
-variable as required.  The value is not changed if $_ is set to undef.  List
-items are filtered individually.  Applies to all returned values unless
-PrintConv option is disabled.
+variable as required.  The current ExifTool object may be accessed through
+$self.  The value is not changed if $_ is set to undef.  List items are
+filtered individually.  Applies to all returned values unless PrintConv
+option is disabled.
 
 =item FilterW
 
 Perl expression used to filter PrintConv values when writing.  The
 expression acts on the value of the Perl default variable ($_), and changes
-the value of this variable as required.  The value is not changed if $_ is
-set to undef.
+the value of this variable as required.  The current ExifTool object may be
+accessed through $self.  The value is not changed if $_ is set to undef.
 
 =item FixBase
 

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.34';
+$VERSION = '3.35';
 @ISA = qw(Exporter);
 
 sub NumbersFirst($$);
@@ -1474,7 +1474,8 @@ TagID:  foreach $tagID (@keys) {
         my $tag;
         foreach $tag (sort keys %$struct) {
             my $tagInfo = $$struct{$tag};
-            next unless ref $tagInfo eq 'HASH' and $tag ne 'NAMESPACE';
+            next unless ref $tagInfo eq 'HASH' and $tag ne 'NAMESPACE' and $tag ne 'GROUPS';
+            warn "WARNING: $strName Struct containes $tag\n" if $Image::ExifTool::specialTags{$tag};
             my $writable = $$tagInfo{Writable};
             my @vals;
             unless ($writable) {

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

@@ -25,8 +25,9 @@ package Image::ExifTool::Geotag;
 use strict;
 use vars qw($VERSION);
 use Image::ExifTool qw(:Public);
+use Image::ExifTool::GPS;
 
-$VERSION = '1.61';
+$VERSION = '1.62';
 
 sub JITTER() { return 2 }       # maximum time jitter
 
@@ -229,9 +230,41 @@ sub LoadTrackLog($$;$)
                 $format = 'Winplus';
             } elsif (/^\s*\d+\s+.*\sypr\s*$/ and (@tmp=split) == 12) {
                 $format = 'Bramor';
-            } elsif (/\bDate\b/i and /\bTime\b/ and ',') {
+            } elsif (/\b(GPS)?Date/i and /\b(GPS)?(Date)?Time/i and /,/) {
+                chomp;
                 @csvHeadings = split ',';
                 $format = 'CSV';
+                # convert recognized headings to our parameter names
+                foreach (@csvHeadings) {
+                    my $param;
+                    s/^GPS ?//; # remove leading "GPS" to simplify regex patterns
+                    if (/^Date ?Time/i) { # ExifTool addition
+                        $param = 'datetime';
+                    } elsif (/^Date/i) {
+                        $param = 'date';
+                    } elsif (/^Time/i) {
+                        $param = 'time';
+                    } elsif (/^(Pos)?Lat/i) {
+                        $param = 'lat';
+                    } elsif (/^(Pos)?Lon/i) {
+                        $param = 'lon';
+                    } elsif (/^(Pos)?Alt/i) {
+                        $param = 'alt';
+                    } elsif (/^(Angle)?(Heading|Track)/i) {
+                        $param = 'track';
+                    } elsif (/^(Angle)?Pitch/i or /^Camera ?Elevation ?Angle/i) {
+                        $param = 'pitch';
+                    } elsif (/^(Angle)?Roll/i) {
+                        $param = 'roll';
+                    }
+                    if ($param) {
+                        $et->VPrint(2, "CSV column '${_}' is $param\n");
+                        $_ = $param;
+                    } else {
+                        $et->VPrint(2, "CSV column '${_}' ignored\n");
+                        $_ = '';    # ignore this column
+                    }
+                }
                 next;
             } else {
                 # search only first 50 lines of file for a valid fix
@@ -388,35 +421,50 @@ DoneFix:    $isDate = 1;
             # set necessary flags for extra available information
             @$has{qw(alt track orient)} = (1,1,1);
             goto DoneFix;   # save this fix
+        } elsif ($format eq 'CSV') {
+            chomp;
+            my @vals = split ',';
 #
 # CSV format output of GPS/IMU POS system
+#   Date*           - date in DD/MM/YYYY format
+#   Time*           - time in HH:MM:SS.SSS format
+#   [Pos]Lat*       - latitude in decimal degrees
+#   [Pos]Lon*       - longitude in decimal degrees
+#   [Pos]Alt*       - altitude in m relative to sea level
+#   [Angle]Heading* - GPSTrack in degrees true
+#   [Angle]Pitch*   - pitch angle in degrees
+#   [Angle]Roll*    - roll angle in degrees
+# (ExifTool enhancements allow for standard tag names or descriptions as the column headings,
+#  add support for time zones and flexible coordinates, and allow a new DateTime column)
 #
-        } elsif ($format eq 'CSV') {
-            my @vals = split ',';
-            my ($label, $date, $secs);
-            foreach $label (@csvHeadings) {
+            my ($param, $date, $secs);
+            foreach $param (@csvHeadings) {
                 my $val = shift @vals;
                 last unless defined $val;
-                if ($label =~ /^Date/i) {
+                next unless $param;
+                if ($param eq 'datetime') {
+                    local $SIG{'__WARN__'} = sub { };
+                    my $dateTime = $et->InverseDateTime($val);
+                    if ($dateTime) {
+                        $date = Image::ExifTool::GetUnixTime($val, 2);
+                        $secs = 0;
+                    }
+                } elsif ($param eq 'date') {
                     if ($val =~ m{^(\d{2})/(\d{2})/(\d{4})$}) {
                         $date = Time::Local::timegm(0,0,0,$1,$2-1,$3);
+                    } elsif ($val =~ /(\d{4}).*?(\d{2}).*?(\d{2})/) {
+                        $date = Time::Local::timegm(0,0,0,$3,$2-1,$1);
                     }
-                } elsif ($label =~ /^Time/i) {
-                    if ($val =~ /^(\d{1,2}):(\d{2}):(\d{2}(\.\d+)?)/) {
+                } elsif ($param eq 'time') {
+                    if ($val =~ /^(\d{1,2}):(\d{2}):(\d{2}(\.\d+)?).*?(([-+])(\d{1,2}):?(\d{2}))?/) {
                         $secs = (($1 * 60) + $2) * 60 + $3;
+                        # adjust for time zone if specified
+                        $secs += ($7 * 60 + $8) * ($6 eq '-' ? 60 : -60) if $5;
                     }
-                } elsif ($label =~ /^(Pos)?Lat/) {
-                    $$fix{lat} = $val;
-                } elsif ($label =~ /^(Pos)?Lon/) {
-                    $$fix{lon} = $val;
-                } elsif ($label =~ /^(Pos)?Alt/) {
-                    $$fix{alt} = $val;
-                } elsif ($label =~ /^(Angle)?Heading/) {
-                    $$fix{track} = $val;
-                } elsif ($label =~ /^(Angle)?Pitch/) {
-                    $$fix{pitch} = $val;
-                } elsif ($label =~ /^(Angle)?Roll/) {
-                    $$fix{roll} = $val;
+                } elsif ($param eq 'lat' or $param eq 'lon') {
+                    $$fix{$param} = Image::ExifTool::GPS::ToDegrees($val, 1);
+                } else {
+                    $$fix{$param} = $val;
                 }
             }
             if ($date and defined $secs and defined $$fix{lat} and defined $$fix{lon}) {

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

@@ -16,7 +16,7 @@ use Image::ExifTool qw(:DataAccess :Utils);
 use Image::ExifTool::Exif;
 use Image::ExifTool::XMP;
 
-$VERSION = '1.23';
+$VERSION = '1.24';
 
 sub RecoverTruncatedIPTC($$$);
 sub ListToString($);
@@ -629,6 +629,14 @@ sub OverwriteStringList($$$$)
     local $_;
     my ($et, $nvHash, $val, $newValuePt) = @_;
     my (@new, $delIndex);
+    my $writeMode = $et->Options('WriteMode');
+    if ($writeMode ne 'wcg') {
+        if (defined $val) {
+            $writeMode =~ /w/i or return 0;
+        } else {
+            $writeMode =~ /c/i or return 0;
+        }
+    }
     if ($$nvHash{DelValue} and defined $val) {
         # preserve specified old values
         my $old = StringToList($val, $et);

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.46';
+$VERSION = '2.47';
 
 sub ProcessMOV($$;$);
 sub ProcessKeys($$$);
@@ -8229,13 +8229,22 @@ sub HandleItemInfo($)
             my ($start, $subTable, $proc);
             my $pos = $$item{Extents}[0][1] + $base;
             if ($name eq 'EXIF' and length $buff >= 4) {
-                my $n = unpack('N', $buff);
-                $start = 4 + $n; # skip "Exif\0\0" header if it exists
-                $subTable = GetTagTable('Image::ExifTool::Exif::Main');
-                if ($$et{HTML_DUMP}) {
-                    $et->HDump($pos, 4, 'Exif header length', "Value: $n");
-                    $et->HDump($pos+4, $start-4, 'Exif header') if $n;
+                if ($buff =~ /^(MM\0\x2a|II\x2a\0)/) {
+                    $et->Warn('Missing Exif header');
+                    $start = 0;
+                } else {
+                    my $n = unpack('N', $buff);
+                    $start = 4 + $n; # skip "Exif\0\0" header if it exists
+                    if ($start > length($buff)) {
+                        $et->Warn('Invalid EXIF header');
+                        next;
+                    }
+                    if ($$et{HTML_DUMP}) {
+                        $et->HDump($pos, 4, 'Exif header length', "Value: $n");
+                        $et->HDump($pos+4, $start-4, 'Exif header') if $n;
+                    }
                 }
+                $subTable = GetTagTable('Image::ExifTool::Exif::Main');
                 $proc = \&Image::ExifTool::ProcessTIFF;
             } else {
                 $start = 0;

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

@@ -133,6 +133,21 @@ my %insvLimit = (
     SampleTime   => { Groups => { 2 => 'Video' }, PrintConv => 'ConvertDuration($val)', Notes => 'sample decoding time' },
     SampleDuration=>{ Groups => { 2 => 'Video' }, PrintConv => 'ConvertDuration($val)' },
     UserLabel    => { Groups => { 2 => 'Other' } },
+    SampleDateTime => {
+        Groups => { 2 => 'Time' },
+        ValueConv => q{
+            my $str = ConvertUnixTime($val);
+            my $frac = $val - int($val);
+            if ($frac != 0) {
+                $frac = sprintf('%.6f', $frac);
+                $frac =~ s/^0//;
+                $frac =~ s/0+$//;
+                $str .= $frac;
+            }
+            return $str;
+        },
+        PrintConv => '$self->ConvertDateTime($val)',
+    },
 #
 # timed metadata decoded based on MetaFormat (format of 'meta' or 'data' sample description)
 # [or HandlerType, or specific 'vide' type if specified]

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

@@ -29,11 +29,12 @@ use strict;
 use vars qw($VERSION);
 use Image::ExifTool qw(:DataAccess :Utils);
 
-$VERSION = '1.54';
+$VERSION = '1.55';
 
 sub ConvertTimecode($);
 sub ProcessSGLT($$$);
 sub ProcessSLLT($$$);
+sub ProcessLucas($$$);
 
 # recognized RIFF variants
 my %riffType = (
@@ -433,6 +434,14 @@ my %code2charset = (
             Condition => '$$valPt =~ /^PENTDigital Camera/',
             SubDirectory => { TagTable => 'Image::ExifTool::Pentax::Junk2' },
         },
+        {
+            Name => 'LucasJunk', # (Lucas LK-7900 Ace)
+            Condition => '$$valPt =~ /^0G(DA|PS)/',
+            SubDirectory => {
+                TagTable => 'Image::ExifTool::QuickTime::Stream',
+                ProcessProc => \&ProcessLucas,
+            },
+        },
         {
             Name => 'TextJunk',
             # try to interpret unknown junk as an ASCII string
@@ -1621,6 +1630,105 @@ sub ProcessSLLT($$$)
     return 1;
 }
 
+#------------------------------------------------------------------------------
+# Process Lucas streaming GPS information (Lucas LK-7900 Ace) (ref PH)
+# Inputs: 0) ExifTool ref, 1) dirInfo ref, 2) tag table ref
+# Returns: 1 on success
+sub ProcessLucas($$$)
+{
+    my ($et, $dirInfo, $tagTbl) = @_;
+    my $dataPt = $$dirInfo{DataPt};
+    my $dataLen = length $$dataPt;
+
+    unless ($et->Options('ExtractEmbedded')) {
+        $et->Warn('Use ExtractEmbedded option to extract timed GPS', 3);
+        return 1;
+    }
+    my %recLen = (  # record lengths (not including 4-byte ID)
+        '0GDA' => 24,
+        '0GPS' => 48,
+    );
+    my ($date,$time,$lat,$lon,$alt,$spd,$sat,$dop,$ew,$ns);
+    $$et{SET_GROUP0} = $$et{SET_GROUP1} = 'RIFF';
+    while ($$dataPt =~ /(0GDA|0GPS)/g) {
+        my ($rec, $pos) = ($1, pos $$dataPt);
+        $pos + $recLen{$rec} > $dataLen and $et->Warn("Truncated $1 record"), last;
+        $$et{DOC_NUM} = ++$$et{DOC_COUNT};
+        # records start with int64u sample date/time in ms since 1970
+        $et->HandleTag($tagTbl, SampleDateTime => Get64u($dataPt, $pos) / 1000);
+        if ($rec eq '0GPS') {
+            my $len = Get32u($dataPt, $pos+8);
+            my $endPos = $pos + $recLen{$rec} + $len;
+            $endPos > $dataLen and $et->Warn('Truncated 0GPS record'), last;
+            my $buff = substr($$dataPt, $pos+$recLen{$rec}, $len);
+            while ($buff =~ /\$(GC|GA),(\d+),/g) {
+                my $p = pos $buff;
+                $time = $2;
+                if ($1 eq 'GC') {
+                    #     time   date   dist    ? sat dop alt  A
+                    # $GC,052350,180914,0000955,1,08,1.1,0017,,A*45\x0d\x0a\0
+                    if ($buff =~ /\G(\d+),\d*,\d*,(\d+),([-\d.]+),(\d+),\d*,A/g) {
+                        ($date,$sat,$dop,$alt) = ($1,$2,$3,$4);
+                    }
+                } else {
+                    #     time   A lat       lon        spd N W
+                    # $GA,052351,A,0949.6626,07635.4439,049,N,E,*4C\x0d\x0a\0
+                    if ($buff =~ /\GA,([\d.]+),([\d.]+),(\d+),([NS]),([EW])/g) {
+                        ($lat,$lon,$spd,$ns,$ew) = ($1,$2,$3,$4,$5,$6);
+                        # lat/long are in DDDMM.MMMM format
+                        my $deg = int($lat / 100);
+                        $lat = $deg + ($lat - $deg * 100) / 60;
+                        $deg = int($lon / 100);
+                        $lon = $deg + ($lon - $deg * 100) / 60;
+                        $lat *= -1 if $ns eq 'S';
+                        $lon *= -1 if $ew eq 'W';
+                    }
+                }
+                # look ahead to next NMEA-like sentence, and store the fix
+                # now only if the next sentence is not at the same time
+                if ($buff !~ /\$(GC|GA),$time,/g) {
+                    pos($$dataPt) = $endPos;
+                    if ($$dataPt !~ /\$(GC|GA),(\d+)/ or $1 ne $time) {
+                        $time =~ s/(\d{2})(\d{2})(\d{2})/$1:$2:$3Z/;
+                        if ($date) {
+                            $date =~ s/(\d{2})(\d{2})(\d{2})/20$3:$2:$1/;
+                            $et->HandleTag($tagTbl, GPSDateTime => "$date $time");
+                        } else {
+                            $et->HandleTag($tagTbl, GPSTimeStamp => $time);
+                        }
+                        if (defined $lat) {
+                            $et->HandleTag($tagTbl, GPSLatitude => $lat);
+                            $et->HandleTag($tagTbl, GPSLongitude => $lon);
+                            $et->HandleTag($tagTbl, GPSSpeed => $spd);
+                        }
+                        if (defined $alt) {
+                            $et->HandleTag($tagTbl, GPSAltitude => $alt);
+                            $et->HandleTag($tagTbl, GPSSatellites => $sat);
+                            $et->HandleTag($tagTbl, GPSDOP => $dop);
+                        }
+                        undef $lat;
+                        undef $alt;
+                    }
+                }
+                pos($buff) = $p;
+            }
+            $pos += $len;
+        } else { # this is an accelerometer (0GDA) record
+            # record has 4 more int32s values (the last is always 57 or 58 --
+            # maybe related to sample time in ms? -- not extracted)
+            my @acc = unpack('x'.($pos+8).'V3', $$dataPt);
+            # change to signed integer and divide by 256
+            map { $_ = $_ - 4294967296 if $_ >= 0x80000000; $_ /= 256 } @acc;
+            $et->HandleTag($tagTbl, Accelerometer => "@acc");
+        }
+        pos($$dataPt) = $pos + $recLen{$rec};
+    }
+    delete $$et{SET_GROUP0};
+    delete $$et{SET_GROUP1};
+    $$et{DOC_NUM} = 0;
+    return 1;
+}
+
 #------------------------------------------------------------------------------
 # Extract information from a RIFF file
 # Inputs: 0) ExifTool object reference, 1) DirInfo reference

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

@@ -8711,6 +8711,7 @@ my %tagExists = (
 	'lotus' => 1,
 	'lr' => 1,
 	'lslv' => 1,
+	'lucasjunk' => 1,
 	'luminance' => 1,
 	'luminanceconsts' => 1,
 	'lyricist' => 1,
@@ -9965,6 +9966,7 @@ my %tagExists = (
 	'rvmi_srev' => 1,
 	's2n' => 1,
 	'sampleblacksequence' => 1,
+	'sampledatetime' => 1,
 	'sampledegradationpriority' => 1,
 	'sampleduration' => 1,
 	'sampleflag' => 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 23363 tags, with 15305 unique tag names.
+They contain a total of 23364 tags, with 15306 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
@@ -3643,7 +3643,6 @@ is to write ImageRegion as a structure with these tags as new fields.
   GPSAltitude                                   rational
   GPSLatitude                                   string
   GPSLongitude                                  string
-  GROUPS                                        string
   Identifier                                    string+
   LocationId                                    string+
   LocationName                                  lang-alt
@@ -25098,6 +25097,7 @@ formats of timed GPS metadata from video files.
   RVMI_gReV                                     QuickTime RVMI_gReV
   RVMI_sReV                                     QuickTime RVMI_sReV
   RawGSensor                                    no
+  SampleDateTime                                no
   SampleDuration                                no
   SampleTime                                    no
   Text                                          no
@@ -28947,6 +28947,7 @@ sub-documents, but the Duration is calculated for the full video.
                        RicohJunk                Ricoh AVI
                        PentaxJunk               Pentax Junk
                        PentaxJunk2              Pentax Junk2
+                       LucasJunk                QuickTime Stream
                        TextJunk                 no
   'JUNQ'               OldXMP                   no
   'LIST_INF0'          Info                     RIFF Info

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

@@ -499,6 +499,9 @@ sub WriteItemInfo($$$)
             if (not length $buff) {
                 # create EXIF from scratch
                 $hdr = "\0\0\0\x06Exif\0\0";
+            } elsif ($buff =~ /^(MM\0\x2a|II\x2a\0)/) {
+                $et->Warn('Missing Exif header');
+                $hdr = '';
             } elsif (length($buff) >= 4 and length($buff) >= 4 + unpack('N',$buff)) {
                 $hdr = substr($buff, 0, 4 + unpack('N',$buff));
             } else {

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

@@ -359,7 +359,7 @@ sub SetNewValue($;$$%)
     my $convType = $options{Type} || ($$self{OPTIONS}{PrintConv} ? 'PrintConv' : 'ValueConv');
 
     # filter value if necessary
-    Filter($$self{OPTIONS}{FilterW}, \$value) if $convType eq 'PrintConv';
+    $self->Filter($$self{OPTIONS}{FilterW}, \$value) if $convType eq 'PrintConv';
 
     my (@wantGroup, $family2);
     my $wantGroup = $options{Group};
@@ -2967,9 +2967,13 @@ sub InsertTagValues($$$;$$$)
         my (@tags, $val, $tg, @val, $type, $expr, $didExpr, $level, $asList);
         # "$$" represents a "$" symbol, and "$/" is a newline
         if ($var eq '$' or $var eq '/') {
-            $var = "\n" if $var eq '/';
-            $rtnStr .= "$pre$var";
             $line =~ s/^\s*\}// if $bra;
+            if ($var eq '/') {
+                $var = "\n";
+            } elsif ($line =~ /^self\b/ and not $rtnStr =~ /\$$/) {
+                $var = '$$';    # ("$$self{var}" in string)
+            }
+            $rtnStr .= "$pre$var";
             next;
         }
         # allow multiple group names
@@ -3074,6 +3078,8 @@ sub InsertTagValues($$$;$$$)
                             last unless $tag =~ / /;    # all done if we got our best match
                         }
                     }
+                } elsif ($tag eq 'self') {
+                    $val = $self; # ("$self{var}" or "$self->{var}" in string)
                 } else {
                     # get the tag value
                     $val = $self->GetValue($tag, $type);

data/bin/perl-Image-ExifTool.spec

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: exiftool_vendored
 version: !ruby/object:Gem::Version
-  version: 11.94.0
+  version: 11.96.0
 platform: ruby
 authors:
 - Matthew McEachen
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-17 00:00:00.000000000 Z
+date: 2020-04-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: exiftool
@@ -450,8 +450,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: Vendored version of exiftool