exiftool_vendored 10.01.0 → 10.04.0

data/bin/{Image-ExifTool-10.01 → Image-ExifTool-10.04}/html/metafiles.html

@@ -201,8 +201,8 @@ exiftool-specific namespaces to give an exact mapping for all exiftool tag
 names.  This type of file is better suited to general information
 storage/recovery since it facilitates copying of more original metadata than an
 XMP file, but it doesn't have the portability of an XMP file or the ability to
-store native-format data like a MIE file, and ExifTool can not be used to edit
-XML files as it can with other metadata files.  Below are example commands
+store native-format data like a MIE or EXV file, and ExifTool can not be used to
+edit XML files as it can with other metadata files.  Below are example commands
 demonstrating the use of exiftool XML files.</p>
 
 <p>Create an exiftool XML sidecar file:</p>
@@ -311,12 +311,12 @@ which may be useful if disk space is at a premium.</p>
 
 <p>EXV files are used by <a href="http://exiv2.org/">Exiv2</a>, and are
 basically a JPEG file without the image data, so they may be used as a metadata
-file to contain any information supported by the JPEG format.  ExifTool has full
-read, write and create support for this format.</p>
+file to contain any information supported by the JPEG format (EXIF, XMP, IPTC,
+etc.).  ExifTool has full read, write and create support for this format.</p>
 
 <hr>
 <i>Created Nov 12, 2008</i><br>
-<i>Last revised Jul 27, 2015</i>
+<i>Last revised Sept 3, 2015</i>
 <p class='lf'><a href="index.html">&lt;-- Back to ExifTool home page</a></p>
 </body>
 </html>

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

@@ -27,7 +27,7 @@ use vars qw($VERSION $RELEASE @ISA @EXPORT_OK %EXPORT_TAGS $AUTOLOAD @fileTypes
             %mimeType $swapBytes $swapWords $currentByteOrder %unpackStd
             %jpegMarker %specialTags);
 
-$VERSION = '10.01';
+$VERSION = '10.04';
 $RELEASE = '';
 @ISA = qw(Exporter);
 %EXPORT_TAGS = (
@@ -4908,7 +4908,7 @@ sub ConvertFileName($$)
 }
 
 #------------------------------------------------------------------------------
-# Inverse conversion for file name (encode 
+# Inverse conversion for file name (encode
 # Inputs: 0) ExifTool ref, 1) file name in external character set
 # Returns: file name in CharsetFileName character set
 sub InverseFileName($$)

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

@@ -102,7 +102,7 @@ sub KeyExpansion($)
 
     # temporary variables (all unsigned characters)
     my ($i,@temp);
-    
+
     # The first round key is the key itself.
     for ($i=0; $i<$nk; ++$i) {
         @RoundKey[$i*4..$i*4+3] = @key[$i*4..$i*4+3];

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

@@ -20,7 +20,7 @@ $VERSION = '1.02';
     WRITABLE => 1,
     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
+    # 0x0001 - int32s: seen 0, 1, 2, 3
     # 0x0002 - binary plist with a single data object of size 512 bytes (iPhone5s)
     0x0003 => {
         Name => 'RunTime',
@@ -47,9 +47,11 @@ $VERSION = '1.02';
     },
     # 0x000c - rational64s[2]: eg) "0.1640625 0.19921875"
     # 0x000d - int32s: 0
-    # 0x000e - int32s: 0,1
+    # 0x000e - int32s: 0,1,12
     # 0x000f - int32s: 3
     # 0x0010 - int32s: 1
+    # 0x0011 - string[37]: some type of UID, eg. "FFCBAC24-E547-4BBC-AF47-38B1A3D845E3\0" (iPhone 6s, iOS 6.1)
+    # 0x0014 - int32s: 1,3 (iPhone 6s, iOS 6.1)
 );
 
 # PLIST-format CMTime structure (ref PH)

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

@@ -32,7 +32,7 @@ use Image::ExifTool::XMP;
 use Image::ExifTool::Canon;
 use Image::ExifTool::Nikon;
 
-$VERSION = '2.89';
+$VERSION = '2.90';
 @ISA = qw(Exporter);
 
 sub NumbersFirst($$);
@@ -396,6 +396,11 @@ 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
+
+Photoshop path tags (Tag ID's 0x7d0 to 0xbb5) are not defined by default,
+but a config file included in the full ExifTool distribution
+(config_files/photoshop_paths.config) contains the tag definitions to allow
+access to this information.
 },
     PrintIM => q{
 The format of the PrintIM information is known, however no PrintIM tags have
@@ -1597,7 +1602,7 @@ sub Doc2Html($)
     $doc =~ s/B&lt;(.*?)&gt;/<b>$1<\/b>/sg;
     $doc =~ s/C&lt;(.*?)&gt;/<code>$1<\/code>/sg;
     $doc =~ s/I&lt;(.*?)&gt;/<i>$1<\/i>/sg;
-    # L<some text|http://owl.phy.queensu.ca/~phil/exiftool/struct.html#Fields> --> <a href="../struct.html#Fields">some text</a> 
+    # L<some text|http://owl.phy.queensu.ca/~phil/exiftool/struct.html#Fields> --> <a href="../struct.html#Fields">some text</a>
     $doc =~ s{L&lt;([^&]+?)\|\Q$homePage\E/(.*?)&gt;}{<a href="../$2">$1<\/a>}sg;
     # L<http://owl.phy.queensu.ca/~phil/exiftool/struct.html> --> <a href="http://owl.phy.queensu.ca/~phil/exiftool/struct.html">http://owl.phy.queensu.ca/~phil/exiftool/struct.html</a>
     $doc =~ s{L&lt;\Q$homePage\E/(.*?)&gt;}{<a href="../$1">$1<\/a>}sg;
@@ -2256,7 +2261,7 @@ sub WriteTagNames($$)
                 length($tag) > $wTag2 and $w -= length($tag) - $wTag2;
                 printf PODFILE " %-${w}s", shift(@reqs) || '';
             }
-            printf PODFILE " $wrStr\n";
+            print PODFILE " $wrStr\n";
             my $numTags = scalar @$tagNames;
             my $n = 0;
             while (@tags or @reqs or @vals) {
@@ -2432,7 +2437,7 @@ sub WriteTagNames($$)
             warn "Notice: Long tags in $tableName table\n";
         }
         unless ($infoCount) {
-            printf PODFILE "  [no tags known]\n";
+            print PODFILE "  [no tags known]\n";
             my $cols = 3;
             ++$cols if $hid;
             ++$cols if $derived;

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

@@ -83,7 +83,7 @@ sub ProcessSerialData($$$);
 sub ProcessFilters($$$);
 sub SwapWords($);
 
-$VERSION = '3.52';
+$VERSION = '3.54';
 
 # Note: Removed 'USM' from 'L' lenses since it is redundant - PH
 # (or is it?  Ref 32 shows 5 non-USM L-type lenses)
@@ -186,6 +186,8 @@ $VERSION = '3.52';
     44 => 'Canon EF 90-300mm f/4.5-5.6', #32
     45 => 'Canon EF-S 18-55mm f/3.5-5.6 [II]', #PH (same ID for version II, ref 20)
     46 => 'Canon EF 28-90mm f/4-5.6', #32
+    47 => 'Zeiss Milvus 35mm f/2 or 50mm f/2', #52
+    47.1 => 'Zeiss Milvus 50mm f/2 Makro', #52
     48 => 'Canon EF-S 18-55mm f/3.5-5.6 IS', #20
     49 => 'Canon EF-S 55-250mm f/4-5.6 IS', #23
     50 => 'Canon EF-S 18-200mm f/3.5-5.6 IS',
@@ -260,7 +262,8 @@ $VERSION = '3.52';
     153.2 => 'Tamron AF 28-300mm f/3.5-6.3 XR LD Aspherical [IF] Macro',
     153.3 => 'Tamron AF 18-200mm f/3.5-6.3 XR Di II LD Aspherical [IF] Macro Model A14', #15
     153.4 => 'Tamron 18-250mm f/3.5-6.3 Di II LD Aspherical [IF] Macro', #PH
-    154 => 'Canon EF 20mm f/2.8 USM', #15
+    154 => 'Canon EF 20mm f/2.8 USM or Zeiss Lens', #15
+    154.1 => 'Zeiss Milvus 21mm f/2.8', #52
     155 => 'Canon EF 85mm f/1.8 USM',
     156 => 'Canon EF 28-105mm f/3.5-4.5 USM or Tamron Lens',
     156.1 => 'Tamron SP 70-300mm f/4.0-5.6 Di VC USD', #PH (model A005)
@@ -299,20 +302,25 @@ $VERSION = '3.52';
     173 => 'Canon EF 180mm Macro f/3.5L or Sigma Lens', #9
     173.1 => 'Sigma 180mm EX HSM Macro f/3.5', #14
     173.2 => 'Sigma APO Macro 150mm f/2.8 EX DG HSM', #14
-    174 => 'Canon EF 135mm f/2L or Sigma Lens', #9
+    174 => 'Canon EF 135mm f/2L or Other Lens', #9
     174.1 => 'Sigma 70-200mm f/2.8 EX DG APO OS HSM', #PH (probably version II of this lens)
     174.2 => 'Sigma 50-500mm f/4.5-6.3 APO DG OS HSM', #forum4031
     174.3 => 'Sigma 150-500mm f/5-6.3 APO DG OS HSM', #47
+    174.4 => 'Zeiss Milvus 100mm f/2 Makro', #52
     175 => 'Canon EF 400mm f/2.8L', #32
     176 => 'Canon EF 24-85mm f/3.5-4.5 USM',
     177 => 'Canon EF 300mm f/4L IS', #9
     178 => 'Canon EF 28-135mm f/3.5-5.6 IS',
     179 => 'Canon EF 24mm f/1.4L', #20
-    180 => 'Canon EF 35mm f/1.4L or Sigma Lens', #9
+    180 => 'Canon EF 35mm f/1.4L or Other Lens', #9
     180.1 => 'Sigma 50mm f/1.4 DG HSM | A', #50
     180.2 => 'Sigma 24mm f/1.4 DG HSM | A', #53
-    181 => 'Canon EF 100-400mm f/4.5-5.6L IS + 1.4x', #15
-    182 => 'Canon EF 100-400mm f/4.5-5.6L IS + 2x',
+    180.3 => 'Zeiss Milvus 50mm f/1.4', #52
+    180.4 => 'Zeiss Milvus 85mm f/1.4', #52
+    181 => 'Canon EF 100-400mm f/4.5-5.6L IS + 1.4x or Sigma Lens', #15
+    181.1 => 'Sigma 150-600mm f/5-6.3 DG OS HSM | S + 1.4x', #50
+    182 => 'Canon EF 100-400mm f/4.5-5.6L IS + 2x or Sigma Lens',
+    182.1 => 'Sigma 150-600mm f/5-6.3 DG OS HSM | S + 2x', #PH (NC)
     183 => 'Canon EF 100-400mm f/4.5-5.6L IS or Sigma Lens',
     183.1 => 'Sigma 150mm f/2.8 EX DG OS HSM APO Macro', #50
     183.2 => 'Sigma 105mm f/2.8 EX DG OS HSM Macro', #50
@@ -346,6 +354,8 @@ $VERSION = '3.52';
     213 => 'Canon EF 90-300mm f/4.5-5.6 USM or Tamron Lens',
     213.1 => 'Tamron SP 150-600mm f/5-6.3 Di VC USD', #topic5565 (model A011)
     213.2 => 'Tamron 16-300mm f/3.5-6.3 Di II VC PZD Macro', #PH (model B016)
+    213.3 => 'Tamron SP 35mm f/1.8 Di VC USD', #PH (model F012)
+    213.4 => 'Tamron SP 45mm f/1.8 Di VC USD', #PH (model F013)
     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
@@ -374,7 +384,8 @@ $VERSION = '3.52';
     245 => 'Canon EF 70-200mm f/4L IS + 2.8x', #32
     246 => 'Canon EF 16-35mm f/2.8L II', #PH
     247 => 'Canon EF 14mm f/2.8L II USM', #32
-    248 => 'Canon EF 200mm f/2L IS', #42
+    248 => 'Canon EF 200mm f/2L IS or Sigma Lens', #42
+    248.1 => 'Sigma 24-35mm f/2 DG HSM | A', #JR
     249 => 'Canon EF 800mm f/5.6L IS', #35
     250 => 'Canon EF 24 f/1.4L II', #41
     251 => 'Canon EF 70-200mm f/2.8L IS II USM',
@@ -416,6 +427,7 @@ $VERSION = '3.52';
     4149 => 'Canon EF-M 55-200mm f/4.5-6.3 IS STM', #42
     4150 => 'Canon EF-S 10-18mm f/4.5-5.6 IS STM', #42
     4152 => 'Canon EF 24-105mm f/3.5-5.6 IS STM', #42
+    4153 => 'Canon EF-M 15-45mm f/3.5-6.3 IS STM', #PH
     4154 => 'Canon EF-S 24mm f/2.8 STM', #52
     4156 => 'Canon EF 50mm f/1.8 STM', #42
 );
@@ -566,7 +578,7 @@ $VERSION = '3.52';
     0x3050000 => 'PowerShot A2200',
     0x3060000 => 'PowerShot A1200',
     0x3070000 => 'PowerShot SX220 HS',
-    0x3080000 => 'PowerShot G1 X', 
+    0x3080000 => 'PowerShot G1 X',
     0x3090000 => 'PowerShot SX150 IS',
     0x3100000 => 'PowerShot ELPH 510 HS / IXUS 1100 HS / IXY 51S',
     0x3110000 => 'PowerShot S100 (new)',
@@ -630,12 +642,15 @@ $VERSION = '3.52';
     0x3800000 => 'PowerShot SX530 HS',
     0x3820000 => 'PowerShot SX710 HS',
     0x3830000 => 'PowerShot SX610 HS',
+    0x3840000 => 'EOS M10',
     0x3850000 => 'PowerShot G3 X',
     0x3860000 => 'PowerShot ELPH 165 HS / IXUS 165 / IXY 160',
     0x3870000 => 'PowerShot ELPH 160 / IXUS 160',
     0x3880000 => 'PowerShot ELPH 350 HS / IXUS 275 HS / IXY 640',
     0x3890000 => 'PowerShot ELPH 170 IS / IXUS 170',
     0x3910000 => 'PowerShot SX410 IS',
+    0x3930000 => 'PowerShot G9 X',
+    0x3950000 => 'PowerShot G5 X',
     0x4040000 => 'PowerShot G1',
     0x6040000 => 'PowerShot S100 / Digital IXUS / IXY Digital',
 
@@ -1460,7 +1475,7 @@ my %offOn = ( 0 => 'Off', 1 => 'On' );
         Writable => 'undef',
         Flags => [ 'Binary', 'Protected' ],
         # 0x00: int8u  - Version (0 or 1)
-        # 0x01: int8u  - LensInfo ? (1) 
+        # 0x01: int8u  - LensInfo ? (1)
         # 0x02: int8u  - AVValue ? (int8u for version 0, int16u for version 1)
         # 0x03: int8u  - POValue ? (int8u for version 0, int16u for version 1)
         # 0x04: int16u - DustCount
@@ -7133,18 +7148,18 @@ my %ciMaxFocal = (
         Condition => '$$self{ColorDataVersion} == 11',
         Format => 'int16u[4]',
     },
-    0x2dc => { 
+    0x2dc => {
         Name => 'NormalWhiteLevel',
         Condition => '$$self{ColorDataVersion} == 11',
         Format => 'int16u',
         RawConv => '$val || undef',
     },
-    0x2dd => { 
+    0x2dd => {
         Name => 'SpecularWhiteLevel',
         Condition => '$$self{ColorDataVersion} == 11',
         Format => 'int16u',
     },
-    0x2de => { 
+    0x2de => {
         Name => 'LinearityUpperMargin',
         Condition => '$$self{ColorDataVersion} == 11',
         Format => 'int16u',
@@ -7887,6 +7902,11 @@ sub PrintLensID(@)
                 # see if we can rule out this lens by focal length or aperture
                 $lf = $sf if $sf and not $lf;
                 $la = $sa if $sa and not $la;
+                # account for converter-specific LensType's (ie. end with " + #.#x")
+                if ($lens =~ / \+ (\d+(\.\d+)?)x$/) {
+                    $sf *= $1;  $lf *= $1;
+                    $sa *= $1;  $la *= $1;
+                }
                 next if abs($shortFocal - $sf * $tc) > 0.9;
                 my $tclens = $lens;
                 $tclens .= " + ${tc}x" if $tc > 1;

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

@@ -1954,7 +1954,7 @@ sub ProcessCanonVRD($$;$)
             # create blank VRD data from scratch
             my $blank = $blankHeader . $blankFooter;
             $dataPt = \$blank;
-            $verbose and printf $out "  Creating CanonVRD trailer\n";
+            $verbose and print $out "  Creating CanonVRD trailer\n";
             $created = 1;
         }
         $raf = new File::RandomAccess($dataPt);
@@ -2005,7 +2005,7 @@ sub ProcessCanonVRD($$;$)
     my $vrdType = 'VRD';
 
     if ($outfile) {
-        $verbose and not $created and printf $out "  Rewriting CanonVRD trailer\n";
+        $verbose and not $created and print $out "  Rewriting CanonVRD trailer\n";
         # delete CanonVRD information if specified
         my $doDel = $$et{DEL_GROUP}{CanonVRD};
         unless ($doDel) {
@@ -2026,7 +2026,7 @@ sub ProcessCanonVRD($$;$)
             if ($$et{FILE_TYPE} eq 'VRD') {
                 my $newVal = $et->GetNewValues('CanonVRD');
                 if ($newVal) {
-                    $verbose and printf $out "  Writing CanonVRD as a block\n";
+                    $verbose and print $out "  Writing CanonVRD as a block\n";
                     if ($outfile eq $dataPt) {
                         $$outfile = $newVal;
                     } else {
@@ -2038,7 +2038,7 @@ sub ProcessCanonVRD($$;$)
                     $et->Error("Can't delete all CanonVRD information from a VRD file");
                 }
             } else {
-                $verbose and printf $out "  Deleting CanonVRD trailer\n";
+                $verbose and print $out "  Deleting CanonVRD trailer\n";
                 $$outfile = '' if $outfile eq $dataPt;
                 ++$$et{CHANGED};
             }
@@ -2072,7 +2072,7 @@ sub ProcessCanonVRD($$;$)
     # validate VRD trailer and get position and length of edit record
     SetByteOrder('MM'); # VRD header/footer is big-endian
     my $pos = 0x1c;     # start at end of header
- 
+
     # loop through the VRD blocks
     for (;;) {
         my $end = $dirLen - 0x40;   # end of last VRD block (and start of footer)
@@ -2189,7 +2189,7 @@ sub ProcessCanonVRD($$;$)
         if (length $$dataPt) {
             Write($outfile, $$dataPt) or $err = 1 unless $outfile eq $dataPt;
         } else {
-            $verbose and printf $out "  Deleting CanonVRD trailer\n";
+            $verbose and print $out "  Deleting CanonVRD trailer\n";
         }
     } elsif ($vrdType eq 'VRD' and (($$et{TAGS_FROM_FILE} and
         not $$et{EXCL_TAG_LOOKUP}{canonvrd}) or $$et{REQ_TAG_LOOKUP}{canonvrd}))

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

@@ -1609,7 +1609,7 @@ $VERSION = '1.37';
     0x3015 => {
         Name => 'ColorMode',
         Writable => 'int16u',
-        PrintConv => {  
+        PrintConv => {
             0 => 'Off',
             2 => 'Black & White', #PH (EX-Z400,FH20)
             3 => 'Sepia', #PH (EX-Z400)