exiftool_vendored 9.53.0 → 9.58.0

data/bin/{Image-ExifTool-9.53 → Image-ExifTool-9.58}/lib/Image/ExifTool/Exif.pm

@@ -51,7 +51,7 @@ use vars qw($VERSION $AUTOLOAD @formatSize @formatName %formatNumber %intFormat
 use Image::ExifTool qw(:DataAccess :Utils);
 use Image::ExifTool::MakerNotes;
 
-$VERSION = '3.62';
+$VERSION = '3.64';
 
 sub ProcessExif($$$);
 sub WriteExif($$$);
@@ -1190,7 +1190,9 @@ my %sampleFormat = (
         Format => 'undef',
         Notes => q{
             may contain copyright notices for photographer and editor, separated by a
-            newline in ExifTool
+            newline.  As per the EXIF specification, the newline is replaced by a null
+            byte when writing to file, but this may be avoided by disabling the print
+            conversion
         },
         # internally the strings are separated by a null character in this format:
         # Photographer only: photographer + NULL
@@ -1859,6 +1861,8 @@ my %sampleFormat = (
         PrintConv => {
             0 => 'Normal',
             1 => 'Custom',
+            # 4 - Apple iPhone5c horizontal orientation
+            # 6 - Apple iPhone5c panorama
         },
     },
     0xa402 => {
@@ -1868,7 +1872,7 @@ my %sampleFormat = (
             0 => 'Auto',
             1 => 'Manual',
             2 => 'Auto bracket',
-            # have seen 3 from Samsung EX1 and NX200 - PH
+            # have seen 3 from Samsung EX1, NX30, NX200 - PH
         },
     },
     0xa403 => {
@@ -1901,6 +1905,7 @@ my %sampleFormat = (
             1 => 'Landscape',
             2 => 'Portrait',
             3 => 'Night',
+            # 4 - HDR (Samsung GT-I9300)
         },
     },
     0xa407 => {
@@ -3780,7 +3785,9 @@ sub ProcessExif($$$)
         if ($dirSize > $dirLen) {
             if ($verbose > 0 and not $$dirInfo{SubIFD}) {
                 my $short = $dirSize - $dirLen;
+                $$et{INDENT} =~ s/..$//; # keep indent the same
                 $et->Warn("Short directory size (missing $short bytes)");
+                $$et{INDENT} .= '| ';
             }
             undef $dirSize if $dirEnd > $dataLen; # read from file if necessary
         }
@@ -3869,7 +3876,7 @@ sub ProcessExif($$$)
 
     # loop through all entries in an EXIF directory (IFD)
     my ($index, $valEnd, $offList, $offHash);
-    my $warnCount = 0;
+    my ($warnCount, $lastID) = (0, -1);
     for ($index=0; $index<$numEntries; ++$index) {
         if ($warnCount > 10) {
             $et->Warn("Too many warnings -- $name parsing aborted", 2) and return 0;
@@ -4128,8 +4135,10 @@ sub ProcessExif($$$)
             # (avoids long delays when processing some corrupted files)
             if ($count > 100000 and $formatStr !~ /^(undef|string|binary)$/) {
                 my $tagName = $tagInfo ? $$tagInfo{Name} : sprintf('tag 0x%.4x', $tagID);
-                my $minor = $count > 2000000 ? 0 : 2;
-                next if $et->Warn("Ignoring $dirName $tagName with excessive count", $minor);
+                if ($tagName ne 'TransferFunction' or $count ne 196608) {
+                    my $minor = $count > 2000000 ? 0 : 2;
+                    next if $et->Warn("Ignoring $dirName $tagName with excessive count", $minor);
+                }
             }
             # convert according to specified format
             $val = ReadValue($valueDataPt,$valuePtr,$formatStr,$count,$readSize,\$rational);
@@ -4178,6 +4187,8 @@ sub ProcessExif($$$)
                     $colName = $tagName;
                 }
                 $colName .= ' <span class=V>(err)</span>' if $wrongFormat;
+                $colName .= ' <span class=V>(seq)</span>' if $tagID <= $lastID and not $inMakerNotes;
+                $lastID = $tagID;
                 if (not defined $tval) {
                     $tval = '<bad size/offset>';
                 } else {
@@ -4216,6 +4227,10 @@ sub ProcessExif($$$)
                     $et->HDump($exifDumpPos,$size,"$tagName value",'SAME', $flag);
                 }
             } else {
+                if ($tagID <= $lastID and not $inMakerNotes) {
+                    $et->Warn(sprintf('Tag ID 0x%.4x out of sequence in %s', $tagID, $dirName));
+                }
+                $lastID = $tagID;
                 my $fstr = $formatName[$format];
                 $fstr = "$origFormStr read as $fstr" if $origFormStr;
                 $et->VerboseInfo($tagID, $tagInfo,

data/bin/{Image-ExifTool-9.53 → Image-ExifTool-9.58}/lib/Image/ExifTool/FLAC.pm

@@ -14,7 +14,7 @@ use strict;
 use vars qw($VERSION);
 use Image::ExifTool qw(:DataAccess :Utils);
 
-$VERSION = '1.05';
+$VERSION = '1.06';
 
 sub ProcessBitStream($$$);
 
@@ -122,7 +122,7 @@ sub ProcessBitStream($$$);
             0 => 'FLAC:SampleRate',
             1 => 'FLAC:TotalSamples',
         },
-        ValueConv => '$val[0] and $val[1] ? $val[1] / $val[0] : undef',
+        ValueConv => '($val[0] and $val[1]) ? $val[1] / $val[0] : undef',
         PrintConv => 'ConvertDuration($val)',
     },
 );

data/bin/{Image-ExifTool-9.53 → Image-ExifTool-9.58}/lib/Image/ExifTool/FLIR.pm

@@ -23,7 +23,7 @@ use vars qw($VERSION);
 use Image::ExifTool qw(:DataAccess :Utils);
 use Image::ExifTool::Exif;
 
-$VERSION = '1.08';
+$VERSION = '1.10';
 
 sub ProcessFLIR($$;$);
 sub ProcessFLIRText($$$);
@@ -45,6 +45,7 @@ my %floatKelvin = (
 # commonly used tag information elements
 my %float1f = ( Format => 'float', PrintConv => 'sprintf("%.1f",$val)' );
 my %float2f = ( Format => 'float', PrintConv => 'sprintf("%.2f",$val)' );
+my %float6f = ( Format => 'float', PrintConv => 'sprintf("%.6f",$val)' );
 my %float8g = ( Format => 'float', PrintConv => 'sprintf("%.8g",$val)' );
 
 # FLIR makernotes tags (ref PH)
@@ -93,10 +94,15 @@ my %float8g = ( Format => 'float', PrintConv => 'sprintf("%.8g",$val)' );
 %Image::ExifTool::FLIR::FFF = (
     GROUPS => { 0 => 'APP1', 2 => 'Image' },
     PROCESS_PROC => \&ProcessFLIR,
+    VARS => { ALPHA_FIRST => 1 },
     NOTES => q{
         Information extracted from FLIR FFF images and the FLIR APP1 segment of JPEG
         images.  These tags may also be extracted from the first frame of an FLIR
-        SEQ file, even though SEQ is not listed as a supported file type.
+        SEQ file.
+    },
+    "_header" => {
+        Name => 'FFFHeader',
+        SubDirectory => { TagTable => 'Image::ExifTool::FLIR::Header' },
     },
     # 0 = free (ref 3)
     0x01 => {
@@ -173,6 +179,15 @@ my %float8g = ( Format => 'float', PrintConv => 'sprintf("%.8g",$val)' );
     },
 );
 
+# FFF file header (ref PH)
+%Image::ExifTool::FLIR::Header = (
+    GROUPS => { 0 => 'APP1', 2 => 'Image' },
+    PROCESS_PROC => \&Image::ExifTool::ProcessBinaryData,
+    FIRST_ENTRY => 0,
+    NOTES => 'Tags extracted from the FLIR FFF/AFF header.',
+    4 => { Name => 'CreatorSoftware', Format => 'string[16]' },
+);
+
 # FLIR raw data record (ref PH)
 %Image::ExifTool::FLIR::RawData = (
     GROUPS => { 0 => 'APP1', 2 => 'Image' },
@@ -393,11 +408,11 @@ my %float8g = ( Format => 'float', PrintConv => 'sprintf("%.8g",$val)' );
     0x5c => { Name => 'PlanckB',  %float8g }, #1
     0x60 => { Name => 'PlanckF',  %float8g }, #1
     # 0x64,0x68,0x6c: 0
-    # 0x70 - float: 0.006568
-    # 0x74 - float: 0.012620
-    # 0x78 - float: -0.00227
-    # 0x7c - float: -0.00667
-    # 0x80 - float: 1.89999
+    0x070 => { Name => 'AtmosphericTransAlpha1', %float6f }, #1 (value: 0.006569)
+    0x074 => { Name => 'AtmosphericTransAlpha2', %float6f }, #1 (value: 0.012620)
+    0x078 => { Name => 'AtmosphericTransBeta1',  %float6f }, #1 (value: -0.002276)
+    0x07C => { Name => 'AtmosphericTransBeta2',  %float6f }, #1 (value: -0.006670)
+    0x080 => { Name => 'AtmosphericTransX',      %float6f }, #1 (value: 1.900000)
     # 0x84,0x88: 0
     # 0x8c - float: 0,4,6
     0x90 => { Name => 'CameraTemperatureRangeMax', %floatKelvin },
@@ -1119,6 +1134,59 @@ my %float8g = ( Format => 'float', PrintConv => 'sprintf("%.8g",$val)' );
     15 => { Name => 'UnknownTemperature2', %floatKelvin, Unknown => 1 }, # (60.0 C)
 );
 
+# FLIR AFF tag table (ref PH)
+%Image::ExifTool::FLIR::AFF = (
+    GROUPS => { 0 => 'FLIR', 1 => 'FLIR', 2 => 'Image' },
+    NOTES => 'Tags extracted from FLIR "AFF" SEQ images.',
+    VARS => { ALPHA_FIRST => 1 },
+    "_header" => {
+        Name => 'AFFHeader',
+        SubDirectory => { TagTable => 'Image::ExifTool::FLIR::Header' },
+    },
+    0x01 => {
+        Name => 'AFF1',
+        SubDirectory => { TagTable => 'Image::ExifTool::FLIR::AFF1' },
+    },
+    0x05 => {
+        Name => 'AFF5',
+        SubDirectory => { TagTable => 'Image::ExifTool::FLIR::AFF5' },
+    },
+);
+
+# AFF record type 1 (ref forum?topic=4898.msg27627)
+%Image::ExifTool::FLIR::AFF1 = (
+    GROUPS => { 0 => 'FLIR', 1 => 'FLIR', 2 => 'Camera' },
+    PROCESS_PROC => \&Image::ExifTool::ProcessBinaryData,
+    FORMAT => 'int16u',
+    FIRST_ENTRY => 0,
+    0x00 => {
+        # use this tag only to determine the byte order of the raw data
+        # (the value should be 0x0002 if the byte order is correct)
+        Name => 'RawDataByteOrder',
+        Hidden => 1,
+        RawConv => 'ToggleByteOrder() if $val >= 0x0100; undef',
+    },
+    0x01 => { Name => 'SensorWidth',  Format => 'int16u' },
+    0x02 => { Name => 'SensorHeight', Format => 'int16u' },
+);
+
+# AFF record type 5 (ref forum?topic=4898.msg27628)
+%Image::ExifTool::FLIR::AFF5 = (
+    GROUPS => { 0 => 'FLIR', 1 => 'FLIR', 2 => 'Camera' },
+    PROCESS_PROC => \&Image::ExifTool::ProcessBinaryData,
+    FORMAT => 'int16u',
+    FIRST_ENTRY => 0,
+    0x12 => {
+        # use this tag only to determine the byte order of the raw data
+        # (the value should be 0x0002 if the byte order is correct)
+        Name => 'RawDataByteOrder',
+        Hidden => 1,
+        RawConv => 'ToggleByteOrder() if $val >= 0x0100; undef',
+    },
+    0x13 => { Name => 'SensorWidth',  Format => 'int16u' },
+    0x14 => { Name => 'SensorHeight', Format => 'int16u' },
+);
+
 # FLIR composite tags (ref 1)
 %Image::ExifTool::FLIR::Composite = (
     GROUPS => { 1 => 'FLIR', 2 => 'Camera' },
@@ -1290,17 +1358,19 @@ sub ProcessFLIR($$;$)
     my $raf = $$dirInfo{RAF} || new File::RandomAccess($$dirInfo{DataPt});
     my $verbose = $et->Options('Verbose');
     my $out = $et->Options('TextOut');
-    my ($i, $buff, $rec);
+    my ($i, $hdr, $buff, $rec);
 
     # read and verify FFF header
-    $raf->Read($buff, 0x40) == 0x40 and $buff =~ /^FFF\0/ or return 0;
+    $raf->Read($hdr, 0x40) == 0x40 and $hdr =~ /^([AF]FF)\0/ or return 0;
+
+    my $type = $1;
 
-    # set file type if reading from FFF file ($tagTablePtr will not be defined)
-    $et->SetFileType() unless $tagTablePtr;
+    # set file type if reading from FFF or SEQ file ($tagTablePtr will not be defined)
+    $et->SetFileType($type eq 'FFF' ? 'FLIR' : 'SEQ') unless $tagTablePtr;
 
     # FLIR file header (ref 3)
     # 0x00 - string[4] file format ID = "FFF\0"
-    # 0x04 - string[16] file origin: seen "\0","MTX IR\0","CAMCTRL\0"
+    # 0x04 - string[16] file creator: seen "\0","MTX IR\0","CAMCTRL\0"
     # 0x14 - int32u file format version = 100
     # 0x18 - int32u offset to record directory
     # 0x1c - int32u number of entries in record directory
@@ -1312,25 +1382,32 @@ sub ProcessFLIR($$;$)
 
     # determine byte ordering by validating version number
     # (in my samples FLIR APP1 is big-endian, FFF files are little-endian)
-    my $ver = Get32u(\$buff, 0x14);
+    my $ver = Get32u(\$hdr, 0x14);
     if ($ver != 100) {
-        $ver == 0x64000000 or $et->Warn('Unsupported FLIR FFF version'), return 1;
+        $ver == 0x64000000 or $et->Warn("Unsupported FLIR $type version"), return 1;
         ToggleByteOrder();
     }
 
     # read the FLIR record directory
-    my $pos = Get32u(\$buff, 0x18);
-    my $num = Get32u(\$buff, 0x1c);
+    my $pos = Get32u(\$hdr, 0x18);
+    my $num = Get32u(\$hdr, 0x1c);
     unless ($raf->Seek($pos) and $raf->Read($buff, $num * 0x20) == $num * 0x20) {
         $et->Warn('Truncated FLIR FFF directory');
         return 1;
     }
 
     unless ($tagTablePtr) {
-        $tagTablePtr = GetTagTable('Image::ExifTool::FLIR::FFF');
+        $tagTablePtr = GetTagTable("Image::ExifTool::FLIR::$type");
         $$et{SET_GROUP0} = 'FLIR'; # (set group 0 to 'FLIR' for FFF files)
     }
 
+    # process the header data
+    $et->HandleTag($tagTablePtr, '_header', $hdr);
+
+    my $oldIndent = $$et{INDENT};
+    $$et{INDENT} .= '| ';
+    $et->VerboseDir($type, $num);
+
     for ($i=0; $i<$num; ++$i) {
 
         # FLIR record entry (ref 3):
@@ -1363,6 +1440,7 @@ sub ProcessFLIR($$;$)
                 DataPos => $recPos,
                 Start   => 0,
                 Size    => $recLen,
+                Index => $i,
             );
         } elsif ($verbose > 2) {
             my %parms = ( DataPos => $recPos, Prefix => $$et{INDENT} );
@@ -1371,6 +1449,7 @@ sub ProcessFLIR($$;$)
         }
     }
     delete $$et{SET_GROUP0};
+    $$et{INDENT} = $oldIndent;
     return 1;
 }
 

data/bin/{Image-ExifTool-9.53 → Image-ExifTool-9.58}/lib/Image/ExifTool/FlashPix.pm

@@ -1361,7 +1361,7 @@ sub ProcessFPXR($$$)
     my $verbose = $et->Options('Verbose');
 
     if ($dirLen < 13) {
-        $et->Warn('FPXR segment to small');
+        $et->Warn('FPXR segment too small');
         return 0;
     }
 

data/bin/{Image-ExifTool-9.53 → Image-ExifTool-9.58}/lib/Image/ExifTool/Geotag.pm

@@ -22,7 +22,7 @@ use strict;
 use vars qw($VERSION);
 use Image::ExifTool qw(:Public);
 
-$VERSION = '1.40';
+$VERSION = '1.41';
 
 sub JITTER() { return 2 }       # maximum time jitter
 
@@ -112,7 +112,7 @@ sub LoadTrackLog($$;$)
     my ($et, $val) = @_;
     my ($raf, $from, $time, $isDate, $noDate, $noDateChanged, $lastDate, $dateFlarm);
     my ($nmeaStart, $fixSecs, @fixTimes, $lastFix, %nmea);
-    my ($canCut, $cutPDOP, $cutHDOP, $cutSats);
+    my ($canCut, $cutPDOP, $cutHDOP, $cutSats, $e0, $e1);
 
     unless (eval { require Time::Local }) {
         return 'Geotag feature requires Time::Local installed';
@@ -253,32 +253,35 @@ sub LoadTrackLog($$;$)
                         $td = 1;
                     }
                     # validate and store GPS fix
-                    if (defined $$fix{lat} and defined $$fix{lon} and $$fix{'time'} and
-                        $$fix{lat} =~ /^[+-]?\d+\.?\d*/ and
-                        $$fix{lon} =~ /^[+-]?\d+\.?\d*/ and
-                        $$fix{'time'} =~ /^(\d{4})-(\d+)-(\d+)T(\d+):(\d+):(\d+)(\.\d+)?(.*)/)
-                    {
-                        $time = Time::Local::timegm($6,$5,$4,$3,$2-1,$1-1900);
-                        $time += $7 if $7;  # add fractional seconds
-                        my $tz = $8;
-                        # adjust for time zone (otherwise assume UTC)
-                        # - allow timezone of +-HH:MM, +-H:MM, +-HHMM or +-HH since
-                        #   the spec is unclear about timezone format
-                        if ($tz =~ /^([-+])(\d+):(\d{2})\b/ or $tz =~ /^([-+])(\d{2})(\d{2})?\b/) {
-                            $tz = ($2 * 60 + ($3 || 0)) * 60;
-                            $tz *= -1 if $1 eq '+'; # opposite sign to change back to UTC
-                            $time += $tz;
-                        }
-                        # validate altitude
-                        undef $$fix{alt} if defined $$fix{alt} and $$fix{alt} !~ /^[+-]?\d+\.?\d*/;
-                        $isDate = 1;
-                        $canCut= 1 if defined $$fix{pdop} or defined $$fix{hdop} or defined $$fix{nsats};
-                        $$has{alt} = 1 if $$fix{alt};   # set "has altitude" flag if appropriate
-                        $$points{$time} = $fix;
-                        push @fixTimes, $time;  # save times of all fixes in order
-                        $fix = { };
-                        ++$numPoints;
+                    next unless defined $$fix{lat} and defined $$fix{lon} and $$fix{'time'};
+                    unless ($$fix{lat} =~ /^[+-]?\d+\.?\d*/ and $$fix{lon} =~ /^[+-]?\d+\.?\d*/) {
+                        $e0 or $et->VPrint(0, "Coordinate format error in $from\n"), $e0 = 1;
+                        next;
+                    }
+                    unless ($$fix{'time'} =~ /^(\d{4})-(\d+)-(\d+)T(\d+):(\d+):(\d+)(\.\d+)?(.*)/) {
+                        $e1 or $et->VPrint(0, "Timestamp format error in $from\n"), $e1 = 1;
+                        next;
+                    }
+                    $time = Time::Local::timegm($6,$5,$4,$3,$2-1,$1-1900);
+                    $time += $7 if $7;  # add fractional seconds
+                    my $tz = $8;
+                    # adjust for time zone (otherwise assume UTC)
+                    # - allow timezone of +-HH:MM, +-H:MM, +-HHMM or +-HH since
+                    #   the spec is unclear about timezone format
+                    if ($tz =~ /^([-+])(\d+):(\d{2})\b/ or $tz =~ /^([-+])(\d{2})(\d{2})?\b/) {
+                        $tz = ($2 * 60 + ($3 || 0)) * 60;
+                        $tz *= -1 if $1 eq '+'; # opposite sign to change back to UTC
+                        $time += $tz;
                     }
+                    # validate altitude
+                    undef $$fix{alt} if defined $$fix{alt} and $$fix{alt} !~ /^[+-]?\d+\.?\d*/;
+                    $isDate = 1;
+                    $canCut= 1 if defined $$fix{pdop} or defined $$fix{hdop} or defined $$fix{nsats};
+                    $$has{alt} = 1 if $$fix{alt};   # set "has altitude" flag if appropriate
+                    $$points{$time} = $fix;
+                    push @fixTimes, $time;  # save times of all fixes in order
+                    $fix = { };
+                    ++$numPoints;
                 }
             }
             # last ditch check KML description for timestamp (assume it is UTC)
@@ -546,7 +549,8 @@ sub LoadTrackLog($$;$)
     my $verbose = $et->Options('Verbose');
     if ($verbose) {
         my $out = $et->Options('TextOut');
-        print $out "Loaded $numPoints points from GPS track log $from\n";
+        $format or $format = 'unknown';
+        print $out "Loaded $numPoints points from $format-format GPS track log $from\n";
         print $out "Ignored $cutPDOP points due to GeoMaxPDOP cut\n" if $cutPDOP;
         print $out "Ignored $cutHDOP points due to GeoMaxHDOP cut\n" if $cutHDOP;
         print $out "Ignored $cutSats points due to GeoMinSats cut\n" if $cutSats;