exiftool_vendored 9.59.0 → 9.60.0

data/bin/{Image-ExifTool-9.59 → Image-ExifTool-9.60}/html/index.html

@@ -74,9 +74,9 @@ span.sup        { font-size: 0.8em; font-weight: normal; position: relative; top
 </div>
 
 <blockquote><table class='dl lg'><tr><td><b>
-<a href="Image-ExifTool-9.59.tar.gz">
-Download        Version 9.59</a> (3.6 MB) -
-<a href="history.html">May 3, 2014</a></b></td></tr></table></blockquote>
+<a href="Image-ExifTool-9.60.tar.gz">
+Download        Version 9.60</a> (3.6 MB) -
+<a href="history.html">May 11, 2014</a></b></td></tr></table></blockquote>
 
 <p><b>ExifTool is a platform-independent <a href="ExifTool.html">Perl
 library</a> plus a <a href="exiftool_pod.html">command-line application</a> for
@@ -125,8 +125,8 @@ distribution above.)</i></p>
 
 <blockquote><table class='dl lg'><tr><td><b>
 <a name="alone">Windows Executable:</a>
-<a href="exiftool-9.59.zip">
-         exiftool-9.59.zip</a> (3.7 MB)</b></td></tr></table></blockquote>
+<a href="exiftool-9.60.zip">
+         exiftool-9.60.zip</a> (3.7 MB)</b></td></tr></table></blockquote>
 
 <p><b>The stand-alone Windows executable</b> does not require Perl. Just
 download and un-zip the archive then double-click on
@@ -137,8 +137,8 @@ of Windows (including Windows 7).</p>
 
 <blockquote><table class='dl lg'><tr><td><b>
 Mac OS X Package:
-<a href="ExifTool-9.59.dmg">
-         ExifTool-9.59.dmg</a> (2.4 MB)</b></td></tr></table></blockquote>
+<a href="ExifTool-9.60.dmg">
+         ExifTool-9.60.dmg</a> (2.4 MB)</b></td></tr></table></blockquote>
 
 <p><b>The OS X package</b> installs the ExifTool command-line application and
 libraries in /usr/bin. After installing, type "<code>exiftool</code>" in a

data/bin/{Image-ExifTool-9.59 → Image-ExifTool-9.60}/html/struct.html

@@ -158,8 +158,10 @@ string.  The following two techniques are equivalent:</p>
 <h2>Copying</h2>
 
 <p>By default, tags are <b>copied as structures</b>, but flattened tag names
-may still be copied by specifying them explicitly.  Copying as structures
-allows the hierarchy of complex structures to be preserved.</p>
+may still be copied by specifying them explicitly. <span class=lt>(Flattened
+tags are treated as "unsafe" for copying so they are not copied by default
+unless the Struct feature is disabled.)</span> Copying as structures allows the
+hierarchy of complex structures to be preserved.</p>
 
 <blockquote><table class='box'><tr><td>
 <pre># this copies all XMP information as structures
@@ -336,7 +338,7 @@ See the NewXMPxxxStruct tag definition in the <a href="config.html#xmp-xxx">XMP-
 examples of the sample config file</a> for more details.</p>
 
 <hr>
-<i>Last revised Mar. 10, 2012</i>
+<i>Last revised Apr. 8, 2014</i>
 <p class='lf'><a href="index.html">&lt;-- Back to ExifTool home page</a></p>
 </body>
 </html>

data/bin/{Image-ExifTool-9.59 → Image-ExifTool-9.60}/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 = '9.59';
+$VERSION = '9.60';
 $RELEASE = '';
 @ISA = qw(Exporter);
 %EXPORT_TAGS = (

data/bin/{Image-ExifTool-9.59 → Image-ExifTool-9.60}/lib/Image/ExifTool/BuildTagLookup.pm

@@ -32,7 +32,7 @@ use Image::ExifTool::XMP;
 use Image::ExifTool::Canon;
 use Image::ExifTool::Nikon;
 
-$VERSION = '2.75';
+$VERSION = '2.76';
 @ISA = qw(Exporter);
 
 sub NumbersFirst;
@@ -502,8 +502,8 @@ The values of the composite tags are B<Derived From> the values of other
 tags.  These are convenience tags which are calculated after all other
 information is extracted.  Only a few of these tags are writable directly,
 the others are changed by writing the corresponding B<Derived From> tags.
-User-defined Composite tags, useful for custom-formatting of tag values, may
-created in the L<ExifTool configuration file|../config.html>.
+User-defined Composite tags, also useful for custom-formatting of tag
+values, may created via the L<ExifTool configuration file|../config.html>.
 },
     Shortcuts => q{
 Shortcut tags are convenience tags that represent one or more other tag

data/bin/{Image-ExifTool-9.59 → Image-ExifTool-9.60}/lib/Image/ExifTool/Canon.pm

@@ -82,7 +82,7 @@ sub ProcessSerialData($$$);
 sub ProcessFilters($$$);
 sub SwapWords($);
 
-$VERSION = '3.30';
+$VERSION = '3.31';
 
 # Note: Removed 'USM' from 'L' lenses since it is redundant - PH
 # (or is it?  Ref 32 shows 5 non-USM L-type lenses)
@@ -94,6 +94,7 @@ $VERSION = '3.30';
         have the same LensType, and are used by the Composite LensID tag when
         attempting to identify the specific lens model.
      },
+     -1 => 'n/a',
      1 => 'Canon EF 50mm f/1.8',
      2 => 'Canon EF 28mm f/2.8',
      # (3 removed in current Kamisaka list)
@@ -295,7 +296,8 @@ $VERSION = '3.30';
     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', #9
+    180 => 'Canon EF 35mm f/1.4L or Sigma Lens', #9
+    180.1 => 'Sigma 50mm f/1.4 DG HSM | A', #50
     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',
     183 => 'Canon EF 100-400mm f/4.5-5.6L IS or Sigma Lens',
@@ -681,7 +683,7 @@ my %canonQuality = (
     130 => 'Normal Movie', #22
 );
 my %canonImageSize = (
-    # -1 - seen this (often with CR2)
+   -1 => 'n/a',
     0 => 'Large',
     1 => 'Medium',
     2 => 'Small',
@@ -1251,15 +1253,18 @@ my %binaryDataAttrs = (
         ValueConv => '$val =~ s/^8 //; $val',
         ValueConvInv => '"8 $val"',
         PrintConvColumns => 2,
-        PrintConv => { BITMASK => {
-            0 => 'People',
-            1 => 'Scenery',
-            2 => 'Events',
-            3 => 'User 1',
-            4 => 'User 2',
-            5 => 'User 3',
-            6 => 'To Do',
-        } },
+        PrintConv => {
+            0 => '(none)',
+            BITMASK => {
+                0 => 'People',
+                1 => 'Scenery',
+                2 => 'Events',
+                3 => 'User 1',
+                4 => 'User 2',
+                5 => 'User 3',
+                6 => 'To Do',
+            },
+        },
     },
     0x24 => { #PH
         Name => 'FaceDetect1',
@@ -1300,6 +1305,7 @@ my %binaryDataAttrs = (
         ValueConv => 'unpack("H*", $val)',
         ValueConvInv => 'pack("H*", $val)',
     },
+    # 0x29 - WBInfo (ref 52, offset 0x6 is int32u[4] WB_GRBGLevels as shot for PowerShot G9)
     # 0x2d - changes with categories (ref 31)
     0x2f => { #PH (G12)
         Name => 'FaceDetect3',
@@ -1443,10 +1449,7 @@ my %binaryDataAttrs = (
     0xa9 => {
         Name => 'ColorBalance',
         SubDirectory => {
-            # this offset is necessary because the table is interpreted as short rationals
-            # (4 bytes long) but the first entry is 2 bytes into the table.
-            Start => '$valuePtr + 2',
-            Validate => 'Image::ExifTool::Canon::Validate($dirData,$subdirStart-2,$size+2)',
+            Validate => 'Image::ExifTool::Canon::Validate($dirData,$subdirStart,$size)',
             TagTable => 'Image::ExifTool::Canon::ColorBalance',
         },
     },
@@ -1979,17 +1982,20 @@ my %binaryDataAttrs = (
     29 => {
         Name => 'FlashBits',
         PrintConvColumns => 2,
-        PrintConv => { BITMASK => {
-            0 => 'Manual', #PH
-            1 => 'TTL', #PH
-            2 => 'A-TTL', #PH
-            3 => 'E-TTL', #PH
-            4 => 'FP sync enabled',
-            7 => '2nd-curtain sync used',
-            11 => 'FP sync used',
-            13 => 'Built-in',
-            14 => 'External', #(may not be set in manual mode - ref 37)
-        } },
+        PrintConv => {
+            0 => '(none)',
+            BITMASK => {
+                0 => 'Manual', #PH
+                1 => 'TTL', #PH
+                2 => 'A-TTL', #PH
+                3 => 'E-TTL', #PH
+                4 => 'FP sync enabled',
+                7 => '2nd-curtain sync used',
+                11 => 'FP sync used',
+                13 => 'Built-in',
+                14 => 'External', #(may not be set in manual mode - ref 37)
+            },
+        },
     },
     32 => {
         Name => 'FocusContinuous',
@@ -2249,6 +2255,7 @@ my %binaryDataAttrs = (
     9 => {
         Name => 'SequenceNumber',
         Description => 'Shot Number In Continuous Burst',
+        Notes => 'valid only for some models', #PH (ie. not the 5DmkIII)
     },
     10 => { #PH/17
         Name => 'OpticalZoomCode',
@@ -3197,23 +3204,25 @@ my %ciMaxFocal = (
         Name => 'AFPointsInFocus5D',
         Format => 'int16uRev',
         PrintConvColumns => 2,
-        PrintConv => { BITMASK => {
-            0 => 'Center',
-            1 => 'Top',
-            2 => 'Bottom',
-            3 => 'Upper-left',
-            4 => 'Upper-right',
-            5 => 'Lower-left',
-            6 => 'Lower-right',
-            7 => 'Left',
-            8 => 'Right',
-            9 => 'AI Servo1',
-           10 => 'AI Servo2',
-           11 => 'AI Servo3',
-           12 => 'AI Servo4',
-           13 => 'AI Servo5',
-           14 => 'AI Servo6',
-        } },
+        PrintConv => { 0 => '(none)',
+            BITMASK => {
+                0 => 'Center',
+                1 => 'Top',
+                2 => 'Bottom',
+                3 => 'Upper-left',
+                4 => 'Upper-right',
+                5 => 'Lower-left',
+                6 => 'Lower-right',
+                7 => 'Left',
+                8 => 'Right',
+                9 => 'AI Servo1',
+               10 => 'AI Servo2',
+               11 => 'AI Servo3',
+               12 => 'AI Servo4',
+               13 => 'AI Servo5',
+               14 => 'AI Servo6',
+           },
+        },
     },
     0x54 => { #15
         Name => 'WhiteBalance',
@@ -6194,15 +6203,16 @@ my %ciMaxFocal = (
     FIRST_ENTRY => 0,
     GROUPS => { 0 => 'MakerNotes', 2 => 'Camera' },
     # red,green1,green2,blue (ref 2)
-    0  => { Name => 'WB_RGGBLevelsAuto',       Format => 'int16s[4]' },
-    4  => { Name => 'WB_RGGBLevelsDaylight',   Format => 'int16s[4]' },
-    8  => { Name => 'WB_RGGBLevelsShade',      Format => 'int16s[4]' },
-    12 => { Name => 'WB_RGGBLevelsCloudy',     Format => 'int16s[4]' },
-    16 => { Name => 'WB_RGGBLevelsTungsten',   Format => 'int16s[4]' },
-    20 => { Name => 'WB_RGGBLevelsFluorescent',Format => 'int16s[4]' },
-    24 => { Name => 'WB_RGGBLevelsFlash',      Format => 'int16s[4]' },
-    28 => { Name => 'WB_RGGBLevelsCustom',     Format => 'int16s[4]' },
-    32 => { Name => 'WB_RGGBLevelsKelvin',     Format => 'int16s[4]' },
+    1  => { Name => 'WB_RGGBLevelsAuto',       Format => 'int16s[4]' },
+    5  => { Name => 'WB_RGGBLevelsDaylight',   Format => 'int16s[4]' },
+    9  => { Name => 'WB_RGGBLevelsShade',      Format => 'int16s[4]' },
+    13 => { Name => 'WB_RGGBLevelsCloudy',     Format => 'int16s[4]' },
+    17 => { Name => 'WB_RGGBLevelsTungsten',   Format => 'int16s[4]' },
+    21 => { Name => 'WB_RGGBLevelsFluorescent',Format => 'int16s[4]' },
+    25 => { Name => 'WB_RGGBLevelsFlash',      Format => 'int16s[4]' },
+    29 => { Name => 'WB_RGGBLevelsCustom',     Format => 'int16s[4]' }, # (actually black levels for D60, ref 52)
+    33 => { Name => 'WB_RGGBLevelsKelvin',     Format => 'int16s[4]' },
+    37 => { Name => 'WB_RGGBBlackLevels',      Format => 'int16s[4]' }, #52
 );
 
 # Measured color levels (MakerNotes tag 0xaa) (ref 37)
@@ -7458,7 +7468,8 @@ sub CalcSensorDiag($$)
 sub PrintLensID(@)
 {
     my ($printConv, $lensType, $shortFocal, $longFocal, $maxAperture, $lensModel) = @_;
-    my $lens = $$printConv{$lensType};
+    my $lens;
+    $lens = $$printConv{$lensType} unless $lensType < 0;
     if ($lens) {
         # return this lens unless other lenses have the same LensType
         return LensWithTC($lens, $shortFocal) unless $$printConv{"$lensType.1"};

data/bin/{Image-ExifTool-9.59 → Image-ExifTool-9.60}/lib/Image/ExifTool/CanonRaw.pm

@@ -21,7 +21,7 @@ use Image::ExifTool qw(:DataAccess :Utils);
 use Image::ExifTool::Exif;
 use Image::ExifTool::Canon;
 
-$VERSION = '1.56';
+$VERSION = '1.57';
 
 sub WriteCRW($$);
 sub ProcessCanonRaw($$$);
@@ -74,9 +74,7 @@ sub BuildMakerNotes($$$$$$);
     0x080a => {
         Name => 'CanonRawMakeModel',
         Writable => 0,
-        SubDirectory => {
-            TagTable => 'Image::ExifTool::CanonRaw::MakeModel',
-        },
+        SubDirectory => { TagTable => 'Image::ExifTool::CanonRaw::MakeModel' },
     },
     0x080b => { Name => 'CanonFirmwareVersion', Writable => 'string[32]' },
     0x080c => { Name => 'ComponentVersion',     Writable => 'string'     }, #3
@@ -120,16 +118,12 @@ sub BuildMakerNotes($$$$$$);
     0x1029 => {
         Name => 'CanonFocalLength',
         Writable => 0,
-        SubDirectory => {
-            TagTable => 'Image::ExifTool::Canon::FocalLength',
-        },
+        SubDirectory => { TagTable => 'Image::ExifTool::Canon::FocalLength' },
     },
     0x102a => {
         Name => 'CanonShotInfo',
         Writable => 0,
-        SubDirectory => {
-            TagTable => 'Image::ExifTool::Canon::ShotInfo',
-        },
+        SubDirectory => { TagTable => 'Image::ExifTool::Canon::ShotInfo' },
     },
     0x102c => {
         Name => 'CanonColorInfo2',
@@ -142,9 +136,7 @@ sub BuildMakerNotes($$$$$$);
     0x102d => {
         Name => 'CanonCameraSettings',
         Writable => 0,
-        SubDirectory => {
-            TagTable => 'Image::ExifTool::Canon::CameraSettings',
-        },
+        SubDirectory => { TagTable => 'Image::ExifTool::Canon::CameraSettings' },
     },
     0x1030 => { #4
         Name => 'WhiteSample',
@@ -157,9 +149,7 @@ sub BuildMakerNotes($$$$$$);
     0x1031 => {
         Name => 'SensorInfo',
         Writable => 0,
-        SubDirectory => {
-            TagTable => 'Image::ExifTool::Canon::SensorInfo',
-        },
+        SubDirectory => { TagTable => 'Image::ExifTool::Canon::SensorInfo' },
     },
     # this tag has only be verified for the 10D in CRW files, but the D30 and D60
     # also produce CRW images and have CustomFunction information in their JPEG's
@@ -201,9 +191,7 @@ sub BuildMakerNotes($$$$$$);
     0x1038 => {
         Name => 'CanonAFInfo',
         Writable => 0,
-        SubDirectory => {
-            TagTable => 'Image::ExifTool::Canon::AFInfo',
-        },
+        SubDirectory => { TagTable => 'Image::ExifTool::Canon::AFInfo' },
     },
     0x1093 => {
         Name => 'CanonFileInfo',
@@ -215,12 +203,7 @@ sub BuildMakerNotes($$$$$$);
     0x10a9 => {
         Name => 'ColorBalance',
         Writable => 0,
-        SubDirectory => {
-            # this offset is necessary because the table contains short rationals
-            # (4 bytes long) but the first entry is 2 bytes into the table.
-            Start => '2',
-            TagTable => 'Image::ExifTool::Canon::ColorBalance',
-        },
+        SubDirectory => { TagTable => 'Image::ExifTool::Canon::ColorBalance' },
     },
     0x10b5 => { #PH
         Name => 'RawJpgInfo',
@@ -245,9 +228,7 @@ sub BuildMakerNotes($$$$$$);
     0x1803 => { #3
         Name => 'ImageFormat',
         Writable => 0,
-        SubDirectory => {
-            TagTable => 'Image::ExifTool::CanonRaw::ImageFormat',
-        },
+        SubDirectory => { TagTable => 'Image::ExifTool::CanonRaw::ImageFormat' },
     },
     0x1804 => { Name => 'RecordID', Writable => 'int32u' }, #3
     0x1806 => { #3
@@ -330,9 +311,7 @@ sub BuildMakerNotes($$$$$$);
         Name => 'ExposureInfo',
         Groups => { 1 => 'CIFF' }, # (only so CIFF shows up in group lists)
         Writable => 0,
-        SubDirectory => {
-            TagTable => 'Image::ExifTool::CanonRaw::ExposureInfo',
-        },
+        SubDirectory => { TagTable => 'Image::ExifTool::CanonRaw::ExposureInfo' },
     },
     0x1834 => { #PH
         Name => 'CanonModelID',
@@ -348,9 +327,7 @@ sub BuildMakerNotes($$$$$$);
     0x1835 => {
         Name => 'DecoderTable',
         Writable => 0,
-        SubDirectory => {
-            TagTable => 'Image::ExifTool::CanonRaw::DecoderTable',
-        },
+        SubDirectory => { TagTable => 'Image::ExifTool::CanonRaw::DecoderTable' },
     },
     0x183b => { #PH
         # display format for serial number