exiftool_vendored 13.55.0 → 13.57.1

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

@@ -36,7 +36,7 @@ use vars qw($VERSION);
 use Image::ExifTool qw(:Public);
 use Image::ExifTool::GPS;
 
-$VERSION = '1.87';
+$VERSION = '1.88';
 
 sub JITTER() { return 2 }       # maximum time jitter
 
@@ -103,12 +103,31 @@ my %fixInfoKeys = (
 
 # category for select keys
 my %keyCategory = (
-    dir => 'orient',
+    track => 'track',
+    speed => 'track',
+    alt   => 'alt',
+    dir   => 'orient',
     pitch => 'orient',
-    roll => 'orient',
-    hdop => 'dop',
-    pdop => 'dop',
-    vdop => 'dop',
+    roll  => 'orient',
+    hdop  => 'dop',
+    pdop  => 'dop',
+    vdop  => 'dop',
+);
+
+# list of tags used when geotagging from image/video files,
+# and the corresponding fix information key
+my %tagKey = (
+    GPSDateTime  => 'time',
+    GPSLatitude  => 'lat',
+    GPSLongitude => 'lon',
+    GPSTrack     => 'track',
+    GPSSpeed     => 'speed',
+    GPSAltitude  => 'alt',
+    TimeStamp    => 'time',
+    # the following are needed to generate Composite GPSDateTime tag
+    # since any tag not listed here is ignored
+    GPSTimeStamp => '',
+    GPSDateStamp => '',
 );
 
 # tags which may exist separately in some formats (eg. CSV)
@@ -163,7 +182,7 @@ sub SplitCSV($$)
 }
 
 #------------------------------------------------------------------------------
-# Load GPS track log file
+# Load GPS track log file or read GPS from image/video file
 # Inputs: 0) ExifTool ref, 1) track log data or file name
 # Returns: geotag hash data reference or error string
 # - the geotag hash has the following members:
@@ -175,7 +194,7 @@ sub SplitCSV($$)
 # - the fix information hash may contain:
 #       lat    - signed latitude (required)
 #       lon    - signed longitude (required)
-#       alt    - signed altitude
+#       alt    - signed altitude (m)
 #       time   - fix time in UTC as XML string
 #       fixtype- type of fix ('none'|'2d'|'3d'|'dgps'|'pps')
 #       pdop   - dilution of precision
@@ -277,7 +296,7 @@ sub LoadTrackLog($$;$)
         # determine file format
         if (not $format) {
             s/^\xef\xbb\xbf//;          # remove leading BOM if it exists
-            if (/^\xff\xfe|\xfe\xff/) {
+            if (/^(\xff\xfe|\xfe\xff)/) {
                 return "ExifTool doesn't yet read UTF16-format track logs";
             }
             if (/^<(\?xml|gpx)[\s>]/) { # look for XML or GPX header
@@ -380,6 +399,8 @@ sub LoadTrackLog($$;$)
             } elsif (/"(durationMinutesOffsetFromStartTime|startTime)"\s*:/) {
                 $format = 'JSON';   # new Google Takeout JSON format (fixes seem to be in order)
                 $raf->Seek(0,0);    # rewind to start of file
+            } elsif (/\0/) {
+                last; # (could be an image file)
             } else {
                 # search only first 50 lines of file for a valid fix
                 last if ++$skipped > 50;
@@ -860,6 +881,71 @@ DoneFix:    $isDate = 1;
         push @fixTimes, $time;  # save time of all fixes in order
         ++$numPoints;
     }
+#
+# If the file wasn't a recognized track log, it could be one of the file types
+# supported for reading metadata, so try to extract GPS tags from it
+#
+    unless ($format) {
+        $raf->Seek(0,0);
+        # load track from metadata in file
+        my $et2 = Image::ExifTool->new;
+        $et2->Options(
+            Sort => 'File',
+            IgnoreTags => 'All',
+            RequestTags => join(',',keys %tagKey),
+            PrintConv => 0,
+            KeepUTCTime => 1,
+            ExtractEmbedded => 3,
+            QuickTimeUTC => $et->Options('QuickTimeUTC')
+        );
+        unless ($et2->ExtractInfo($raf)) {
+            $raf->Close();
+            return "Unrecognized file format '${val}'";
+        }
+        my @tags = $et2->GetTagList();
+        my ($tag, $fix, $time, $name);
+        my ($lastGrp, $lastTag) = ('', '');
+        if (@tags) {
+            push @tags, $tags[-1]; # duplicate last tag to act as an end marker
+            $isDate = 1;
+            $sortFixes = 1; # (fixes may not be in order)
+        }
+        foreach $tag (@tags) {
+            my $grp = $et2->GetGroup($tag, 3);
+            if ($grp ne $lastGrp or $tag eq $lastTag) {
+                # add fix to our lookup
+                if ($time and $$fix{lat} and $$fix{lon}) {
+                    if ($$points{$time}) {
+                        # could possibly happen if time jumps around
+                        $$points{$time}{$_} = $$fix{$_} foreach keys %$fix;
+                    } else {
+                        $$points{$time} = $fix;
+                        # convert speed to knots
+                        $$fix{speed} and $$fix{speed} /= $speedConv{K};
+                        push @fixTimes, $time;  # save time of all fixes in order
+                        ++$numPoints;
+                    }
+                }
+                $lastGrp = $grp;
+                undef $time;
+                $fix = { };
+            }
+            $lastTag = $tag;
+            ($name = $tag) =~ s/ .*//;
+            my $key = $tagKey{$name};
+            unless ($key) {
+                defined $key or $et->Warn("Internal error with tag name $key $name ($tag)");
+                next;
+            }
+            my $val = $et2->GetValue($tag);
+            if ($key eq 'time') {
+                $time = Image::ExifTool::GetUnixTime($val) unless $time;
+            } elsif (not defined $$fix{$key}) {
+                $$fix{$key} = $val;
+                $$has{$keyCategory{$key}} = 1 if $keyCategory{$key};
+            }
+        }
+    }
     $raf->Close();
 
     # set date flags
@@ -1645,9 +1731,11 @@ This module is used by Image::ExifTool
 This module loads GPS track logs, interpolates to determine position based
 on time, and sets new GPS values for geotagging images.  Currently supported
 formats are GPX, NMEA RMC/GGA/GLL/GSA/ZDA, KML, IGC, Garmin XML and TCX,
-Magellan PMGNTRK, Honeywell PTNTHPR, Bramor gEO, Winplus Beacon text,
-GPS/IMU CSV, DJI/Columbus/ExifTool CSV format and 3 different Google JSON
-formats.
+Magellan PMGNTRK, Honeywell PTNTHPR, Bramor gEO, Winplus Beacon text, Garmin
+FIT, GPS/IMU CSV, DJI/Columbus/ExifTool CSV format and 3 different Google
+JSON formats.  As well, ExifTool can geotag from any supported file or set
+of files containing GPS metadata provided that GPSDateTime, GPSLatitude and
+GPSLongitude are available.
 
 Methods in this module should not be called directly.  Instead, the Geotag
 feature is accessed by writing the values of the ExifTool Geotag, Geosync

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

@@ -33,6 +33,7 @@ my %sPose = (
     RotationZ => { Writable => 'real', Groups => { 2 => 'Location' } },
     RotationW => { Writable => 'real', Groups => { 2 => 'Location' } },
     Timestamp => {
+        Name => 'TimeStamp',
         Writable => 'integer',
         Shift => 'Time',
         Groups => { 2 => 'Time' },
@@ -72,6 +73,7 @@ my %sEarthPose = (
     RotationZ => { Writable => 'real', Groups => { 2 => 'Location' } },
     RotationW => { Writable => 'real', Groups => { 2 => 'Location' } },
     Timestamp => {
+        Name => 'TimeStamp',
         Writable => 'integer',
         Shift => 'Time',
         Groups => { 2 => 'Time' },

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

@@ -188,6 +188,8 @@ my %convCelsius = ( PrintConv => 'sprintf("%.2f C", $val)' );
     0x2c4 => { Name => 'VisibleFocalLength',        Format => 'float' },
 );
 
+1; # end
+
 __END__
 
 =head1 NAME

data/bin/lib/Image/ExifTool/Lang/de.pm

@@ -1299,7 +1299,7 @@ $VERSION = '1.38';
     },
    'BabyAge' => 'Kindesalter',
    'BabyName' => 'Kindesname',
-   'BackLight' => 'Hintergrundbeleuchtung',
+   'Backlight' => 'Hintergrundbeleuchtung',
    'BackgroundColor' => 'Hintergrundfarbe',
    'BackgroundColorIndicator' => 'Indikator Hintergrundfarbe',
    'BackgroundColorValue' => 'Hintergrundfarbwert',

data/bin/lib/Image/ExifTool/Lang/fr.pm

@@ -1234,7 +1234,7 @@ $VERSION = '1.37';
     },
    'BabyAge' => 'Âge du bébé',
    'BabyName' => 'Nom du bébé',
-   'BackLight' => {
+   'Backlight' => {
       Description => 'Contre-jour',
       PrintConv => {
         'Back Lit 1' => 'Rétroéclairage 1',

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

@@ -2296,7 +2296,7 @@ my %componentDataDef = (
   # '060e2b34.0104.0101.03010602.00000000' => { Name => 'Minutes' },
   # '060e2b34.0104.0101.03010603.00000000' => { Name => 'Seconds' },
   # '060e2b34.0104.0101.03010604.00000000' => { Name => 'msBy4' },
-  # '060e2b34.0104.0101.03010700.00000000' => { Name => 'Timestamp' },
+  # '060e2b34.0104.0101.03010700.00000000' => { Name => 'TimeStamp' },
   # '060e2b34.0104.0101.04010100.00000000' => { Name => 'UInt8Array' },
   # '060e2b34.0104.0101.04010300.00000000' => { Name => 'Int32Array' },
   # '060e2b34.0104.0101.04010400.00000000' => { Name => 'Int64Array' },

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

@@ -108,7 +108,7 @@ my $debug;          # set to 1 to enable debugging code
     {
         Name => 'MakerNoteFLIR',
         # (starts with IFD, Make is 'FLIR Systems AB' or 'FLIR Systems')
-        Condition => '$$self{Make} =~ /^FLIR Systems/',
+        Condition => '$$self{Make} =~ /^(FLIR Systems|Teledyne FLIR)/',
         SubDirectory => {
             TagTable => 'Image::ExifTool::FLIR::Main',
             Start => '$valuePtr',

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

@@ -361,6 +361,7 @@ my %shootingMode = (
                 '16 0'  => '1-area', # (FZ8)
                 '16 16' => '1-area (high speed)', # (FZ8)
                 '16 32' => '1-area +', #forum16903 (G9M2)
+                '16 225'=> '225-area 2', #forum16903 (S5D)
                 '17 0'  => 'Full Area', #forum16903 (G9M2)
                 # '32 0' is Face Detect for FS7, and Face Detect or Focus Tracking
                 # for the DMC-FZ200 (ref 17), and Auto is DMC-L1 guess,

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

@@ -279,6 +279,8 @@ sub ProcessProtobuf($$$;$)
     return 1;
 }
 
+1; # end
+
 __END__
 
 =head1 NAME

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

@@ -49,7 +49,7 @@ use Image::ExifTool qw(:DataAccess :Utils);
 use Image::ExifTool::Exif;
 use Image::ExifTool::GPS;
 
-$VERSION = '3.33';
+$VERSION = '3.34';
 
 sub ProcessMOV($$;$);
 sub ProcessKeys($$$);
@@ -9588,7 +9588,7 @@ sub ProcessMetaData($$$)
         my $tag  = Get32u($dataPt, $pos + 2);
         my $lang = Get16u($dataPt, $pos + 6);
         my $enc  = Get16u($dataPt, $pos + 8);
-        my $val  = substr($$dataPt, $pos + 10, $size);
+        my $val  = substr($$dataPt, $pos + 10, $size - 10);
         my $tagInfo = $et->GetTagInfo($tagTablePtr, $tag);
         if ($tagInfo) {
             # convert language code to ASCII (ignore read-only bit)

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

@@ -111,7 +111,7 @@ my %insvLimit = (
         The tags below are extracted from timed metadata in QuickTime and other
         formats of video files when the ExtractEmbedded option is used.  Although
         most of these tags are combined into the single table below, ExifTool
-        currently reads 122 different types of timed GPS metadata from video files.
+        currently reads 123 different types of timed GPS metadata.
     },
     GPSLatitude  => { PrintConv => 'Image::ExifTool::GPS::ToDMS($self, $val, 1, "N")', RawConv => '$$self{FoundGPSLatitude} = 1; $val' },
     GPSLongitude => { PrintConv => 'Image::ExifTool::GPS::ToDMS($self, $val, 1, "E")' },

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

@@ -1654,6 +1654,7 @@ sub CalcDuration($@)
         # FujiFilm REAL 3D AVI's), but the video stream information isn't reliable for
         # some cameras (eg. Olympus FE models), so use the video stream information
         # only if the RIFF header duration is 2 to 3 times longer
+        # (also see https://github.com/exiftool/exiftool/issues/371)
         my $dur1;
         $dur1 = $val[1] / $val[0] if $val[0];
         if ($val[2] and $val[3]) {

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

@@ -698,6 +698,8 @@ my %convUnicode = (
     0x95 => { Name => 'FileNumber',         Format => 'int16u' },
 );
 
+1; # end
+
 __END__
 
 =head1 NAME

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

@@ -1593,7 +1593,7 @@ my %tagLookup = (
 	'chromaticaberrationb' => { 536 => 'ChromaticAberrationB', 538 => 'ChromaticAberrationB' },
 	'chromaticaberrationblue' => { 111 => 0x20708, 117 => 0x6b },
 	'chromaticaberrationcorr' => { 86 => [0x4,0x5] },
-	'chromaticaberrationcorrection' => { 127 => 0x7034, 400 => 0x1, 518 => 0x900d },
+	'chromaticaberrationcorrection' => { 127 => [0x7034,0xa410], 400 => 0x1, 518 => 0x900d },
 	'chromaticaberrationcorrparams' => { 127 => 0x7035, 512 => 0x66a, 513 => [0x37c,0x384,0x39c,0x3b0,0x3b8] },
 	'chromaticaberrationon' => { 111 => '0x20703.0', 117 => 0x62 },
 	'chromaticaberrationr' => { 536 => 'ChromaticAberrationR', 538 => 'ChromaticAberrationR' },
@@ -2536,6 +2536,8 @@ my %tagLookup = (
 	'destinationcitycode' => { 418 => 0x1001 },
 	'destinationdst' => { 411 => 0x26, 417 => '0.3' },
 	'developmentdynamicrange' => { 135 => 0x1403 },
+	'developmenttype' => { 127 => 0xa40d },
+	'developmenttypedescription' => { 127 => 0xa40e },
 	'deviantmatrixcustom' => { 157 => 0x7de },
 	'deviantmatrixdaylight' => { 157 => 0x7da },
 	'deviantmatrixflash' => { 157 => 0x7dd },
@@ -2630,7 +2632,7 @@ my %tagLookup = (
 	'distortion' => { 454 => 0xa050 },
 	'distortioncompensation' => { 518 => 0x8040 },
 	'distortioncontrol' => { 289 => 0x10 },
-	'distortioncorrection' => { 86 => 0x3, 111 => 0x20705, 117 => 0x67, 127 => 0x7036, 233 => 0x4, 347 => 0x50b, 376 => '7.1', 400 => 0x0, 512 => 0x601, 513 => 0x5b },
+	'distortioncorrection' => { 86 => 0x3, 111 => 0x20705, 117 => 0x67, 127 => [0x7036,0xa40f], 233 => 0x4, 347 => 0x50b, 376 => '7.1', 400 => 0x0, 512 => 0x601, 513 => 0x5b },
 	'distortioncorrection2' => { 351 => 0x1011 },
 	'distortioncorrectionalreadyapplied' => { 533 => 'DistortionCorrectionAlreadyApplied' },
 	'distortioncorrectionon' => { 111 => '0x20705.0', 117 => 0x63 },
@@ -4224,6 +4226,7 @@ my %tagLookup = (
 	'lcdmatrixmarvin' => { 157 => 0xe76 },
 	'lcdpanels' => { 91 => 0x8 },
 	'lcheditor' => { 318 => 0x8ae85e },
+	'learningoptoutin' => { 127 => 0x9287 },
 	'legacyiptcdigest' => { 554 => 'LegacyIPTCDigest' },
 	'legalcode' => { 534 => 'legalcode' },
 	'lens' => { 127 => 0xfdea, 258 => 0x84, 533 => 'Lens' },
@@ -5205,7 +5208,7 @@ my %tagLookup = (
 	'nikonsettings' => { 258 => 0x4e },
 	'noisefilter' => { 347 => 0x527 },
 	'noiseprofile' => { 127 => 0xc761 },
-	'noisereduction' => { 135 => [0x100b,0x100e], 201 => 0xb0, 202 => 0x60, 203 => 0x3f, 258 => 0x95, 318 => 0x753dcbc0, 319 => 0x17, 347 => 0x50a, 352 => 0x103a, 372 => 0x2d, 411 => 0x49, 447 => 0x100f, 449 => 0x2a },
+	'noisereduction' => { 127 => 0xa412, 135 => [0x100b,0x100e], 201 => 0xb0, 202 => 0x60, 203 => 0x3f, 258 => 0x95, 318 => 0x753dcbc0, 319 => 0x17, 347 => 0x50a, 352 => 0x103a, 372 => 0x2d, 411 => 0x49, 447 => 0x100f, 449 => 0x2a },
 	'noisereduction2' => { 351 => 0x1010 },
 	'noisereductionapplied' => { 127 => 0xc6f7 },
 	'noisereductionintensity' => { 319 => 0x9 },
@@ -6656,6 +6659,7 @@ my %tagLookup = (
 	'setting' => { 555 => 'setting' },
 	'shadingcompensation' => { 347 => 0x50c, 372 => 0x8a },
 	'shadingcompensation2' => { 351 => 0x1012 },
+	'shadingcorrection' => { 127 => 0xa411 },
 	'shadow' => { 457 => 0xe },
 	'shadowadj' => { 111 => 0x2030b },
 	'shadowcorrection' => { 411 => 0x79 },