exiftool_vendored 9.53.0 → 9.58.0

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

@@ -636,7 +636,6 @@ $VERSION = '1.06';
         'Night View/Portrait' => '夜景/肖像',
         'Portrait' => '肖像',
         'Sports' => '運動場面',
-        'Standard' => '',
         'Sunset' => '夕陽',
         'Sweep Panorama' => '全景攝影',
       },

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

@@ -21,7 +21,7 @@ sub ProcessKodakPatch($$$);
 sub WriteUnknownOrPreview($$$);
 sub FixLeicaBase($$;$);
 
-$VERSION = '1.89';
+$VERSION = '1.90';
 
 my $debug;          # set to 1 to enable debugging code
 
@@ -483,6 +483,15 @@ my $debug;          # set to 1 to enable debugging code
             ByteOrder => 'Unknown', # most are little-endian, but D1 is big
         },
     },
+    {
+        Name => 'MakerNoteNintendo',
+        # (starts with an IFD)
+        Condition => '$$self{Make} eq "Nintendo"',
+        SubDirectory => {
+            TagTable => 'Image::ExifTool::Nintendo::Main',
+            ByteOrder => 'Unknown',
+        },
+    },
     {
         Name => 'MakerNoteOlympus',
         # (if Make is 'SEIKO EPSON CORP.', starts with "EPSON\0")
@@ -570,10 +579,15 @@ my $debug;          # set to 1 to enable debugging code
         },
     },
     {
-        Name => 'MakerNoteLeica6', # used by the S2 and M (Typ 240)
-        # (starts with "LEICA\0\x02\xff", Make is "Leica Camera AG",
-        #  but maker notes aren't loaded at the time this is tested)
-        Condition => '$$self{Model} eq "S2" or $$self{Model} eq "LEICA M (Typ 240)"',
+        Name => 'MakerNoteLeica6', # used by the S2, M (Typ 240) and S (Typ 006)
+        # (starts with "LEICA\0\x02\xff", Make is "Leica Camera AG", but test the
+        # model names separately because the maker notes data may not be loaded
+        # at the time this is tested if they are in a JPEG trailer)
+        Condition => q{
+            ($$self{Make} eq 'Leica Camera AG' and ($$self{Model} eq "S2" or
+            $$self{Model} eq "LEICA M (Typ 240)" or $$self{Model} eq "LEICA S (Typ 006)")) or
+            $$valPt =~ /^LEICA\0\x02\xff/
+        },
         DataTag => 'LeicaTrailer',  # (generates fixup name for this tag)
         LeicaTrailer => 1, # flag to special-case this tag in the Exif code
         SubDirectory => {
@@ -1269,7 +1283,7 @@ sub LocateIFD($$)
     my $dirStart = $$dirInfo{DirStart} || 0;
     # (ignore MakerNotes DirLen since sometimes this is incorrect)
     my $size = $$dirInfo{DataLen} - $dirStart;
-    my $dirLen = $$dirInfo{DirLen} || $size;
+    my $dirLen = defined $$dirInfo{DirLen} ? $$dirInfo{DirLen} : $size;
     my $tagInfo = $$dirInfo{TagInfo};
     my $ifdOffsetPos;
     # the IFD should be within the first 32 bytes

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

@@ -16,7 +16,7 @@ use vars qw($VERSION);
 use Image::ExifTool qw(:DataAccess :Utils);
 use Image::ExifTool::XMP;
 
-$VERSION = '1.10';
+$VERSION = '1.12';
 
 sub ProcessXtra($$$);
 
@@ -132,6 +132,11 @@ sub ProcessXtra($$$);
 my %sRegions = (
     STRUCT_NAME => 'Microsoft Regions',
     NAMESPACE   => 'MPReg',
+    NOTES => q{
+        Note that PersonLiveIdCID element is called PersonLiveCID according to the
+        Microsoft specification, but in practice their software actually writes
+        PersonLiveIdCID, so ExifTool uses this too.
+    },
     Rectangle         => { },
     PersonDisplayName => { },
     PersonEmailDigest => { },
@@ -440,7 +445,7 @@ my %sRegions = (
     '{F29F85E0-4FF9-1068-AB91-08002B27B3D9} 6'     => 'Comments',
     '{64440492-4C8B-11D1-8B70-080036B11A03} 11'    => {
         Name => 'Copyright',
-        Groups => { 2 => 'Copyright' },
+        Groups => { 2 => 'Author' },
     },
     '{56A3372E-CE9C-11D2-9F0E-006097C686F6} 2'     => 'Artist',
     '{56A3372E-CE9C-11D2-9F0E-006097C686F6} 4'     => 'AlbumTitle',

data/bin/{Image-ExifTool-9.53 → Image-ExifTool-9.58}/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.11';
+$VERSION = '2.12';
 
 # Full list of product codes for Sony-compatible Minolta lenses
 # (ref http://www.kb.sony.com/selfservice/documentLink.do?externalId=C1000570)
@@ -161,6 +161,16 @@ $VERSION = '2.11';
 # 2687 1.4x TELE CONVERTER APO (D)
 # 2688 2x TELE CONVERTER APO (D)
 
+# high bytes in Canon LensID's identifying Metabones adapters
+my %metabonesID = (
+    0xef00 => \ 'Metabones Adapter',
+    0xf000 => 0xef00,
+    0xff00 => 0xef00,
+    0x7700 => \ 'Metabones Speed Booster',
+    0x7800 => 0x7700,
+    0x8700 => 0x7700,
+);
+
 # lens ID numbers (ref 3)
 # ("New" and "II" appear in brackets if original version also has this LensType)
 %minoltaLensTypes = (
@@ -168,14 +178,22 @@ $VERSION = '2.11';
         Decimal values have been added to differentiate lenses which would otherwise
         have the same LensType, and are used by the Composite LensID tag when
         attempting to identify the specific lens model.  "New" or "II" appear in
-        brackets if the original version of the lens has the same LensType.
+        brackets if the original version of the lens has the same LensType.  Special
+        logic is employed to identify the attached lens when a Metabones Canon EF
+        adapter is used.
     },
     OTHER => sub {
         my ($val, $inv) = @_;
-        return undef if $inv or ($val & 0xff00) != 0xef00;
+        return undef if $inv;
+        my $id = $val & 0xff00;
+        # Note: Metabones Smart Adapter firmware versions before 31 kill
+        # the high byte for 2-byte Canon LensType values, so the reported lens
+        # will be incorrect for these
+        my $mb = $metabonesID{$id} or return undef;
+        ref $mb or $id = $mb, $mb = $metabonesID{$id};
         require Image::ExifTool::Canon;
-        my $prt = $Image::ExifTool::Canon::canonLensTypes{$val & 0xff};
-        return $prt ? "$prt + Metabones Adapter" : undef;
+        my $lens = $Image::ExifTool::Canon::canonLensTypes{$val - $id};
+        return $lens ? "$lens + $$mb" : undef;
     },
     0 => 'Minolta AF 28-85mm F3.5-4.5 New', # New added (ref 13/18)
     1 => 'Minolta AF 80-200mm F2.8 HS-APO G',
@@ -444,6 +462,9 @@ $VERSION = '2.11';
     26671 => 'Minolta AF 35mm F2 New',
     26681 => 'Minolta AF 28mm F2 New',
     26721 => 'Minolta AF 24-105mm F3.5-4.5 (D)', #11
+    # 30464: newer firmware versions of the Speed Booster report type 30464 (=0x7700)
+    # - this is the base to which the Canon LensType is added
+    30464 => 'Metabones Canon EF Speed Booster', #Metabones
     45671 => 'Tokina 70-210mm F4-5.6', #22
     45741 => '2x Teleconverter or Tamron or Tokina Lens', #18
     45741.1 => 'Tamron SP AF 90mm F2.5', #JD
@@ -453,8 +474,10 @@ $VERSION = '2.11';
     45851 => 'Tamron SP AF 300mm F2.8 LD IF', #11
     45861 => 'Tamron SP AF 35-105mm F2.8 LD Aspherical IF', #Fredrik Agert
     45871 => 'Tamron AF 70-210mm F2.8 SP LD', #Fabio Suprani
-    # 61184: both the Speed Booster and the Smart Adapter report type 61184 (ref 25)
-    # - this is the base to which the low byte of the Canon LensType is added
+    # 61184: older firmware versions of both the Speed Booster and the Smart Adapter
+    # report type 61184 (=0xef00), and add only the lower byte of the Canon LensType (ref 25).
+    # For newer firmware versions this is only used by the Smart Adapter, and
+    # the full Canon LensType code is added - PH
     61184 => 'Metabones Canon EF Adapter', #25
     # all M42-type lenses give a value of 65535 (and FocalLength=0, FNumber=1)
     65535 => 'E-Mount, T-Mount, Other Lens or no lens', #JD/25
@@ -479,9 +502,8 @@ $VERSION = '2.11';
    '65535.16' => 'Sony E PZ 18-105mm F4 G OSS',     #25 (SELP18105G - 32800)
    '65535.17' => 'Sony E PZ 18-200mm F3.5-6.3 OSS', #25 (SELP18200  - 32807)
    '65535.18' => 'Sony FE 55mm F1.8 ZA',            #25 (SEL55F18Z  - 32808)
-   '65535.19' => 'Sony FE 28-70mm F3.5-5.6 OSS',    #25 (SEL2870    - 32813)
-
-   '65535.20' => 'Sony FE 70-200mm F4 G OSS',       #25 (SEL70200G  - 32xxx)
+   '65535.19' => 'Sony FE 70-200mm F4 G OSS',       #25 (SEL70200G  - 32810)
+   '65535.20' => 'Sony FE 28-70mm F3.5-5.6 OSS',    #25 (SEL2870    - 32813)
 #
 # 3rd party E lenses
 #

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

@@ -45,7 +45,7 @@
 #              30) http://u88.n24.queensu.ca/exiftool/forum/index.php/topic,3833.30.html
 #              31) Michael Relt private communication
 #              32) Stefan http://u88.n24.queensu.ca/exiftool/forum/index.php/topic,4494.0.html
-#              33) Iliah Borg private communication
+#              33) Iliah Borg private communication (LibRaw)
 #              JD) Jens Duttke private communication
 #------------------------------------------------------------------------------
 
@@ -56,7 +56,7 @@ use vars qw($VERSION %nikonLensIDs %nikonTextEncoding);
 use Image::ExifTool qw(:DataAccess :Utils);
 use Image::ExifTool::Exif;
 
-$VERSION = '2.86';
+$VERSION = '2.87';
 
 sub LensIDConv($$$);
 sub ProcessNikonAVI($$$);
@@ -318,6 +318,7 @@ sub PrintAFPointsInv($$;$);
     'E5 54 6A 6A 24 24 35 02' => 'Sigma Macro 105mm F2.8 EX DG',
     '48 48 76 76 24 24 4B 06' => 'Sigma APO Macro 150mm F2.8 EX DG HSM',
     'F5 48 76 76 24 24 4B 06' => 'Sigma APO Macro 150mm F2.8 EX DG HSM', #24
+    '99 48 76 76 24 24 4B 0E' => 'Sigma APO Macro 150mm F2.8 EX DG OS HSM', #(Christian Hesse)
     '48 4C 7C 7C 2C 2C 4B 02' => 'Sigma APO Macro 180mm F3.5 EX DG HSM',
     '48 4C 7D 7D 2C 2C 4B 02' => 'Sigma APO Macro 180mm F3.5 EX DG HSM',
     '48 54 8E 8E 24 24 4B 02' => 'Sigma APO 300mm F2.8 EX DG HSM',
@@ -1071,6 +1072,7 @@ my %binaryDataAttrs = (
             ByteOrder => 'BigEndian', #(NC)
         },
     },
+    # 0x0034 - Nikon 1 models only, values: 0,16,33
     0x0035 => { #32
         Name => 'HDRInfo',
         SubDirectory => { TagTable => 'Image::ExifTool::Nikon::HDRInfo' },
@@ -1098,6 +1100,8 @@ my %binaryDataAttrs = (
                 1 => 'D',
                 2 => 'G',
                 3 => 'VR',
+                # bit 4 set for Nikon 1 lenses - PH
+                # bit 5 set for FT-1 adapter? - PH
             }) : 'AF';
             # remove commas and change "D G" to just "G"
             s/,//g; s/\bD G\b/G/; $_
@@ -1423,6 +1427,8 @@ my %binaryDataAttrs = (
             2 => 'Uncompressed', #JD - D100 (even though TIFF compression is set!)
             3 => 'Lossless',
             4 => 'Lossy (type 2)',
+            6 => 'Uncompressed (reduced to 12 bit)', #33
+            8 => 'Small', #33
         },
     },
     0x0094 => { Name => 'Saturation',       Writable => 'int16s' },
@@ -1532,7 +1538,28 @@ my %binaryDataAttrs = (
                 DirOffset => 4,
             },
         },
-        {   # (D5200/D7100=0218, 1J1/1J2/1V1=0400, 1V2=0401, 1J3/1S1=0402, CoolpixA=0601)
+        {   # (D5200/D7100=0218, D5300=0219, D610/Df=0220, D3300=0221, CoolpixA=0601)
+            Name => 'ColorBalanceUnknown02',
+            Condition => '$$valPt =~ /^0[26]/',
+            SubDirectory => {
+                TagTable => 'Image::ExifTool::Nikon::ColorBalanceUnknown',
+                ProcessProc => \&Image::ExifTool::Nikon::ProcessNikonEncrypted,
+                DecryptStart => 284,
+                DecryptLen => 10, # (arbitrary)
+            },
+        },
+        {   # (1J1/1J2/1V1=0400, 1V2=0401, 1J3/1S1=0402, 1AW1=0403)
+            Name => 'ColorBalanceUnknown04',
+            Condition => '$$valPt =~ /^04/',
+            SubDirectory => {
+                TagTable => 'Image::ExifTool::Nikon::ColorBalanceUnknown',
+                ProcessProc => \&Image::ExifTool::Nikon::ProcessNikonEncrypted,
+                DecryptStart => 4,
+                DecryptLen => 10, # (arbitrary)
+            },
+        },
+        {
+            # (CoolpixP7700/P7800=0500, CoolpixP330/P520=0502)
             Name => 'ColorBalanceUnknown',
             SubDirectory => { TagTable => 'Image::ExifTool::Nikon::ColorBalanceUnknown' },
         },
@@ -1961,6 +1988,7 @@ my %binaryDataAttrs = (
     4 => {
         Name => 'VibrationReduction',
         PrintConv => {
+            0 => 'n/a', # (1V1 with a non-VR lens)
             1 => 'On',
             2 => 'Off',
         },
@@ -1970,6 +1998,7 @@ my %binaryDataAttrs = (
         Name => 'VRMode',
         PrintConv => {
             0 => 'Normal',
+            # 1 - seen this for 1V1 - PH
             2 => 'Active', # (1J1)
         },
     },

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

@@ -8,6 +8,7 @@
 #               16/04/2011 - P. Harvey Decode NikonCaptureEditVersions
 #
 # References:   1) http://www.cybercom.net/~dcoffin/dcraw/
+#               2) Iliah Borg private communication (LibRaw)
 #------------------------------------------------------------------------------
 
 package Image::ExifTool::NikonCapture;
@@ -17,7 +18,7 @@ use vars qw($VERSION);
 use Image::ExifTool qw(:DataAccess :Utils);
 use Image::ExifTool::Exif;
 
-$VERSION = '1.10';
+$VERSION = '1.12';
 
 sub ProcessNikonCapture($$$);
 
@@ -349,20 +350,29 @@ my %unsharpColor = (
             4 => 'Calculate Automatically'
         },
     },
-    0x14 => {
-        Name => 'WBAdjLightingSubtype',
-        # this varies for different lighting types
-        # (ie. for Daylight, this is 0 => 'Direct', 1 => 'Shade', 2 => 'Cloudy')
-    },
-    0x15 => {
+    0x14 => { #2
         Name => 'WBAdjLighting',
+        Format => 'int16u',
+        PrintHex => 1,
         PrintConv => {
-            0 => 'None',
-            1 => 'Incandescent',
-            2 => 'Daylight',
-            3 => 'Standard Fluorescent',
-            4 => 'High Color Rendering Fluorescent',
-            5 => 'Flash',
+            0x000 => 'None',
+            0x100 => 'Incandescent',
+            0x200 => 'Daylight (direct sunlight)',
+            0x201 => 'Daylight (shade)',
+            0x202 => 'Daylight (cloudy)',
+            0x300 => 'Standard Fluorescent (warm white)',
+            0x301 => 'Standard Fluorescent (3700K)',
+            0x302 => 'Standard Fluorescent (cool white)',
+            0x303 => 'Standard Fluorescent (5000K)',
+            0x304 => 'Standard Fluorescent (6500K)',
+            0x305 => 'Standard Fluorescent (high temperature mercury vapor)',
+            0x400 => 'High Color Rendering Fluorescent (warm white)',
+            0x401 => 'High Color Rendering Fluorescent (3700K)',
+            0x402 => 'High Color Rendering Fluorescent (cool white)',
+            0x403 => 'High Color Rendering Fluorescent (5000K)',
+            0x404 => 'High Color Rendering Fluorescent (daylight)',
+            0x500 => 'Flash',
+            0x600 => 'Sodium Vapor Lamps',
         },
     },
     0x18 => {
@@ -860,9 +870,11 @@ sub ProcessNikonCapture($$$)
                 $value = substr($$dataPt, $pos, $size);
             }
             $et->HandleTag($tagTablePtr, $tagID, $value,
-                DataPt => $dataPt,
-                Start  => $pos,
-                Size   => $size,
+                DataPt  => $dataPt,
+                DataPos => $$dirInfo{DataPos},
+                Base    => $$dirInfo{Base},
+                Start   => $pos,
+                Size    => $size,
             ) and $success = 1;
         }
         $pos += $size;

data/bin/Image-ExifTool-9.58/lib/Image/ExifTool/Nintendo.pm

@@ -0,0 +1,128 @@
+#------------------------------------------------------------------------------
+# File:         Nintendo.pm
+#
+# Description:  Nintendo EXIF maker notes tags
+#
+# Revisions:    2014/03/25 - P. Harvey Created
+#
+# References:   1) http://3dbrew.org/wiki/MPO
+#------------------------------------------------------------------------------
+
+package Image::ExifTool::Nintendo;
+
+use strict;
+use vars qw($VERSION);
+use Image::ExifTool::Exif;
+
+$VERSION = '1.00';
+
+%Image::ExifTool::Nintendo::Main = (
+    GROUPS => { 0 => 'MakerNotes', 2 => 'Camera' },
+    WRITE_PROC => \&Image::ExifTool::Exif::WriteExif,
+    CHECK_PROC => \&Image::ExifTool::Exif::CheckExif,
+    WRITABLE => 1,
+    # 0x1000 - undef[28]
+    # 0x1001 - undef[8]
+    # 0x1100 - undef[80] (found in MPO files)
+    0x1101 => {
+        Name => 'CameraInfo',
+        SubDirectory => {
+            TagTable => 'Image::ExifTool::Nintendo::CameraInfo',
+            ByteOrder => 'Little-endian',
+        },
+    },
+);
+
+# Nintendo MPO info (ref 1)
+%Image::ExifTool::Nintendo::CameraInfo = (
+    GROUPS => { 0 => 'MakerNotes', 2 => 'Image' },
+    PROCESS_PROC => \&Image::ExifTool::ProcessBinaryData,
+    WRITE_PROC => \&Image::ExifTool::WriteBinaryData,
+    CHECK_PROC => \&Image::ExifTool::CheckBinaryData,
+    WRITABLE => 1,
+    PRIORITY => 0,
+    FORMAT => 'int8u',
+    FIRST_ENTRY => 0,
+    0x00 => { # "3DS1"
+        Name => 'ModelID',
+        Format => 'undef[4]',
+    },
+    # 0x04 - int32u: 1,2,4,5
+    0x08 => {
+        Name => 'TimeStamp',
+        Format => 'int32u',
+        Groups => { 2 => 'Time' },
+        Shift => 'Time',
+        # zero time is 2000/01/01 (10957 days after Unix time zero)
+        ValueConv => 'ConvertUnixTime($val + 10957 * 24 * 3600)',
+        ValueConvInv => 'GetUnixTime($val) - 10957 * 24 * 3600',
+        PrintConv => '$self->ConvertDateTime($val)',
+        PrintConvInv => '$self->InverseDateTime($val)',
+    },
+    # 0x10 - int32u: title ID low
+    # 0x14 - int32u: flags
+    0x18 => {
+        Name => 'InternalSerialNumber',
+        Groups => { 2 => 'Camera' },
+        Format => 'undef[4]',
+        ValueConv => '"0x" . unpack("H*",$val)',
+        ValueConvInv => '$val=~s/^0x//; pack("H*",$val)',
+    },
+    0x28 => {
+        Name => 'Parallax',
+        Format => 'float',
+        PrintConv => 'sprintf("%.2f", $val)',
+        PrintConvInv => '$val',
+    },
+    0x30 => {
+        Name => 'Category',
+        Format => 'int16u',
+        PrintHex => 1,
+        PrintConv => {
+            0x0000 => '(none)',
+            0x1000 => 'Mii',
+            0x2000 => 'Man',
+            0x4000 => 'Woman',
+        },
+    },
+    # 0x32 - int16u: filter
+);
+
+1;  # end
+
+__END__
+
+=head1 NAME
+
+Image::ExifTool::Nintendo - Nintendo 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 Nintendo maker notes EXIF meta information.
+
+=head1 AUTHOR
+
+Copyright 2003-2014, 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 REFERENCES
+
+=over 4
+
+=item L<http://3dbrew.org/wiki/MPO>
+
+=back
+
+=head1 SEE ALSO
+
+L<Image::ExifTool::TagNames/Nintendo Tags>,
+L<Image::ExifTool(3pm)|Image::ExifTool>
+
+=cut