exiftool_vendored 10.01.0 → 10.04.0

data/bin/{Image-ExifTool-10.01 → Image-ExifTool-10.04}/lib/Image/ExifTool/EXE.pm

@@ -21,7 +21,7 @@ use strict;
 use vars qw($VERSION);
 use Image::ExifTool qw(:DataAccess :Utils);
 
-$VERSION = '1.11';
+$VERSION = '1.12';
 
 sub ProcessPEResources($$);
 sub ProcessPEVersion($$);
@@ -741,15 +741,15 @@ sub ProcessCHM($$)
 
 #------------------------------------------------------------------------------
 # Read Unicode string (null terminated) from resource
-# Inputs: 0) data ref, 1) start offset, 2) optional ExifTool object ref
+# Inputs: 0) data ref, 1) start offset, 2) data end, 3) optional ExifTool object ref
 # Returns: 0) Unicode string translated to UTF8, or current CharSet with ExifTool ref
 #          1) end pos (rounded up to nearest 4 bytes)
-sub ReadUnicodeStr($$;$)
+sub ReadUnicodeStr($$$;$)
 {
-    my ($dataPt, $pos, $et) = @_;
-    my $len = length $$dataPt;
+    my ($dataPt, $pos, $end, $et) = @_;
+    $end = length $$dataPt if $end > length $$dataPt;   # (be safe)
     my $str = '';
-    while ($pos + 2 <= $len) {
+    while ($pos + 2 <= $end) {
         my $ch = substr($$dataPt, $pos, 2);
         $pos += 2;
         last if $ch eq "\0\0";
@@ -780,7 +780,7 @@ sub ProcessPEVersion($$)
         $valLen = Get16u($dataPt, $pos + 2);
         $type = Get16u($dataPt, $pos + 4);
         return 0 unless $len or $valLen;  # prevent possible infinite loop
-        ($string, $strEnd) = ReadUnicodeStr($dataPt, $pos + 6);
+        ($string, $strEnd) = ReadUnicodeStr($dataPt, $pos + 6, $pos + $len);
         return 0 if $strEnd + $valLen > $end;
         unless ($index or $string eq 'VS_VERSION_INFO') {
             $et->Warn('Invalid Version Info block');
@@ -802,8 +802,9 @@ sub ProcessPEVersion($$)
                 $len = Get16u($dataPt, $pt);
                 $valLen = Get16u($dataPt, $pt + 2);
                 # $type = Get16u($dataPt, $pt + 4);
+                my $entryEnd = $pt + $len;
                 # get tag ID (converted to UTF8)
-                ($string, $pt) = ReadUnicodeStr($dataPt, $pt + 6);
+                ($string, $pt) = ReadUnicodeStr($dataPt, $pt + 6, $entryEnd);
                 unless ($index) {
                     # separate the language code and character set
                     # (not sure what the CharacterSet tag is for, but the string
@@ -828,11 +829,13 @@ sub ProcessPEVersion($$)
                 }
                 # get tag value (converted to current Charset)
                 if ($valLen) {
-                    ($string, $pt) = ReadUnicodeStr($dataPt, $pt, $et);
+                    ($string, $pt) = ReadUnicodeStr($dataPt, $pt, $entryEnd, $et);
                 } else {
                     $string = '';
                 }
                 $et->HandleTag($tagTablePtr, $tag, $string);
+                # step to next entry (padded to an even word)
+                $pt = ($entryEnd + 3) & 0xfffffffc;
             }
         } else {
             $pos += $len + $valLen;

data/bin/{Image-ExifTool-10.01 → Image-ExifTool-10.04}/lib/Image/ExifTool/Exif.pm

@@ -52,7 +52,7 @@ use vars qw($VERSION $AUTOLOAD @formatSize @formatName %formatNumber %intFormat
 use Image::ExifTool qw(:DataAccess :Utils);
 use Image::ExifTool::MakerNotes;
 
-$VERSION = '3.75';
+$VERSION = '3.76';
 
 sub ProcessExif($$$);
 sub WriteExif($$$);
@@ -569,6 +569,8 @@ my %sampleFormat = (
     0x11d => 'PageName',
     0x11e => 'XPosition',
     0x11f => 'YPosition',
+    # FreeOffsets/FreeByteCounts are used by Ricoh for RMETA information
+    # in TIFF images (not yet supported)
     0x120 => {
         Name => 'FreeOffsets',
         IsOffset => 1,
@@ -3617,7 +3619,7 @@ sub PrintLensID($$@)
         if ($lensType != 0xffff) {
             require Image::ExifTool::Minolta;
             if ($Image::ExifTool::Minolta::metabonesID{$lensType & 0xff00}) {
-                $lensType -= ($lensType >= 0xef00 ? 0xef00 : $lensType >= 0xbc00 ? 0xbc00 : 0x7700); 
+                $lensType -= ($lensType >= 0xef00 ? 0xef00 : $lensType >= 0xbc00 ? 0xbc00 : 0x7700);
                 require Image::ExifTool::Canon;
                 $printConv = \%Image::ExifTool::Canon::canonLensTypes;
                 $lensTypePrt = $$printConv{$lensType} if $$printConv{$lensType};
@@ -3654,12 +3656,15 @@ sub PrintLensID($$@)
         if ($sf0) {
             next if abs($sf - $sf0) > 0.5 or abs($sa - $sa0) > 0.15 or
                     abs($lf - $lf0) > 0.5 or abs($la - $la0) > 0.15;
-            # the basic parameters match, but also check against additional lens features
-            # for Sony E lenses -- the full LensSpec string should match with end of LensType
-            $lensSpecPrt and $lens =~ /\Q$lensSpecPrt\E( \(|$)/ and @best = ( $lens ), last;
-            # exactly-matching Sony E lens should have been found above, so skip
-            # any not-exactly-matching Sony E-lenses
-            next if $lens =~ /^Sony E /;
+            # the basic parameters match, but also check against additional lens features:
+            # for Sony A and E lenses, the full LensSpec string should match with end of LensType,
+            # excluding any part between () at the end, and preceded by a space.
+            # The preceding space ensures that e.g. Zeiss Loxia 21mm having LensSpec "E 21mm F2.8"
+            # will not be identified as "Sony FE 21mm F2.8 (SEL28F20 + SEL075UWC)".
+            $lensSpecPrt and $lens =~ / \Q$lensSpecPrt\E( \(|$)/ and @best = ( $lens ), last;
+            # exactly-matching Sony lens should have been found above, so skip
+            # any not-exactly-matching Sony lenses
+            next if $lens =~ /^Sony /;
             push @best, $lens;
             next;
         }
@@ -3958,7 +3963,8 @@ sub ProcessExif($$$)
                 $et->Warn("Bad format ($format) for $name entry $index", $inMakerNotes);
                 ++$warnCount;
             }
-            return 0 unless $index; # assume corrupted IFD if this is our first entry
+            # assume corrupted IFD if this is our first entry (except Sony ILCE-7M2 firmware 1.21)
+            return 0 unless $index or $$et{Model} eq 'ILCE-7M2';
             next;
         }
         my $formatStr = $formatName[$format];   # get name of this format
@@ -4500,8 +4506,7 @@ sub ProcessExif($$$)
                 $val = shift @values;           # continue with next subdir
             }
             my $doMaker = $et->Options('MakerNotes');
-            next unless $doMaker or $$et{REQ_TAG_LOOKUP}{lc($tagStr)} or
-                        $$tagInfo{BlockExtract};
+            next unless $doMaker or $$et{REQ_TAG_LOOKUP}{lc($tagStr)} or $$tagInfo{BlockExtract};
             # extract as a block if specified
             if ($$tagInfo{MakerNotes}) {
                 # save maker note byte order (if it was significant and valid)

data/bin/{Image-ExifTool-10.01 → Image-ExifTool-10.04}/lib/Image/ExifTool/FLIR.pm

@@ -115,11 +115,11 @@ my %float8g = ( Format => 'float', PrintConv => 'sprintf("%.8g",$val)' );
     0x05 => { #6
         Name => 'GainDeadData',
         SubDirectory => { TagTable => 'Image::ExifTool::FLIR::GainDeadData' },
-    }, 
+    },
     0x06 => { #6
         Name => 'CoarseData',
         SubDirectory => { TagTable => 'Image::ExifTool::FLIR::CoarseData' },
-    },       
+    },
     # 7 = ImageMap (ref 3)
     0x0e => {
         Name => 'EmbeddedImage',
@@ -154,7 +154,7 @@ my %float8g = ( Format => 'float', PrintConv => 'sprintf("%.8g",$val)' );
     0x28 => {
         Name => 'PaintData',
         SubDirectory => { TagTable => 'Image::ExifTool::FLIR::PaintData' },
-    },       
+    },
     0x2a => {
         Name => 'PiP',
         SubDirectory => {
@@ -737,7 +737,7 @@ my %float8g = ( Format => 'float', PrintConv => 'sprintf("%.8g",$val)' );
             return $val;
         },
     },
-    
+
     326 => {
         Name => 'Reading4Units',
         DataMember => 'Reading4Units',
@@ -1325,11 +1325,11 @@ sub ProcessMeasInfo($$$)
             AddTagToTable($tagTablePtr, $tag, $tagInfo);
         }
         # extract measurement tool type
-        $et->HandleTag($tagTablePtr, "${pre}Type", undef, 
+        $et->HandleTag($tagTablePtr, "${pre}Type", undef,
             DataPt=>$dataPt, DataPos=>$dataPos, Start=>$pos+0x0a, Size=>2);
         last if $pos + 0x24 + $coordLen > $dirEnd;
         # extract measurement parameters
-        $et->HandleTag($tagTablePtr, "${pre}Params", undef, 
+        $et->HandleTag($tagTablePtr, "${pre}Params", undef,
             DataPt=>$dataPt, DataPos=>$dataPos, Start=>$pos+0x24, Size=>$coordLen);
         my @uni;
         # extract label (sometimes-null-terminated Unicode)

data/bin/{Image-ExifTool-10.01 → Image-ExifTool-10.04}/lib/Image/ExifTool/FlashPix.pm

@@ -1222,7 +1222,7 @@ sub ProcessContents($$$)
     # then 0x01) followed by a number of zero bytes (from 0x18 to 0x26 of them, related
     # somehow to the value of the first byte), followed by the string "DocumentPage"
     $isFLA = 1 if $$dataPt =~ /^..\0+\xff\xff\x01\0\x0d\0CDocumentPage/s;
-    
+
     # do a brute-force scan of the "Contents" for UTF-16 XMP
     # (this may always be little-endian, but allow for either endianness)
     if ($$dataPt =~ /<\0\?\0x\0p\0a\0c\0k\0e\0t\0 \0b\0e\0g\0i\0n\0=\0['"](\0\xff\xfe|\xfe\xff)/g) {
@@ -1601,7 +1601,7 @@ sub SetDocNum($$;$$$)
         } elsif (@subDoc) {
             $subDoc[-1] = ++$$used[$#subDoc];
         }
-        SetDocNum($hier, $$obj{Child}, \@subDoc, $used, not $meta) 
+        SetDocNum($hier, $$obj{Child}, \@subDoc, $used, not $meta);
     }
 }
 

data/bin/{Image-ExifTool-10.01 → Image-ExifTool-10.04}/lib/Image/ExifTool/FotoStation.pm

@@ -171,7 +171,7 @@ sub ProcessFotoStation($$)
             next;
         }
         if ($$et{DEL_GROUP}{FotoStation}) {
-            $verbose and printf $out "  Deleting FotoStation trailer\n";
+            $verbose and print $out "  Deleting FotoStation trailer\n";
             $verbose = 0;   # no more verbose messages after this
             ++$$et{CHANGED};
             next;

data/bin/{Image-ExifTool-10.01 → Image-ExifTool-10.04}/lib/Image/ExifTool/FujiFilm.pm

@@ -26,7 +26,7 @@ use vars qw($VERSION);
 use Image::ExifTool qw(:DataAccess :Utils);
 use Image::ExifTool::Exif;
 
-$VERSION = '1.51';
+$VERSION = '1.52';
 
 sub ProcessFujiDir($$$);
 sub ProcessFaceRec($$$);
@@ -50,6 +50,7 @@ my %testedRAF = (
     '0266' => 'S9500 Ver1.01',
     '0269' => 'S9500 Ver1.02',
     '0271' => 'S3Pro Ver2.71', # UV/IR model?
+    '0300' => 'X-E2',
     '0712' => 'S5000 Ver3.00',
     '0716' => 'S5000 Ver3.00', # (yes, 2 RAF versions with the same Software version)
 );

data/bin/{Image-ExifTool-10.01 → Image-ExifTool-10.04}/lib/Image/ExifTool/GIF.pm

@@ -411,7 +411,7 @@ Block:
                         $et->Warn('Duplicate ICC_Profile block created');
                     }
                     $buff = $et->WriteDirectory(\%dirInfo, $iccTable);
-                    # rewrite original ICC_Profile if nothing changed 
+                    # rewrite original ICC_Profile if nothing changed
                     $buff = $icc_profile unless defined $buff;
                     if (length $buff) {
                         # write ICC profile sub-blocks

data/bin/{Image-ExifTool-10.01 → Image-ExifTool-10.04}/lib/Image/ExifTool/Geotag.pm

@@ -377,9 +377,7 @@ DoneFix:    $isDate = 1;
             /^\$GPGGA,(\d{2})(\d{2})(\d+(\.\d*)?),(\d*?)(\d{1,2}\.\d+),([NS]),(\d*?)(\d{1,2}\.\d+),([EW]),[1-6]?,(\d+)?,(\.\d+|\d+\.?\d*)?,(-?\d+\.?\d*)?,M?,/ or next;
             $fix{lat} = (($5 || 0) + $6/60) * ($7 eq 'N' ? 1 : -1);
             $fix{lon} = (($8 || 0) + $9/60) * ($10 eq 'E' ? 1 : -1);
-            $fix{nsats} = $11;
-            $fix{hdop} = $12;
-            $fix{alt} = $13;
+            @fix{qw(nsats hdop alt)} = ($11,$12,$13);
             $secs = (($1 * 60) + $2) * 60 + $3;
             $canCut = 1;
 #

data/bin/{Image-ExifTool-10.01 → Image-ExifTool-10.04}/lib/Image/ExifTool/ICC_Profile.pm

@@ -633,7 +633,7 @@ sub ProcessMetadata($$$)
     my $dirStart = $$dirInfo{DirStart};
     my $dirLen = $$dirInfo{DirLen};
     my $dirEnd = $dirStart + $dirLen;
-    
+
     if ($dirLen < 16 or substr($$dataPt, $dirStart, 4) ne 'dict') {
         $et->Warn('Invalid ICC meta dictionary');
         return 0;
@@ -882,7 +882,7 @@ sub ProcessICC_Profile($$$)
                     }
                     my $strLen = Get32u($dataPt, $recPos + 4);
                     my $strPos = Get32u($dataPt, $recPos + 8);
-                    last if $strPos + $strLen > $size; 
+                    last if $strPos + $strLen > $size;
                     my $str = substr($$dataPt, $valuePtr + $strPos, $strLen);
                     $str = $et->Decode($str, 'UTF16');
                     $et->HandleTag($tagTablePtr, $tagID, $str,

data/bin/{Image-ExifTool-10.01 → Image-ExifTool-10.04}/lib/Image/ExifTool/ID3.pm

@@ -403,7 +403,7 @@ my %genre = (
         ExifTool extracts mainly text-based tags from ID3v2 information.  The tags
         in the tables below are those extracted by ExifTool, and don't represent a
         complete list of available ID3v2 tags.
-        
+
         ID3 version 2.2 tags.  (These are the tags written by iTunes 5.0.)
     },
     CNT => 'PlayCounter',

data/bin/{Image-ExifTool-10.01 → Image-ExifTool-10.04}/lib/Image/ExifTool/JPEG.pm

@@ -452,7 +452,7 @@ sub ProcessJPEG_HDR($$$);
             1 => 'Odd',
             2 => 'Even',
         },
-    },    
+    },
 );
 
 # Ocad APP0 segment (ref PH)

data/bin/{Image-ExifTool-10.01 → Image-ExifTool-10.04}/lib/Image/ExifTool/Jpeg2000.pm

@@ -16,7 +16,7 @@ use strict;
 use vars qw($VERSION);
 use Image::ExifTool qw(:DataAccess :Utils);
 
-$VERSION = '1.23';
+$VERSION = '1.24';
 
 sub ProcessJpeg2000Box($$$);
 
@@ -367,7 +367,7 @@ my %j2cMarker = (
         Name => 'CompatibleBrands',
         Format => 'undef[$size-8]',
         # ignore any entry with a null, and return others as a list
-        ValueConv => 'my @a=($val=~/.{4}/sg); @a=grep(!/\0/,@a); \@a', 
+        ValueConv => 'my @a=($val=~/.{4}/sg); @a=grep(!/\0/,@a); \@a',
     },
 );
 
@@ -583,10 +583,11 @@ sub ProcessJpeg2000Box($$$)
     my ($pos, $boxLen);
     for ($pos=$dirStart; ; $pos+=$boxLen) {
         my ($boxID, $buff, $valuePtr);
+        my $hdrLen = 8;     # the box header length
         if ($raf) {
             $dataPos = $raf->Tell() - $base;
-            my $n = $raf->Read($buff,8);
-            unless ($n == 8) {
+            my $n = $raf->Read($buff,$hdrLen);
+            unless ($n == $hdrLen) {
                 $n and $err = '', last;
                 if ($outfile) {
                     CreateNewBoxes($et, $outfile) or $err = 1;
@@ -594,22 +595,30 @@ sub ProcessJpeg2000Box($$$)
                 last;
             }
             $dataPt = \$buff;
-            $dirLen = 8;
+            $dirLen = $dirEnd = $hdrLen;
             $pos = 0;
-        } elsif ($pos >= $dirEnd - 8) {
+        } elsif ($pos >= $dirEnd - $hdrLen) {
             $err = '' unless $pos == $dirEnd;
             last;
         }
-        $boxLen = unpack("x$pos N",$$dataPt);
+        $boxLen = unpack("x$pos N",$$dataPt);   # (length includes header and data)
         $boxID = substr($$dataPt, $pos+4, 4);
-        $pos += 8;
+        $pos += $hdrLen;                # move to end of box header
         if ($boxLen == 1) {
-            if (not $raf and $pos < $dirLen - 8) {
-                $err = 'JPEG 2000 format error';
-            } else {
-                $err = "Can't currently handle huge JPEG 2000 boxes";
+            # box header contains an additional 8-byte integer for length
+            $hdrLen += 8;
+            if ($raf) {
+                my $buf2;
+                if ($raf->Read($buf2,8) == 8) {
+                    $buff .= $buf2;
+                    $dirLen = $dirEnd = $hdrLen;
+                }
             }
-            last;
+            $pos > $dirEnd - 8 and $err = '', last;
+            my ($hi, $lo) = unpack("x$pos N2",$$dataPt);
+            $hi and $err = "Can't currently handle JPEG 2000 boxes > 4 GB", last;
+            $pos += 8;                  # move to end of extended-length box header
+            $boxLen = $lo - $hdrLen;    # length of remaining box data
         } elsif ($boxLen == 0) {
             if ($raf) {
                 if ($outfile) {
@@ -625,9 +634,9 @@ sub ProcessJpeg2000Box($$$)
                 }
                 last;   # (ignore the rest of the file when reading)
             }
-            $boxLen = $dirLen - $pos;
+            $boxLen = $dirEnd - $pos;   # data runs to end of file
         } else {
-            $boxLen -= 8;
+            $boxLen -= $hdrLen;         # length of remaining box data
         }
         $boxLen < 0 and $err = 'Invalid JPEG 2000 box length', last;
         my $tagInfo = $et->GetTagInfo($tagTablePtr, $boxID);
@@ -642,7 +651,7 @@ sub ProcessJpeg2000Box($$$)
                     $raf->Seek($boxLen, 1) or $err = 'Seek error', last;
                 }
             } elsif ($outfile) {
-                Write($outfile, substr($$dataPt, $pos-8, $boxLen+8)) or $err = '', last;
+                Write($outfile, substr($$dataPt, $pos-$hdrLen, $boxLen+$hdrLen)) or $err = '', last;
             }
             next;
         }
@@ -652,7 +661,7 @@ sub ProcessJpeg2000Box($$$)
             $raf->Read($buff,$boxLen) == $boxLen or $err = '', last;
             $valuePtr = 0;
             $dataLen = $boxLen;
-        } elsif ($boxLen + $pos > $dirStart + $dirLen) {
+        } elsif ($pos + $boxLen > $dirEnd) {
             $err = '';
             last;
         } else {