exiftool_vendored 9.33.1 → 9.37.0

data/bin/{Image-ExifTool-9.33 → Image-ExifTool-9.37}/lib/Image/ExifTool.pod

@@ -65,37 +65,38 @@ supported by ExifTool (r = read, w = write, c = create):
 
   File Types
   ------------+-------------+-------------+-------------+------------
-  3FR   r     | EIP   r     | LA    r     | ORF   r/w   | RSRC  r
-  3G2   r     | EPS   r/w   | LNK   r     | OTF   r     | RTF   r
-  3GP   r     | ERF   r/w   | M2TS  r     | PAC   r     | RW2   r/w
-  ACR   r     | EXE   r     | M4A/V r     | PAGES r     | RWL   r/w
-  AFM   r     | EXIF  r/w/c | MEF   r/w   | PBM   r/w   | RWZ   r
-  AI    r/w   | EXR   r     | MIE   r/w/c | PCD   r     | RM    r
-  AIFF  r     | F4A/V r     | MIFF  r     | PDF   r/w   | SO    r
-  APE   r     | FFF   r/w   | MKA   r     | PEF   r/w   | SR2   r/w
-  ARW   r/w   | FLA   r     | MKS   r     | PFA   r     | SRF   r
-  ASF   r     | FLAC  r     | MKV   r     | PFB   r     | SRW   r/w
-  AVI   r     | FLV   r     | MNG   r/w   | PFM   r     | SVG   r
-  BMP   r     | FPF   r     | MODD  r     | PGF   r     | SWF   r
-  BTF   r     | FPX   r     | MOS   r/w   | PGM   r/w   | THM   r/w
-  CHM   r     | GIF   r/w   | MOV   r     | PLIST r     | TIFF  r/w
-  COS   r     | GZ    r     | MP3   r     | PICT  r     | TTC   r
-  CR2   r/w   | HDP   r/w   | MP4   r     | PMP   r     | TTF   r
-  CRW   r/w   | HDR   r     | MPC   r     | PNG   r/w   | VRD   r/w/c
-  CS1   r/w   | HTML  r     | MPG   r     | PPM   r/w   | VSD   r
-  DCM   r     | ICC   r/w/c | MPO   r/w   | PPT   r     | WAV   r
-  DCP   r/w   | IDML  r     | MQV   r     | PPTX  r     | WDP   r/w
-  DCR   r     | IIQ   r/w   | MRW   r/w   | PS    r/w   | WEBP  r
-  DFONT r     | IND   r/w   | MXF   r     | PSB   r/w   | WEBM  r
-  DIVX  r     | INX   r     | NEF   r/w   | PSD   r/w   | WMA   r
-  DJVU  r     | ITC   r     | NRW   r/w   | PSP   r     | WMV   r
-  DLL   r     | J2C   r     | NUMBERS r   | QTIF  r     | WV    r
-  DNG   r/w   | JNG   r/w   | ODP   r     | RA    r     | X3F   r/w
-  DOC   r     | JP2   r/w   | ODS   r     | RAF   r/w   | XCF   r
-  DOCX  r     | JPEG  r/w   | ODT   r     | RAM   r     | XLS   r
-  DV    r     | K25   r     | OFR   r     | RAR   r     | XLSX  r
-  DVB   r     | KDC   r     | OGG   r     | RAW   r/w   | XMP   r/w/c
-  DYLIB r     | KEY   r     | OGV   r     | RIFF  r     | ZIP   r
+  3FR   r     | EPS   r/w   | M2TS  r     | PAGES r     | RWZ   r
+  3G2   r     | ERF   r/w   | M4A/V r     | PBM   r/w   | RM    r
+  3GP   r     | EXE   r     | MEF   r/w   | PCD   r     | SO    r
+  ACR   r     | EXIF  r/w/c | MIE   r/w/c | PDF   r/w   | SR2   r/w
+  AFM   r     | EXR   r     | MIFF  r     | PEF   r/w   | SRF   r
+  AI    r/w   | F4A/V r     | MKA   r     | PFA   r     | SRW   r/w
+  AIFF  r     | FFF   r/w   | MKS   r     | PFB   r     | SVG   r
+  APE   r     | FLA   r     | MKV   r     | PFM   r     | SWF   r
+  ARW   r/w   | FLAC  r     | MNG   r/w   | PGF   r     | THM   r/w
+  ASF   r     | FLV   r     | MODD  r     | PGM   r/w   | TIFF  r/w
+  AVI   r     | FPF   r     | MOS   r/w   | PLIST r     | TORRENT r
+  BMP   r     | FPX   r     | MOV   r     | PICT  r     | TTC   r
+  BTF   r     | GIF   r/w   | MP3   r     | PMP   r     | TTF   r
+  CHM   r     | GZ    r     | MP4   r     | PNG   r/w   | VRD   r/w/c
+  COS   r     | HDP   r/w   | MPC   r     | PPM   r/w   | VSD   r
+  CR2   r/w   | HDR   r     | MPG   r     | PPT   r     | WAV   r
+  CRW   r/w   | HTML  r     | MPO   r/w   | PPTX  r     | WDP   r/w
+  CS1   r/w   | ICC   r/w/c | MQV   r     | PS    r/w   | WEBP  r
+  DCM   r     | IDML  r     | MRW   r/w   | PSB   r/w   | WEBM  r
+  DCP   r/w   | IIQ   r/w   | MXF   r     | PSD   r/w   | WMA   r
+  DCR   r     | IND   r/w   | NEF   r/w   | PSP   r     | WMV   r
+  DFONT r     | INX   r     | NRW   r/w   | QTIF  r     | WV    r
+  DIVX  r     | ITC   r     | NUMBERS r   | RA    r     | X3F   r/w
+  DJVU  r     | J2C   r     | ODP   r     | RAF   r/w   | XCF   r
+  DLL   r     | JNG   r/w   | ODS   r     | RAM   r     | XLS   r
+  DNG   r/w   | JP2   r/w   | ODT   r     | RAR   r     | XLSX  r
+  DOC   r     | JPEG  r/w   | OFR   r     | RAW   r/w   | XMP   r/w/c
+  DOCX  r     | K25   r     | OGG   r     | RIFF  r     | ZIP   r
+  DV    r     | KDC   r     | OGV   r     | RSRC  r     |
+  DVB   r     | KEY   r     | ORF   r/w   | RTF   r     |
+  DYLIB r     | LA    r     | OTF   r     | RW2   r/w   |
+  EIP   r     | LNK   r     | PAC   r     | RWL   r/w   |
 
   Meta Information
   ----------------------+----------------------+---------------------

data/bin/Image-ExifTool-9.37/lib/Image/ExifTool/Apple.pm

@@ -0,0 +1,101 @@
+#------------------------------------------------------------------------------
+# File:         Apple.pm
+#
+# Description:  Apple EXIF maker notes tags
+#
+# Revisions:    2013-09-13 - P. Harvey Created
+#------------------------------------------------------------------------------
+
+package Image::ExifTool::Apple;
+
+use strict;
+use vars qw($VERSION);
+use Image::ExifTool::PLIST;
+
+$VERSION = '1.00';
+
+%Image::ExifTool::Apple::Main = (
+    WRITE_PROC => \&Image::ExifTool::Exif::WriteExif,
+    CHECK_PROC => \&Image::ExifTool::Exif::CheckExif,
+    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
+    0x0003 => {
+        Name => 'CMTime',
+        SubDirectory => { TagTable => 'Image::ExifTool::Apple::CMTime' },
+    },
+    # 0x0004 - int32s: normally 1, but 0 for low-light images
+    # 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
+    0x000a => {
+        Name => 'HDRImageType',
+        Writable => 'int32s',
+        PrintConv => {
+            3 => 'HDR Image',
+            4 => 'Original Image',
+        },
+    },
+);
+
+# PLIST-format CMTime information (ref PH)
+# (CMTime ref https://developer.apple.com/library/ios/documentation/CoreMedia/Reference/CMTime/Reference/reference.html)
+%Image::ExifTool::Apple::CMTime = (
+    PROCESS_PROC => \&Image::ExifTool::PLIST::ProcessBinaryPLIST,
+    GROUPS => { 0 => 'MakerNotes', 2 => 'Image' },
+    timescale => { Name => 'CMTimeScale' }, # (seen 1000000000 - ns)
+    epoch     => { Name => 'CMTimeEpoch' }, # (seen 0)
+    value     => { Name => 'CMTimeValue' }, # (should divide by CMTimeScale to get seconds)
+    # observed "value" from images of one camera (iOS 7 beta):
+    # DateTimeOriginal      Value
+    # 2013:09:03 06:20:11	392368459447083
+    # 2013:09:03 09:44:22	399081122065875
+    # 2013:09:04 09:05:38	417739069527500
+    # 2013:09:06 06:47:55	452906569605333
+    # 2013:09:07 20:17:27	29656470330750
+    # 2013:09:08 16:50:43	51536195061583
+    # 2013:09:09 08:10:29	62485213304958
+    # --> can't figure these out
+    flags => {
+        Name => 'CMTimeFlags',
+        PrintConv => { BITMASK => {
+            0 => 'Valid',
+            1 => 'Has been rounded',
+            2 => 'Positive infinity',
+            3 => 'Negative infinity',
+            4 => 'Indefinite',
+        }},
+    },
+);
+
+1;  # end
+
+__END__
+
+=head1 NAME
+
+Image::ExifTool::Apple - Apple EXIF maker notes tags
+
+=head1 SYNOPSIS
+
+This module is loaded automatically by Image::ExifTool when required.
+
+=head1 DESCRIPTION
+
+This module contains definitions required by Image::ExifTool to interpret
+Apple maker notes in EXIF information.
+
+=head1 AUTHOR
+
+Copyright 2003-2013, Phil Harvey (phil at owl.phy.queensu.ca)
+
+This library is free software; you can redistribute it and/or modify it
+under the same terms as Perl itself.
+
+=head1 SEE ALSO
+
+L<Image::ExifTool::TagNames/Apple Tags>,
+L<Image::ExifTool(3pm)|Image::ExifTool>
+
+=cut

data/bin/{Image-ExifTool-9.33 → Image-ExifTool-9.37}/lib/Image/ExifTool/BuildTagLookup.pm

@@ -32,7 +32,7 @@ use Image::ExifTool::XMP;
 use Image::ExifTool::Canon;
 use Image::ExifTool::Nikon;
 
-$VERSION = '2.63';
+$VERSION = '2.64';
 @ISA = qw(Exporter);
 
 sub NumbersFirst;
@@ -123,6 +123,7 @@ my %formatOK = (
     resize   => 1,
     digits   => 1,
     int16uRev => 1,
+    int32uRev => 1,
     rational32u => 1,
     rational32s => 1,
     pstring     => 1,
@@ -494,9 +495,10 @@ be written without modifying the file itself.
     Composite => q{
 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.  User-defined Composite tags, useful for
-custom-formatting of tag values, may created in the L<ExifTool configuration
-file|../config.html>.
+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>.
 },
     Shortcuts => q{
 Shortcut tags are convenience tags that represent one or more other tag
@@ -2271,7 +2273,14 @@ sub WriteTagNames($$)
                             next;
                         }
                         # make text in square brackets small
-                        /^\[/ and push(@values, "<span class=s>$_</span>"), next;
+                        if (/^\[/) {
+                            if (s/^\[!HTML\]//) {
+                                push @values, $_;
+                            } else {
+                                push @values, "<span class=s>$_</span>";
+                            }
+                            next;
+                        }
                         /=/ and push(@values, $_), next;
                         my @names = split;
                         my $suffix = ' Tags';

data/bin/{Image-ExifTool-9.33 → Image-ExifTool-9.37}/lib/Image/ExifTool/Canon.pm

@@ -80,7 +80,7 @@ sub ProcessSerialData($$$);
 sub ProcessFilters($$$);
 sub SwapWords($);
 
-$VERSION = '3.15';
+$VERSION = '3.18';
 
 # Note: Removed 'USM' from 'L' lenses since it is redundant - PH
 # (or is it?  Ref 32 shows 5 non-USM L-type lenses)
@@ -208,7 +208,7 @@ $VERSION = '3.15';
     137.3 => 'Sigma 18-250mm f/3.5-6.3 DC OS HSM', #PH (also Sigma 18-250mm f/3.5-6.3 DC Macro OS HSM)
     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
+    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.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
@@ -293,6 +293,7 @@ $VERSION = '3.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',
     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
     184 => 'Canon EF 400mm f/2.8L + 2x', #15
     185 => 'Canon EF 600mm f/4L IS', #32
     186 => 'Canon EF 70-200mm f/4L', #9
@@ -370,6 +371,7 @@ $VERSION = '3.15';
     4144 => 'Canon EF 40mm f/2.8 STM', #50
     4145 => 'Canon EF-M 22mm f/2 STM', #34
     4146 => 'Canon EF-S 18-55mm f/3.5-5.6 IS STM', #PH
+    4147 => 'Canon EF-M 11-22mm f/4-5.6 IS STM', #42
 );
 
 # Canon model ID numbers (PH)
@@ -546,11 +548,14 @@ $VERSION = '3.15';
     0x3380000 => 'PowerShot N',
     0x3390000 => 'IXUS 245 HS / IXY 430F', # (apparently no PowerShot equivalent)
     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 / IXY 90F', # (also IXUS 135 ?? - PH)
+    0x3470000 => 'PowerShot ELPH 115 IS / IXUS 132/135 / IXY 90F',
     0x3490000 => 'PowerShot ELPH 330 HS / IXUS 255 HS / IXY 610F',
+    0x3510000 => 'PowerShot A2500',
     0x4040000 => 'PowerShot G1',
     0x6040000 => 'PowerShot S100 / Digital IXUS / IXY Digital',
 
@@ -952,6 +957,11 @@ my %binaryDataAttrs = (
             Condition => '$$self{Model} =~ /EOS 60D$/',
             SubDirectory => { TagTable => 'Image::ExifTool::Canon::CameraInfo60D' },
         },
+        {
+            Name => 'CanonCameraInfo70D',
+            Condition => '$$self{Model} =~ /EOS 70D$/',
+            SubDirectory => { TagTable => 'Image::ExifTool::Canon::CameraInfo70D' },
+        },
         {
             Name => 'CanonCameraInfo450D',
             Condition => '$$self{Model} =~ /\b(450D|REBEL XSi|Kiss X2)\b/',
@@ -4075,7 +4085,76 @@ my %ciMaxFocal = (
         ValueConvInv => '$val + 1',
     },
     0x321 => {
-        Name => 'PictureStyleInfo2',
+        Name => 'PictureStyleInfo',
+        SubDirectory => { TagTable => 'Image::ExifTool::Canon::PSInfo2' },
+    },
+);
+
+# Canon camera information for 70D (MakerNotes tag 0x0d) (ref PH)
+%Image::ExifTool::Canon::CameraInfo70D = (
+    %binaryDataAttrs,
+    FORMAT => 'int8u',
+    FIRST_ENTRY => 0,
+    PRIORITY => 0,
+    IS_SUBDIR => [ 0x3cf ],
+    GROUPS => { 0 => 'MakerNotes', 2 => 'Camera' },
+    NOTES => 'CameraInfo tags for the EOS 70D.',
+    0x03 => { %ciFNumber },
+    0x04 => { %ciExposureTime },
+    0x06 => { %ciISO },
+    0x1b => { %ciCameraTemperature },
+    0x23 => { %ciFocalLength },
+    # 0x36 - focal length again?
+    0x84 => {
+        Name => 'CameraOrientation',
+        PrintConv => {
+            0 => 'Horizontal (normal)',
+            1 => 'Rotate 90 CW',
+            2 => 'Rotate 270 CW',
+        },
+    },
+    0x93 => {
+        Name => 'FocusDistanceUpper',
+        %focusDistanceByteSwap,
+    },
+    0x95 => {
+        Name => 'FocusDistanceLower',
+        %focusDistanceByteSwap,
+    },
+    0xc7 => {
+        Name => 'ColorTemperature',
+        Format => 'int16u',
+    },
+    0x166 => {
+        Name => 'LensType',
+        Format => 'int16uRev', # value is big-endian
+        SeparateTable => 1,
+        ValueConvInv => 'int($val)', # (must truncate decimal part)
+        PrintConv => \%canonLensTypes,
+    },
+    0x168 => { %ciMinFocal },
+    0x16a => { %ciMaxFocal },
+    0x25e => {  # (at this location for firmware 6.1.2, 1.0.4 and 1.1.1)
+        Name => 'FirmwareVersion',
+        Format => 'string[6]',
+        Writable => 0,
+    },
+    0x2b3 => {
+        Name => 'FileIndex',
+        Groups => { 2 => 'Image' },
+        Format => 'int32u',
+        ValueConv => '$val + 1',
+        ValueConvInv => '$val - 1',
+    },
+    0x2bf => { #(NC)
+        Name => 'DirectoryIndex',
+        Groups => { 2 => 'Image' },
+        Format => 'int32u',
+        ValueConv => '$val - 1',
+        ValueConvInv => '$val + 1',
+    },
+    0x3cf => { #48
+        Name => 'PictureStyleInfo',
         SubDirectory => { TagTable => 'Image::ExifTool::Canon::PSInfo2' },
     },
 );
@@ -4896,6 +4975,27 @@ my %ciMaxFocal = (
         PrintConv => '"$val C"',
         PrintConvInv => '$val=~s/ ?C//; $val',
     },
+    532 => { # [-3]
+        Name => 'CameraTemperature',
+        Condition => '$$self{CameraInfoCount} == 535',
+        Notes => 'S110 (new), G15, SX50, SX160IS and SX500IS',
+        PrintConv => '"$val C"',
+        PrintConvInv => '$val=~s/ ?C//; $val',
+    },
+    547 => { # [-3]
+        Name => 'CameraTemperature',
+        Condition => '$$self{CameraInfoCount} == 550',
+        Notes => '130IS, A1400, A2500 and A2600',
+        PrintConv => '"$val C"',
+        PrintConvInv => '$val=~s/ ?C//; $val',
+    },
+    549 => { # [-3]
+        Name => 'CameraTemperature',
+        Condition => '$$self{CameraInfoCount} == 552',
+        Notes => '115IS, 130IS, SX270, SX280, 330HS and A3500',
+        PrintConv => '"$val C"',
+        PrintConvInv => '$val=~s/ ?C//; $val',
+    },
 );
 
 # unknown Canon camera information (MakerNotes tag 0x0d) - PH
@@ -6629,7 +6729,7 @@ my %ciMaxFocal = (
     0x00 => {
         Name => 'ColorDataVersion',
         PrintConv => {
-            10 => '10 (1DX/5DmkIII/6D/100D/650D/700D/M)',
+            10 => '10 (1DX/5DmkIII/6D/70D/100D/650D/700D/M)',
         },
     },
     # not really sure about the AsShot, Auto and Measured values any more - PH