exiftool_vendored 9.49.0 → 9.50.0

data/bin/{Image-ExifTool-9.49 → Image-ExifTool-9.50}/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.61';
+$VERSION = '3.62';
 
 sub ProcessExif($$$);
 sub WriteExif($$$);
@@ -89,7 +89,7 @@ sub BINARY_DATA_LIMIT { return 10 * 1024 * 1024; }
     'rational64u' => 5,  # RATIONAL
     'int8s'       => 6,  # SBYTE
     'undef'       => 7,  # UNDEFINED
-    'binary'      => 7,  # (treat binary data as undef)
+    'binary'      => 7,  # (same as undef)
     'int16s'      => 8,  # SSHORT
     'int32s'      => 9,  # SLONG
     'rational64s' => 10, # SRATIONAL
@@ -1396,13 +1396,20 @@ my %sampleFormat = (
     0x87ac => 'ImageLayer',
     0x87af => {
         Name => 'GeoTiffDirectory',
-        Format => 'binary',
+        Format => 'undef',
         Binary => 1,
+        Notes => q{
+            these "GeoTiff" tags may read and written as a block, but they aren't
+            extracted unless specifically requested.  Byte order changes are handled
+            automatically when copying between TIFF images with different byte order
+        },
+        RawConv => '$val . GetByteOrder()', # save byte order
     },
     0x87b0 => {
         Name => 'GeoTiffDoubleParams',
-        Format => 'binary',
+        Format => 'undef',
         Binary => 1,
+        RawConv => '$val . GetByteOrder()', # save byte order
     },
     0x87b1 => {
         Name => 'GeoTiffAsciiParams',

data/bin/{Image-ExifTool-9.49 → Image-ExifTool-9.50}/lib/Image/ExifTool/GeoTiff.pm

@@ -17,7 +17,7 @@ use strict;
 use vars qw($VERSION);
 use Image::ExifTool qw(:DataAccess :Utils);
 
-$VERSION = '1.09';
+$VERSION = '1.10';
 
 # format codes for geoTiff directory entries
 my %geoTiffFormat = (
@@ -2072,11 +2072,15 @@ sub ProcessGeoTiff($)
 {
     my $et = shift;
     my $dirData = $et->GetValue('GeoTiffDirectory', 'ValueConv') or return;
+
+    # avoid re-processing if another EXIF directory is found
+    $$et{DidGeoTiff} and $$et{DidGeoTiff} eq $dirData and return;
+    $$et{DidGeoTiff} = $dirData;
+
     my $doubleData = $et->GetValue('GeoTiffDoubleParams', 'ValueConv');
     my $asciiData = $et->GetValue('GeoTiffAsciiParams', 'ValueConv');
     my $verbose = $et->Options('Verbose');
 
-    # restore or original EXIF byte order setting
     if (length($$dirData) >= 8 and
         length($$dirData) >= 8 * (Get16u($dirData,6) + 1))
     {
@@ -2105,11 +2109,19 @@ sub ProcessGeoTiff($)
             my $format = $geoTiffFormat{$loc};
             my ($val, $dataPt);
             if ($format eq 'double') {          # in the double parms
+                if (not $doubleData or length($$doubleData) < 8*($offset+$count)) {
+                    $et->Warn("Missing double data for $$tagInfo{Name}");
+                    next;
+                }
                 $dataPt = $doubleData;
                 $offset *= 8;
                 $val = Image::ExifTool::ReadValue($dataPt, $offset, $format,
                                                   $count, length($$doubleData)-$offset);
             } elsif ($format eq 'string') {     # in the ASCII parms
+                if (not $asciiData or length($$asciiData) < $offset+$count) {
+                    $et->Warn("Missing string data for $$tagInfo{Name}");
+                    next;
+                }
                 $dataPt = $asciiData;
                 $val = substr($$dataPt, $offset, $count);
                 $val =~ s/(\0|\|)$//;   # remove trailing terminator (NULL or '|')
@@ -2139,11 +2151,12 @@ sub ProcessGeoTiff($)
     } else {
         $et->Warn('Bad GeoTIFF directory');
     }
-    # must delete these tags once we've processed this information
-    # (to avoid re-processing if another EXIF directory is found)
-    $et->DeleteTag('GeoTiffDirectory');
-    $et->DeleteTag('GeoTiffDoubleParams');
-    $et->DeleteTag('GeoTiffAsciiParams');
+    # extract block tags only if requested
+    unless ($$et{OPTIONS}{RequestAll}) {
+        $et->DeleteTag('GeoTiffDirectory')    unless $$et{REQ_TAG_LOOKUP}{geotiffdirectory};
+        $et->DeleteTag('GeoTiffDoubleParams') unless $$et{REQ_TAG_LOOKUP}{geotiffdoubleparams};
+        $et->DeleteTag('GeoTiffAsciiParams')  unless $$et{REQ_TAG_LOOKUP}{geotiffasciiparams};
+    }
 }
 
 

data/bin/{Image-ExifTool-9.49 → Image-ExifTool-9.50}/lib/Image/ExifTool/Import.pm

@@ -12,7 +12,7 @@ require Exporter;
 
 use vars qw($VERSION @ISA @EXPORT_OK);
 
-$VERSION = '1.02';
+$VERSION = '1.03';
 @ISA = qw(Exporter);
 @EXPORT_OK = qw(ReadCSV ReadJSON);
 
@@ -192,6 +192,11 @@ Tok: for (;;) {
             # unescape characters
             $rtnVal =~ s/\\u([0-9a-f]{4})/ToUTF8(hex $1)/ige;
             $rtnVal =~ s/\\(.)/$unescapeJSON{$1}||$1/sge;
+            # decode base64 (binary data) values
+            if ($rtnVal =~ /^base64:[A-Za-z0-9+\/]*={0,2}$/ and length($rtnVal) % 4 == 3) {
+                require Image::ExifTool::XMP;
+                $rtnVal = ${Image::ExifTool::XMP::DecodeBase64(substr($rtnVal,7))};
+            }
         } elsif ($tok eq ']' or $tok eq '}' or $tok eq ',') {
             # return undef for empty object, array, or list item
             # (empty list item actually not valid JSON)

data/bin/{Image-ExifTool-9.49 → Image-ExifTool-9.50}/lib/Image/ExifTool/MPF.pm

@@ -15,7 +15,7 @@ use vars qw($VERSION);
 use Image::ExifTool qw(:DataAccess :Utils);
 use Image::ExifTool::Exif;
 
-$VERSION = '1.07';
+$VERSION = '1.08';
 
 sub ProcessMPImageList($$$);
 
@@ -219,9 +219,12 @@ sub ExtractMPImages($)
             }
             # extract information from MP images if ExtractEmbedded option used
             if ($ee) {
+                my $oldBase = $$et{BASE};
+                $$et{BASE} = $off;
                 $$et{DOC_NUM} = $i;
                 $et->ExtractInfo($val, { ReEntry => 1 });
                 delete $$et{DOC_NUM};
+                $$et{BASE} = $oldBase;
             }
         }
     }

data/bin/{Image-ExifTool-9.49 → Image-ExifTool-9.50}/lib/Image/ExifTool/MakerNotes.pm

@@ -21,7 +21,7 @@ sub ProcessKodakPatch($$$);
 sub WriteUnknownOrPreview($$$);
 sub FixLeicaBase($$;$);
 
-$VERSION = '1.87';
+$VERSION = '1.88';
 
 my $debug;          # set to 1 to enable debugging code
 
@@ -742,7 +742,7 @@ my $debug;          # set to 1 to enable debugging code
         # Samsung STMN maker notes WITH PreviewImage
         Condition => '$$valPt =~ /^STMN\d{3}/',
         SubDirectory => {
-            TagTable => 'Image::ExifTool::Samsung::Type1',
+            TagTable => 'Image::ExifTool::Samsung::Main',
         },
     },
     {

data/bin/{Image-ExifTool-9.49 → Image-ExifTool-9.50}/lib/Image/ExifTool/Minolta.pm

@@ -52,7 +52,7 @@ use vars qw($VERSION %minoltaLensTypes %minoltaTeleconverters %minoltaColorMode
 use Image::ExifTool qw(:DataAccess :Utils);
 use Image::ExifTool::Exif;
 
-$VERSION = '2.09';
+$VERSION = '2.10';
 
 # Full list of product codes for Sony-compatible Minolta lenses
 # (ref http://www.kb.sony.com/selfservice/documentLink.do?externalId=C1000570)
@@ -280,6 +280,7 @@ $VERSION = '2.09';
     64 => 'Sony 500mm F4.0 G SSM (SAL500F40G)', #29
     65 => 'Sony DT 18-135mm F3.5-5.6 SAM (SAL18135)', #25
     66 => 'Sony 300mm F2.8 G SSM II (SAL300F28G2)', #29
+    67 => 'Sony 70-200mm F2.8 G SSM II (SAL70200G2)', #25
     68 => 'Sony DT 55-300mm F4.5-5.6 SAM (SAL55300)', #29
     69 => 'Sony 70-400mm F4-5.6 G SSM II (SAL70400G2)', #25
     70 => 'Carl Zeiss Planar T* 50mm F1.4 ZA SSM (SAL50F14Z)', #25

data/bin/{Image-ExifTool-9.49 → Image-ExifTool-9.50}/lib/Image/ExifTool/Nikon.pm

@@ -56,7 +56,7 @@ use vars qw($VERSION %nikonLensIDs %nikonTextEncoding);
 use Image::ExifTool qw(:DataAccess :Utils);
 use Image::ExifTool::Exif;
 
-$VERSION = '2.85';
+$VERSION = '2.86';
 
 sub LensIDConv($$$);
 sub ProcessNikonAVI($$$);
@@ -361,6 +361,7 @@ sub PrintAFPointsInv($$;$);
     '26 40 2D 80 2C 40 1C 06' => 'Sigma 18-200mm F3.5-6.3 DC',
     '7A 40 2D 80 2C 40 4B 0E' => 'Sigma 18-200mm F3.5-6.3 DC OS HSM',
     'ED 40 2D 80 2C 40 4B 0E' => 'Sigma 18-200mm F3.5-6.3 DC OS HSM', #JD
+    'FF 40 2D 80 2C 40 4B 06' => 'Sigma 18-200mm F3.5-6.3 DC', #30
     'A5 40 2D 88 2C 40 4B 0E' => 'Sigma 18-250mm F3.5-6.3 DC OS HSM',
   #  LensFStops varies with FocalLength for this lens (ref 2):
     '92 2C 2D 88 2C 40 4B 0E' => 'Sigma 18-250mm F3.5-6.3 DC Macro OS HSM', #2
@@ -1082,6 +1083,7 @@ my %binaryDataAttrs = (
         Name => 'BlackLevel',
         Writable => 'int16u',
         Count => 4,
+        # (may need to divide by 4 for some images, ie. D3300/D5300, 12 bit - ref 33)
     },
     0x0080 => { Name => 'ImageAdjustment',  Writable => 'string' },
     0x0081 => { Name => 'ToneComp',         Writable => 'string' }, #2