exiftool_vendored 9.53.0 → 9.58.0

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

@@ -18,7 +18,7 @@ use vars qw($VERSION);
 use Image::ExifTool qw(:DataAccess :Utils);
 use Image::ExifTool::ID3;
 
-$VERSION = '1.05';
+$VERSION = '1.06';
 
 # information for time/date-based tags (time zero is Jan 1, 1904)
 my %timeInfo = (
@@ -125,6 +125,21 @@ my %timeInfo = (
     },
 );
 
+%Image::ExifTool::AIFF::Composite = (
+    Duration => {
+        Require => {
+            0 => 'AIFF:SampleRate',
+            1 => 'AIFF:NumSampleFrames',
+        },
+        RawConv => '($val[0] and $val[1]) ? $val[1] / $val[0] : undef',
+        PrintConv => 'ConvertDuration($val)',
+    },
+);
+
+# add our composite tags
+Image::ExifTool::AddCompositeTags('Image::ExifTool::AIFF');
+
+
 #------------------------------------------------------------------------------
 # Process AIFF Comment chunk
 # Inputs: 0) ExifTool object reference, 1) DirInfo reference, 2) tag table ref

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

@@ -21,6 +21,7 @@ $VERSION = '1.01';
     GROUPS => { 0 => 'MakerNotes', 2 => 'Image' },
     NOTES => 'Tags extracted from maker notes of images from the iPhone 5 with iOS 7.',
     # 0x0001 - int32s: seen 0, 1
+    # 0x0002 - binary plist with a single data object of size 512 bytes (iPhone5s)
     0x0003 => {
         Name => 'RunTime',
         SubDirectory => { TagTable => 'Image::ExifTool::Apple::RunTime' },
@@ -29,6 +30,7 @@ $VERSION = '1.01';
     # 0x0005 - int32s: seen values 147-247, and 100 for blank images
     # 0x0006 - int32s: seen values 186-241, and 20 for blank images
     # 0x0007 - int32s: seen 1
+    # 0x0009 - int32s: seen 19
     0x000a => {
         Name => 'HDRImageType',
         Writable => 'int32s',

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

@@ -32,7 +32,7 @@ use Image::ExifTool::XMP;
 use Image::ExifTool::Canon;
 use Image::ExifTool::Nikon;
 
-$VERSION = '2.72';
+$VERSION = '2.75';
 @ISA = qw(Exporter);
 
 sub NumbersFirst;
@@ -72,7 +72,7 @@ my %tweakOrder = (
     Nikon   => 'Minolta',
     NikonCustom => 'Nikon',
     NikonCapture => 'NikonCustom',
-    Olympus => 'NikonCapture',
+    Nintendo => 'NikonCapture',
     Minolta => 'Leaf',
     Pentax  => 'Panasonic',
     SonyIDC => 'Sony',
@@ -382,10 +382,10 @@ a few).
 
 Many Photoshop tags are marked as Unknown (indicated by a question mark
 after the tag name) because the information they provide is not very useful
-under normal circumstances I<[and because Adobe denied my application for
-their file format documentation -- apparently open source software is too
-big a concept for them]>.  These unknown tags are not extracted unless the
-Unknown (-u) option is used.
+under normal circumstances.  These unknown tags are not extracted unless the
+Unknown (-u) option is used.  See
+L<http://www.adobe.com/devnet-apps/photoshop/fileformatashtml/> for the
+official specification
 },
     PrintIM => q{
 The format of the PrintIM information is known, however no PrintIM tags have
@@ -395,8 +395,8 @@ been decoded.  Use the Unknown (-u) option to extract PrintIM information.
 ExifTool extracts the following tags from GeoTIFF images.  See
 L<http://www.remotesensing.org/geotiff/spec/geotiffhome.html> for the
 complete GeoTIFF specification.  These tags are not writable individually,
-but they may be copied en mass via the containing GeoTiffDirectory,
-GeoTiffDoubleParams and GeoTiffAsciiParams tags.
+but they may be copied en mass via the block tags GeoTiffDirectory,
+GeoTiffDoubleParams and GeoTiffAsciiParams.
 },
     JFIF => q{
 The following information is extracted from the JPEG JFIF header.  See
@@ -493,9 +493,9 @@ in this column are write-only.
 
 Tags in the family 1 "System" group are referred to as "pseudo" tags because
 they don't represent real metadata in the file.  Instead, this information
-is stored in the directory structure of the filesystem.  The four writable
-"pseudo" tags (FileName, Directory, FileModifyDate and FileCreateDate) may
-be written without modifying the file itself.
+is stored in the directory structure of the filesystem.  The five writable
+"pseudo" tags (FileName, Directory, FileModifyDate, FileCreateDate and
+HardLink) may be written without modifying the file itself.
 },
     Composite => q{
 The values of the composite tags are B<Derived From> the values of other

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

@@ -65,7 +65,7 @@
 #              49) http://www.listware.net/201101/digikam-users/49795-digikam-users-re-lens-recognition.html
 #              50) http://u88.n24.queensu.ca/exiftool/forum/index.php/topic,3833.0.html
 #              51) http://u88.n24.queensu.ca/exiftool/forum/index.php/topic,4110.0.html
-#              52) Iliah Borg private communication
+#              52) Iliah Borg private communication (LibRaw)
 #              53) Niels Kristian Bech Jensen private communication
 #              JD) Jens Duttke private communication
 #------------------------------------------------------------------------------
@@ -82,7 +82,7 @@ sub ProcessSerialData($$$);
 sub ProcessFilters($$$);
 sub SwapWords($);
 
-$VERSION = '3.27';
+$VERSION = '3.30';
 
 # Note: Removed 'USM' from 'L' lenses since it is redundant - PH
 # (or is it?  Ref 32 shows 5 non-USM L-type lenses)
@@ -144,7 +144,7 @@ $VERSION = '3.27';
     28.1 => 'Tamron SP AF 28-105mm f/2.8 LD Aspherical IF', #15
     28.2 => 'Tamron SP AF 28-75mm f/2.8 XR Di LD Aspherical [IF] Macro', #4
   # 28.3 => 'Tamron AF 70-300mm f/4.5-5.6 Di LD 1:2 Macro Zoom', #11
-    28.3 => 'Tamron AF 70-300mm f/4-5.6 Di LD 1:2 Macro', #exiv2 patch
+    28.3 => 'Tamron AF 70-300mm f/4-5.6 Di LD 1:2 Macro', #47
     28.4 => 'Tamron AF Aspherical 28-200mm f/3.8-5.6', #14
     29 => 'Canon EF 50mm f/1.8 II',
     30 => 'Canon EF 35-105mm f/4.5-5.6', #32
@@ -154,11 +154,13 @@ $VERSION = '3.27';
     32.1 => 'Sigma 15mm f/2.8 EX Fisheye', #11
     33 => 'Voigtlander or Carl Zeiss Lens',
     33.1 => 'Voigtlander Ultron 40mm f/2 SLII Aspherical', #45
-    33.2 => 'Carl Zeiss Distagon T* 15mm f/2.8 ZE', #PH
-    33.3 => 'Carl Zeiss Distagon T* 18mm f/3.5 ZE', #PH
-    33.4 => 'Carl Zeiss Distagon T* 21mm f/2.8 ZE', #PH
-    33.5 => 'Carl Zeiss Distagon T* 28mm f/2 ZE', #PH
-    33.6 => 'Carl Zeiss Distagon T* 35mm f/2 ZE', #PH
+    33.2 => 'Voigtlander Color Skopar 20mm f/3.5 SLII Aspherical', #50
+    33.3 => 'Voigtlander APO-Lanthar 90mm f/3.5 SLII Close Focus', #50
+    33.4 => 'Carl Zeiss Distagon T* 15mm f/2.8 ZE', #PH
+    33.5 => 'Carl Zeiss Distagon T* 18mm f/3.5 ZE', #PH
+    33.6 => 'Carl Zeiss Distagon T* 21mm f/2.8 ZE', #PH
+    33.7 => 'Carl Zeiss Distagon T* 28mm f/2 ZE', #PH
+    33.8 => 'Carl Zeiss Distagon T* 35mm f/2 ZE', #PH
     35 => 'Canon EF 35-80mm f/4-5.6', #32
     36 => 'Canon EF 38-76mm f/4.5-5.6', #32
     37 => 'Canon EF 35-80mm f/4-5.6 or Tamron Lens', #32
@@ -182,7 +184,7 @@ $VERSION = '3.27';
     51 => 'Canon EF-S 18-135mm f/3.5-5.6 IS', #PH
     52 => 'Canon EF-S 18-55mm f/3.5-5.6 IS II', #PH
     53 => 'Canon EF-S 18-55mm f/3.5-5.6 III', #Jon Charnas
-    54 => 'Canon EF-S 55-250mm f/4-5.6 IS II', #Exiv2
+    54 => 'Canon EF-S 55-250mm f/4-5.6 IS II', #47
     94 => 'Canon TS-E 17mm f/4L', #42
     95 => 'Canon TS-E 24.0mm f/3.5 L II', #43
     124 => 'Canon MP-E 65mm f/2.8 1-5x Macro Photo', #9
@@ -212,7 +214,7 @@ $VERSION = '3.27';
     137.4 => 'Sigma 24-70mm f/2.8 IF EX DG HSM', #PH
     137.5 => 'Sigma 18-125mm f/3.8-5.6 DC OS HSM', #PH
     137.6 => 'Sigma 17-70mm f/2.8-4 DC Macro OS HSM', #http://u88.n24.queensu.ca/exiftool/forum/index.php/topic,2819.0.html (Contemporary version has this ID - PH)
-    137.7 => 'Sigma 17-50mm f/2.8 OS HSM', #PH (from Exiv2)
+    137.7 => 'Sigma 17-50mm f/2.8 OS HSM', #47
     137.8 => 'Sigma 18-200mm f/3.5-6.3 II DC OS HSM', #PH
     137.9 => 'Tamron AF 18-270mm f/3.5-6.3 Di II VC PZD', #(model B008)http://u88.n24.queensu.ca/exiftool/forum/index.php/topic,3090.0.html
    '137.10' => 'Sigma 8-16mm f/4.5-5.6 DC HSM', #50-Zwielicht
@@ -327,6 +329,7 @@ $VERSION = '3.27';
     213.1 => 'Tamron SP 150-600mm F/5-6.3 Di VC USD', #topic5565 (Model A011)
     214 => 'Canon EF-S 18-55mm f/3.5-5.6 USM', #PH/34
     215 => 'Canon EF 55-200mm f/4.5-5.6 II USM',
+    217 => 'Tamron AF 18-270mm f/3.5-6.3 Di II VC PZD', #47
     224 => 'Canon EF 70-200mm f/2.8L IS', #11
     225 => 'Canon EF 70-200mm f/2.8L IS + 1.4x', #11
     226 => 'Canon EF 70-200mm f/2.8L IS + 2x', #14
@@ -535,7 +538,11 @@ $VERSION = '3.27';
     0x3110000 => 'PowerShot S100 (new)',
     0x3130000 => 'PowerShot SX40 HS',
     0x3120000 => 'PowerShot ELPH 310 HS / IXUS 230 HS / IXY 600F',
-    0x3140000 => 'PowerShot ELPH 500 HS / IXUS 320 HS / IXY 32S', # (duplicate PowerShot model???)
+    # the Canon page lists the IXY 32S as "Japan only", but many other
+    # sites list the ELPH 500 HS and IXUS 320 HS as being the same model.
+    # I haven't been able to find an IXUS 320 sample, and the ELPH 500 HS
+    # is already associated with other IXUS and IXY models - PH
+    0x3140000 => 'IXY 32S', # (PowerShot ELPH 500 HS / IXUS 320 HS ??)
     0x3160000 => 'PowerShot A1300',
     0x3170000 => 'PowerShot A810',
     0x3180000 => 'PowerShot ELPH 320 HS / IXUS 240 HS / IXY 420F',
@@ -555,14 +562,14 @@ $VERSION = '3.27';
     0x3360000 => 'PowerShot S110 (new)',
     0x3370000 => 'PowerShot SX500 IS',
     0x3380000 => 'PowerShot N',
-    0x3390000 => 'IXUS 245 HS / IXY 430F', # (apparently no PowerShot equivalent)
+    0x3390000 => 'IXUS 245 HS / IXY 430F', # (no PowerShot)
     0x3400000 => 'PowerShot SX280 HS',
     0x3410000 => 'PowerShot SX270 HS',
     0x3420000 => 'PowerShot A3500 IS',
     0x3430000 => 'PowerShot A2600',
     0x3450000 => 'PowerShot A1400',
     0x3460000 => 'PowerShot ELPH 130 IS / IXUS 140 / IXY 110F',
-    0x3470000 => 'PowerShot ELPH 115 IS / IXUS 132/135 / IXY 90F',
+    0x3470000 => 'PowerShot ELPH 115/120 IS / IXUS 132/135 / IXY 90F/100F',
     0x3490000 => 'PowerShot ELPH 330 HS / IXUS 255 HS / IXY 610F',
     0x3510000 => 'PowerShot A2500',
     0x3540000 => 'PowerShot G16',
@@ -570,11 +577,16 @@ $VERSION = '3.27';
     0x3560000 => 'PowerShot SX170 IS',
     0x3580000 => 'PowerShot SX510 HS',
     0x3590000 => 'PowerShot S200 (new)',
+    0x3600000 => 'IXY 620F', # (no PowerShot or IXUS?)
     0x3610000 => 'PowerShot N100',
     0x3640000 => 'PowerShot G1 X Mark II',
     0x3650000 => 'PowerShot D30',
     0x3660000 => 'PowerShot SX700 HS',
     0x3670000 => 'PowerShot SX600 HS',
+    0x3680000 => 'PowerShot ELPH 140 IS / IXUS 150', # IXY?
+    0x3690000 => 'PowerShot ELPH 135 / IXUS 145 / IXY 120',
+    0x3700000 => 'PowerShot ELPH 340 HS / IXUS 265 HS / IXY 630',
+    0x3710000 => 'PowerShot ELPH 150 IS / IXUS 155 / IXY 140',
     0x4040000 => 'PowerShot G1',
     0x6040000 => 'PowerShot S100 / Digital IXUS / IXY Digital',
 
@@ -669,6 +681,7 @@ my %canonQuality = (
     130 => 'Normal Movie', #22
 );
 my %canonImageSize = (
+    # -1 - seen this (often with CR2)
     0 => 'Large',
     1 => 'Medium',
     2 => 'Small',
@@ -1691,6 +1704,9 @@ my %binaryDataAttrs = (
             4 => 'Continuous, Low', #PH
             5 => 'Continuous, High', #PH
             6 => 'Silent Single', #PH
+            # ref A: http://u88.n24.queensu.ca/exiftool/forum/index.php/topic,5701.msg27843.html#msg27843
+            9 => 'Single, Silent', #A
+            10 => 'Continuous, Silent', #A
             # 11 - seen for SX260
             # 32-34 - Self-timer?
         },
@@ -5861,6 +5877,7 @@ my %ciMaxFocal = (
     FORMAT => 'int16s',
     FIRST_ENTRY => 1,
     GROUPS => { 0 => 'MakerNotes', 2 => 'Image' },
+    DATAMEMBER => [ 20 ],
     1 => [
         { #5
             Name => 'FileNumber',
@@ -6033,6 +6050,25 @@ my %ciMaxFocal = (
         Name => 'LiveViewShooting',
         PrintConv => { 0 => 'Off', 1 => 'On' },
     },
+    20 => { #47
+        Name => 'FocusDistanceUpper',
+        DataMember => 'FocusDistanceUpper2',
+        Format => 'int16u',
+        RawConv => '($$self{FocusDistanceUpper2} = $val) || undef',
+        ValueConv => '$val / 100',
+        ValueConvInv => '$val * 100',
+        PrintConv => '$val > 655.345 ? "inf" : "$val m"',
+        PrintConvInv => '$val =~ s/ ?m$//; IsFloat($val) ? $val : 655.35',
+    },
+    21 => { #47
+        Name => 'FocusDistanceLower',
+        Condition => '$$self{FocusDistanceUpper2}',
+        Format => 'int16u',
+        ValueConv => '$val / 100',
+        ValueConvInv => '$val * 100',
+        PrintConv => '$val > 655.345 ? "inf" : "$val m"',
+        PrintConvInv => '$val =~ s/ ?m$//; IsFloat($val) ? $val : 655.35',
+    },
     # 22 - values: 0, 1
     # 23 - values: 0, 21, 22
     25 => { #PH

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

@@ -19,7 +19,7 @@ use Image::ExifTool qw(:DataAccess);
 use Image::ExifTool::Canon;
 use Image::ExifTool::Exif;
 
-$VERSION = '1.46';
+$VERSION = '1.48';
 
 sub ProcessCanonCustom($$$);
 sub ProcessCanonCustom2($$$);
@@ -1289,17 +1289,27 @@ my %convPFn = ( PrintConv => \&ConvertPfn, PrintConvInv => \&ConvertPfnInv );
             2 => '+,0,-',
         },
     },
-    0x0106 => {
+    0x0106 => [{
         Name => 'AEBShotCount',
-        Count => -1,
-        Notes => '1 value for the 1DmkIII and 5DmkIII, 2 for the 1DmkIV',
-        PrintConv => [{
-            0 => 3,
-            1 => 2,
-            2 => 5,
-            3 => 7,
-        }],
-    },
+        Condition => '$count == 1',
+        Notes => 'one value for some models...',
+        PrintConv => {
+            0 => '3 shots',
+            1 => '2 shots',
+            2 => '5 shots',
+            3 => '7 shots',
+        },
+    },{
+        Name => 'AEBShotCount',
+        Count => 2,
+        Notes => 'two values for others',
+        PrintConv => {
+            '3 0' => '3 shots',
+            '2 1' => '2 shots',
+            '5 2' => '5 shots',
+            '7 3' => '7 shots',
+        },
+    }],
     0x0107 => {
         Name => 'SpotMeterLinkToAFPoint',
         PrintConv => {
@@ -2280,7 +2290,7 @@ sub ConvertPfnInv($)
 }
 
 #------------------------------------------------------------------------------
-# Read/Write Canon custom 2 directory (used by 1D Mark III)
+# Read/Write Canon custom 2 directory (new for 1D Mark III)
 # Inputs: 0) ExifTool object ref, 1) dirInfo ref, 2) tag table ref
 # Returns: 1 on success
 sub ProcessCanonCustom2($$$)
@@ -2293,10 +2303,11 @@ sub ProcessCanonCustom2($$$)
     my $verbose = $et->Options('Verbose');
     my $newTags;
 
+    return 0 if $size < 2;
     # first entry in array must be the size
     my $len = Get16u($dataPt, $offset);
     unless ($len == $size and $len >= 8) {
-        $et->Warn("Invalid CanonCustom2 data");
+        $et->Warn('Invalid CanonCustom2 data');
         return 0;
     }
     # get group count
@@ -2318,7 +2329,11 @@ sub ProcessCanonCustom2($$$)
         last if $recLen < 8;    # must be at least 8 bytes for recNum and recLen
         $pos += 12;
         my $recPos = $pos;
-        my $recEnd = $pos + $recLen;
+        my $recEnd = $pos + $recLen - 8;
+        if ($recEnd > $end) {
+            $et->Warn('Corrupted CanonCustom2 group');
+            return 0;
+        }
         if ($verbose and not $write) {
             $et->VerboseDir("CanonCustom2 group $recNum", $recCount);
         }
@@ -2332,8 +2347,9 @@ sub ProcessCanonCustom2($$$)
             if ($write) {
                 # write new value
                 my $tagInfo = $$newTags{$tag};
-                next unless $tagInfo;
-                my $nvHash = $et->GetNewValueHash($tagInfo);
+                next unless $$newTags{$tag};
+                $tagInfo = $et->GetTagInfo($tagTablePtr, $tag, \$val, undef, $num) or next;
+                my $nvHash = $et->GetNewValueHash($tagInfo) or next;
                 next unless $et->IsOverwriting($nvHash, $val);
                 my $newVal = $et->GetNewValues($nvHash);
                 next unless defined $newVal;    # can't delete from a custom table
@@ -2358,7 +2374,7 @@ sub ProcessCanonCustom2($$$)
                 }
             }
         }
-        $pos += $recLen - 8;
+        $pos = $recEnd;
     }
     if ($pos != $end) {
         $et->Warn('Possibly corrupted CanonCustom2 data');