exiftool_vendored 9.53.0 → 9.58.0

data/bin/{Image-ExifTool-9.53 → Image-ExifTool-9.58}/lib/Image/ExifTool/README

@@ -610,15 +610,15 @@ numerical.
                   the reference $valPt for EXIF, Jpeg2000 and BinaryData tags
                   only (note that for BinaryData tags, the raw data of $$valPt
                   is always 'undef' type, and may not be used when writing
-                  except for SubDirectory tags).  EXIF tags may also reference
-                  the format string and value count through $format and $count.
-                  Note that if the value is writable and $valPt is used, the tag
-                  must have a Format (unless 'undef' or 'string'), and a Count
-                  (unless 1 or length of the 'undef' or 'string'), so the raw
-                  data may be generated for evaluating the Condition.  When
-                  writing, $valPt, $format and $count refer to the new value,
-                  except for MakerNotes tags where $format and $count refer to
-                  the old tag if it existed.
+                  except for SubDirectory tags).  EXIF tags (and maybe some
+                  other types) may also reference the format string and value
+                  count through $format and $count. Note that if the value is
+                  writable and $valPt is used, the tag must have a Format
+                  (unless 'undef' or 'string'), and a Count (unless 1 or length
+                  of the 'undef' or 'string'), so the raw data may be generated
+                  for evaluating the Condition.  When writing, $valPt, $format
+                  and $count refer to the new value, except for MakerNotes tags
+                  where $format and $count refer to the old tag if it existed.
 
   Require       : [Composite tags only] A hash reference specifying the tags
                   required to calculate the Composite tag value.  The hash
@@ -802,8 +802,11 @@ numerical.
                   name.  Also used in structure field information hashes, but
                   for these the full property path is not stored.
 
-  SrcTagInfo    : [reserved] Used internally by XMP module to store reference to
-                  default language tagInfo hash for alternate-language tags.
+  SrcTagInfo    : [reserved] Used internally to store reference to default
+                  language tagInfo hash for alternate-language tags.
+
+  OtherLang     : [reserved] Used internally by QuickTime module to store a list
+                  of tag ID's for alternate-language tags based on this one.
 
   RootTagInfo   : [reserved] Used internally to store a reference to the tag
                   information hash of the top-level structure for flattened

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

@@ -8,6 +8,7 @@
 # References:   1) http://www.ozhiker.com/electronics/pjmt/jpeg_info/ricoh_mn.html
 #               2) http://homepage3.nifty.com/kamisaka/makernote/makernote_ricoh.htm
 #               3) Tim Gray private communication (GR)
+#               4) https://github.com/atotto/ricoh-theta-tools/
 #------------------------------------------------------------------------------
 
 package Image::ExifTool::Ricoh;
@@ -17,7 +18,7 @@ use vars qw($VERSION);
 use Image::ExifTool qw(:DataAccess :Utils);
 use Image::ExifTool::Exif;
 
-$VERSION = '1.26';
+$VERSION = '1.27';
 
 sub ProcessRicohText($$$);
 sub ProcessRicohRMETA($$$);
@@ -421,6 +422,15 @@ my %ricohLensIDs = (
             },
         },
     ],
+    0x4001 => {
+        Name => 'ThetaSubdir',
+        Groups => { 1 => 'MakerNotes' },    # SubIFD needs group 1 set
+        Flags => 'SubIFD',
+        SubDirectory => {
+            TagTable => 'Image::ExifTool::Ricoh::ThetaSubdir',
+            Start => '$val',
+        },
+    },
 );
 
 # Ricoh image info (ref 2)
@@ -596,6 +606,31 @@ my %ricohLensIDs = (
     # 0x000E ProductionNumber? (ref 2) [no. zero for most models - PH]
 );
 
+
+# Ricoh Theta subdirectory tags - Contains orientation information (ref 4)
+%Image::ExifTool::Ricoh::ThetaSubdir = (
+    GROUPS => { 0 => 'MakerNotes', 2 => 'Camera' },
+    WRITE_PROC => \&Image::ExifTool::Exif::WriteExif,
+    CHECK_PROC => \&Image::ExifTool::Exif::CheckExif,
+    # 0x0001 => Unknown
+    # 0x0002 => Unknown
+    0x0003 => {
+        Name => 'Accelerometer',
+        Writable => 'rational64s',
+        Count => 2,
+    },
+    0x0004 => {
+        Name => 'Compass',
+        Writable => 'rational64u',
+    },
+    # 0x0005 => Unknown
+    # 0x0101 => Unknown - ISO Speed?
+    # 0x0102 => Unknown - F Number?
+    # 0x0103 => Unknown - Exposure?
+    # 0x0104 => Unknown - Serial Number?
+    # 0x0105 => Unknown - Serial Number?
+);
+
 # face detection information (ref PH, CX4)
 %Image::ExifTool::Ricoh::FaceInfo = (
     GROUPS => { 0 => 'MakerNotes', 2 => 'Camera' },
@@ -827,6 +862,14 @@ my %ricohLensIDs = (
         ValueConv => '$val=~s/\s*:.*//; $val',
         PrintConv => \%ricohLensIDs,
     },
+    RicohPitch => {
+        Require => 'Ricoh:Accelerometer',
+        ValueConv => 'my @v = split(" ",$val); $v[1]',
+    },
+    RicohRoll => {
+        Require => 'Ricoh:Accelerometer',
+        ValueConv => 'my @v = split(" ",$val); $v[0] <= 180 ? $v[0] : $v[0] - 360',
+    },
 );
 
 # add our composite tags

data/bin/{Image-ExifTool-9.53 → Image-ExifTool-9.58}/lib/Image/ExifTool/Shift.pl

@@ -578,7 +578,7 @@ philosophy).
 =head1 BUGS
 
 Due to the use of the standard time library functions, dates are typically
-limited to the range 1970 to 2038.
+limited to the range 1970 to 2038 on 32-bit systems.
 
 =head1 AUTHOR
 

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

@@ -19,7 +19,7 @@ package Image::ExifTool::Shortcuts;
 use strict;
 use vars qw($VERSION);
 
-$VERSION = '1.49';
+$VERSION = '1.51';
 
 # this is a special table used to define command-line shortcuts
 # (documentation Notes may be added for these via %shortcutNotes in BuildTagLookup.pm)
@@ -151,6 +151,7 @@ $VERSION = '1.49';
         'MakerNoteNikon',
         'MakerNoteNikon2',
         'MakerNoteNikon3',
+        'MakerNoteNintendo',
         'MakerNoteOlympus',
         'MakerNoteOlympus2',
         'MakerNoteLeica',
@@ -293,6 +294,10 @@ In this example, MyShortcut is a shortcut for the CreateDate,
 EXIF:ExposureTime and Aperture tags, and MyAlias is a shortcut for
 FocalLengthIn35mmFormat.
 
+The target tag names may contain an optional group name prefix.  A group
+name applied to the shortcut will be ignored for any target tag with a group
+name prefix.
+
 =head1 AUTHOR
 
 Copyright 2003-2014, Phil Harvey (phil at owl.phy.queensu.ca)

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

@@ -16,7 +16,7 @@ use strict;
 use vars qw($VERSION %sigmaLensTypes);
 use Image::ExifTool::Exif;
 
-$VERSION = '1.12';
+$VERSION = '1.13';
 
 # sigma LensType lookup (ref PH)
 %sigmaLensTypes = (
@@ -365,6 +365,7 @@ $VERSION = '1.12';
             5 => 'Neutral',
             6 => 'Portrait',
             7 => 'Landscape',
+            8 => 'FOV Classic Blue',
         },
     },
     # 0x002d - int32u: 0
@@ -499,6 +500,7 @@ $VERSION = '1.12';
         PrintConv => '$val and $val =~ s/^(\d)/\+$1/; $val',
         PrintConvInv => '$val',
     },
+    # 0x0054 - string: "F20"
     0x0055 => { #PH
         Name => 'SensorTemperature',
         Condition => '$$self{Model} =~ /^SIGMA (SD1( Merrill)?|DP\d Merrill)$/',
@@ -531,7 +533,7 @@ $VERSION = '1.12';
         Notes => 'SD1 and Merrill models only',
         # seen: Standard, Landscape,Monochrome,Neutral,Portrait,Sepia,Vivid
     },
-    # 0x005a/b/c = 0/10 for the SD1
+    # 0x005a/b/c - rational64s: 0/10 for the SD1
 );
 
 1;  # end

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

@@ -19,7 +19,7 @@
 #               12) Jos Roost private communication (A580)
 #               13) http://www.mi-fo.de/forum/index.php?showtopic=33239
 #                   http://www.dyxum.com/dforum/the-alpha-shutter-count-tool_topic97489_page4.html
-#               14) Iliah Borg private communication
+#               14) Iliah Borg private communication (LibRaw)
 #               JD) Jens Duttke private communication
 #------------------------------------------------------------------------------
 
@@ -31,7 +31,7 @@ use Image::ExifTool qw(:DataAccess :Utils);
 use Image::ExifTool::Exif;
 use Image::ExifTool::Minolta;
 
-$VERSION = '2.04';
+$VERSION = '2.05';
 
 sub ProcessSRF($$$);
 sub ProcessSR2($$$);
@@ -59,27 +59,33 @@ my %sonyLensTypes2 = (
     3 => 'Sony LA-EA3 Adapter', #(NC) ILCE-7 image with A-mount lens, but also has 0x940e 2nd byte=2
     6 => 'Sony LA-EA4 Adapter', #(NC) ILCE-7R image with A-mount lens and having phase-detect info blocks in 0x940e AFInfo
     44 => 'Metabones Canon EF Smart Adapter', #12
+    78 => 'Metabones Canon EF Smart Adapter Mark III', #PH
     239 => 'Metabones Canon EF Speed Booster', #12
-    32784 => 'Sony E 16mm F2.8',
-    32785 => 'Sony E 18-55mm F3.5-5.6 OSS',
-    32786 => 'Sony E 55-210mm F4.5-6.3 OSS',
-    32787 => 'Sony E 18-200mm F3.5-6.3 OSS',
-    32788 => 'Sony E 30mm F3.5 Macro',
-    32789 => 'Sony E 24mm F1.8 ZA',
-    32790 => 'Sony E 50mm F1.8 OSS',
-    32791 => 'Sony E 16-70mm F4 ZA OSS',
-    32792 => 'Sony E 10-18mm F4 OSS',
-    32793 => 'Sony E PZ 16-50mm F3.5-5.6 OSS',
-    32794 => 'Sony FE 35mm F2.8 ZA',
-    32795 => 'Sony FE 24-70mm F4 ZA OSS',
-    32797 => 'Sony E 18-200mm F3.5-6.3 OSS LE',
-    32798 => 'Sony E 20mm F2.8',
-    32799 => 'Sony E 35mm F1.8 OSS',
-    32800 => 'Sony E PZ 18-105mm F4 G OSS', #12
-    32807 => 'Sony E PZ 18-200mm F3.5-6.3 OSS',
-    32808 => 'Sony FE 55mm F1.8 ZA',
-    32813 => 'Sony FE 28-70mm F3.5-5.6 OSS',
-#    32xxx => 'Sony FE 70-200mm F4 G OSS',
+                                                # Sony VX product code: (http://www.mi-fo.de/forum/index.php?s=7df1c8d3b1cd675f2abf4f4442e19cf2&showtopic=35035&view=findpost&p=303746)
+    32784 => 'Sony E 16mm F2.8',                # VX9100
+    32785 => 'Sony E 18-55mm F3.5-5.6 OSS',     # VX9101
+    32786 => 'Sony E 55-210mm F4.5-6.3 OSS',    # VX9102
+    32787 => 'Sony E 18-200mm F3.5-6.3 OSS',    # VX9103
+    32788 => 'Sony E 30mm F3.5 Macro',          # VX9104
+    32789 => 'Sony E 24mm F1.8 ZA',             # VX9105
+    32790 => 'Sony E 50mm F1.8 OSS',            # VX9106
+    32791 => 'Sony E 16-70mm F4 ZA OSS',        # VX9107
+    32792 => 'Sony E 10-18mm F4 OSS',           # VX9108
+    32793 => 'Sony E PZ 16-50mm F3.5-5.6 OSS',  # VX9109
+    32794 => 'Sony FE 35mm F2.8 ZA',            # VX9110
+    32795 => 'Sony FE 24-70mm F4 ZA OSS',       # VX9111
+
+    32797 => 'Sony E 18-200mm F3.5-6.3 OSS LE', # VX9113
+    32798 => 'Sony E 20mm F2.8',                # VX9114
+    32799 => 'Sony E 35mm F1.8 OSS',            # VX9115
+    32800 => 'Sony E PZ 18-105mm F4 G OSS', #12 # VX9116
+
+    32807 => 'Sony E PZ 18-200mm F3.5-6.3 OSS', # VX9123
+    32808 => 'Sony FE 55mm F1.8 ZA',            # VX9124
+
+    32810 => 'Sony FE 70-200mm F4 G OSS', #12   # VX9126
+
+    32813 => 'Sony FE 28-70mm F3.5-5.6 OSS',    # VX9129
 );
 
 # ExposureProgram values (ref PH, mainly decoded from A200)
@@ -302,6 +308,17 @@ my %unknownCipherData = (
     PrintConv => 'length($val) > 65 ? substr($val,0,60) . "[...]" : $val',  # limit length
 );
 
+my %meterInfo1 = (
+    Format => 'int32u[27]',
+    PrintConv => 'sprintf("%19d %4d %6d" . " %3d %4d %6d" x 8, split(" ",$val))',
+    PrintConvInv => '$val',
+);
+my %meterInfo2 = (
+    Format => 'int32u[33]',
+    PrintConv => 'sprintf("%3d %4d %6d" . " %3d %4d %6d" x 10, split(" ",$val))',
+    PrintConvInv => '$val',
+);
+
 # Sony maker notes tags (some elements in common with %Image::ExifTool::Minolta::Main)
 %Image::ExifTool::Sony::Main = (
     WRITE_PROC => \&Image::ExifTool::Exif::WriteExif,
@@ -4494,6 +4511,12 @@ my %exposureProgram2010 = (
     0x117c => { Name => 'WB_RGBLevels', Format => 'int16u[3]' },
     #0x1a08 => { Name => 'SonyImageWidth', Format => 'int16u' },
     #0x1a0c => { Name => 'SonyImageHeight', Format => 'int16u' },
+    0x04b0 => {
+        Name => 'MeterInfo',
+        Format => 'int32u[486]',
+        Unknown => 1,
+        SubDirectory => { TagTable => 'Image::ExifTool::Sony::MeterInfo' },
+    },
 );
 
 %Image::ExifTool::Sony::Tag2010b = ( #12
@@ -4524,6 +4547,12 @@ my %exposureProgram2010 = (
     0x01b6 => { %sonyDateTime2010, Groups => { 2 => 'Time' } },
     #0x0204 => { Name => 'SonyImageWidth', Format => 'int16u' },
     #0x0206 => { Name => 'SonyImageHeight', Format => 'int16u' },
+    0x04b4 => {
+        Name => 'MeterInfo',
+        Format => 'int32u[486]',
+        Unknown => 1,
+        SubDirectory => { TagTable => 'Image::ExifTool::Sony::MeterInfo' },
+    },
     0x1128 => { %releaseMode2010 },
     0x112c => { %releaseMode2 },
     0x113e => { %gain2010 },
@@ -4570,6 +4599,12 @@ my %exposureProgram2010 = (
     #0x0154 => { Name => 'SonyImageHeight', Format => 'int16u' },
     0x0200 => { Name => 'DigitalZoomRatio', ValueConv => '$val/16', ValueConvInv => '$val*16' },
     0x0210 => { %sonyDateTime2010, Groups => { 2 => 'Time' } },
+    0x0490 => {
+        Name => 'MeterInfo',
+        Format => 'int32u[486]',
+        Unknown => 1,
+        SubDirectory => { TagTable => 'Image::ExifTool::Sony::MeterInfo' },
+    },
     0x1104 => { %releaseMode2010 },
     0x1108 => { %releaseMode2 },
     0x111a => { %gain2010 },
@@ -4615,6 +4650,12 @@ my %exposureProgram2010 = (
     #0x00e0 => { Name => 'SonyImageWidth', Format => 'int16u' },
     #0x00e4 => { Name => 'SonyImageHeight', Format => 'int16u' },
     0x01fe => { %sonyDateTime2010, Groups => { 2 => 'Time' } },
+    0x050c => {
+        Name => 'MeterInfo',
+        Format => 'int32u[486]',
+        Unknown => 1,
+        SubDirectory => { TagTable => 'Image::ExifTool::Sony::MeterInfo' },
+    },
     0x1180 => { %releaseMode2010 },
     0x1184 => { %releaseMode2 },
     0x1196 => { %gain2010 },
@@ -4661,6 +4702,12 @@ my %exposureProgram2010 = (
     #0x0200 => { Name => 'SonyImageWidth', Format => 'int16u' },
     0x021c => { Name => 'DigitalZoomRatio', ValueConv => '$val/16', ValueConvInv => '$val*16' },
     0x022c => { %sonyDateTime2010, Groups => { 2 => 'Time' } },
+    0x04b8 => {
+        Name => 'MeterInfo',
+        Format => 'int32u[486]',
+        Unknown => 1,
+        SubDirectory => { TagTable => 'Image::ExifTool::Sony::MeterInfo' },
+    },
     0x115c => { %releaseMode2010 },
     0x1160 => { %releaseMode2 },
     0x1172 => { %gain2010 },
@@ -4720,6 +4767,12 @@ my %exposureProgram2010 = (
     0x0004 => { %releaseMode2, Format => 'int32u' }, # NOT at offset 0x08 !
     #0x002e => { Name => 'SonyImageWidth3', Format => 'int16u' },
     #0x0042 => { Name => 'SonyImageWidth3', Format => 'int16u' },
+    0x01e0 => {
+        Name => 'MeterInfo',
+        Format => 'int32u[486]',
+        Unknown => 1,
+        SubDirectory => { TagTable => 'Image::ExifTool::Sony::MeterInfo' },
+    },
     0x1014 => { %releaseMode2010 },
     0x1018 => { %releaseMode2 },
     0x102a => { %gain2010 },
@@ -4812,6 +4865,78 @@ my %exposureProgram2010 = (
         PrintConv => 'sprintf("%.1f mm",$val)',
         PrintConvInv => '$val =~ / ?mm//; $val',
     },
+    0x0388 => {
+        Name => 'MeterInfo',
+        Format => 'int32u[486]',
+        Unknown => 1,
+        SubDirectory => { TagTable => 'Image::ExifTool::Sony::MeterInfo' },
+    },
+);
+
+# possible metering information (ref 12)
+%Image::ExifTool::Sony::MeterInfo = (
+    %binaryDataAttrs,
+    GROUPS => { 0 => 'MakerNotes', 2 => 'Image' },
+    NOTES => q{
+        Information possibly related to metering.  Extracted only if the Unknown
+        option is used.
+    },
+#
+# 162 'triplets' of 3 int32u numbers: (k,n1,n2)
+# These appear to relate to two sets of brightness distribution over the image area:
+# Set 1: 7 rows of 9
+# Set 2: 9 rows of 11
+#
+# Exact meaning presently unknown, however:
+# n1 ranges from 0 (black) - appr. 1300 (bright white) 
+# n2 ranges from 0 (black) - appr. 142000 (bright white), i.e. roughly factor 100 higher
+# Many panorama images: all 0
+# Flash images: n2 = n1
+# k maybe some kind of 'gain' or multiplication factor ?
+# k distribution over the image as function of Aspect-Ratio is as follows:
+#
+#                3:2 image                           16:9 image                          4:3 image
+# set 1:
+#
+#     12 12 12 12 12 12 12 12 12          12 12 12 15 18 15 12 12 12           9 12 12 12 12 12 12 12  9
+#     12 12 12 12 12 12 12 12 12          12 12 12 15 18 15 12 12 12           9 12 12 12 12 12 12 12  9
+#     16 16 16 16 16 16 16 16 16          12 12 12 15 18 15 12 12 12          12 16 16 16 16 16 16 16 12
+#     16 16 16 16 16 16 16 16 16          12 12 12 15 18 15 12 12 12          12 16 16 16 16 16 16 16 12
+#     16 16 16 16 16 16 16 16 16          12 12 12 15 18 15 12 12 12          12 16 16 16 16 16 16 16 12
+#     12 12 12 12 12 12 12 12 12          12 12 12 15 18 15 12 12 12           9 12 12 12 12 12 12 12  9
+#     12 12 12 12 12 12 12 12 12          12 12 12 15 18 15 12 12 12           9 12 12 12 12 12 12 12  9
+#
+# set 2:
+#
+#  12 12 12 12 12 12 12 12 12 12 12    12 12 12 12 15 18 15 12 12 12 12     9  9 12 12 12 12 12 12 12  9  9
+#  12 12 12 12 12 12 12 12 12 12 12    12 12 12 12 15 18 15 12 12 12 12     9  9 12 12 12 12 12 12 12  9  9
+#  12 12 12 12 12 12 12 12 12 12 12    12 12 12 12 15 18 15 12 12 12 12     9  9 12 12 12 12 12 12 12  9  9
+#  16 16 16 16 16 16 16 16 16 16 16    12 12 12 12 15 18 15 12 12 12 12    12 12 16 16 16 16 16 16 16 12 12
+#  16 16 16 16 16 16 16 16 16 16 16    12 12 12 12 15 18 15 12 12 12 12    12 12 16 16 16 16 16 16 16 12 12
+#  16 16 16 16 16 16 16 16 16 16 16    12 12 12 12 15 18 15 12 12 12 12    12 12 16 16 16 16 16 16 16 12 12
+#  12 12 12 12 12 12 12 12 12 12 12    12 12 12 12 15 18 15 12 12 12 12     9  9 12 12 12 12 12 12 12  9  9
+#  12 12 12 12 12 12 12 12 12 12 12    12 12 12 12 15 18 15 12 12 12 12     9  9 12 12 12 12 12 12 12  9  9
+#  12 12 12 12 12 12 12 12 12 12 12     8  8  8  8 10 12 10  8  8  8  8     9  9 12 12 12 12 12 12 12  9  9
+#
+# Usually, in the center, the numbers of set 1 row 2-6 match with set 2 row 3-7, except for first and last 2 columns.
+#
+    0x0000 => { Name => 'MeterInfo1Row1', %meterInfo1 },
+    0x006c => { Name => 'MeterInfo1Row2', %meterInfo1 },
+    0x00d8 => { Name => 'MeterInfo1Row3', %meterInfo1 },
+    0x0144 => { Name => 'MeterInfo1Row4', %meterInfo1 },
+    0x01b0 => { Name => 'MeterInfo1Row5', %meterInfo1 },
+    0x021c => { Name => 'MeterInfo1Row6', %meterInfo1 },
+    0x0288 => { Name => 'MeterInfo1Row7', %meterInfo1 },
+    
+    0x02f4 => { Name => 'MeterInfo2Row1', %meterInfo2 },
+    0x0378 => { Name => 'MeterInfo2Row2', %meterInfo2 },
+    0x03fc => { Name => 'MeterInfo2Row3', %meterInfo2 },
+    0x0480 => { Name => 'MeterInfo2Row4', %meterInfo2 },
+    0x0504 => { Name => 'MeterInfo2Row5', %meterInfo2 },
+    0x0588 => { Name => 'MeterInfo2Row6', %meterInfo2 },
+    0x060c => { Name => 'MeterInfo2Row7', %meterInfo2 },
+    0x0690 => { Name => 'MeterInfo2Row8', %meterInfo2 },
+    0x0714 => { Name => 'MeterInfo2Row9', %meterInfo2 },
 );
 
 %Image::ExifTool::Sony::Tag900b = ( #12