exiftool_vendored 9.33.1 → 9.37.0

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

@@ -51,7 +51,7 @@ use vars qw($VERSION $AUTOLOAD @formatSize @formatName %formatNumber %intFormat
 use Image::ExifTool qw(:DataAccess :Utils);
 use Image::ExifTool::MakerNotes;
 
-$VERSION = '3.53';
+$VERSION = '3.55';
 
 sub ProcessExif($$$);
 sub WriteExif($$$);
@@ -769,6 +769,7 @@ my %sampleFormat = (
         SubDirectory => {
             DirName => 'GlobParamIFD',
             Start => '$val',
+            MaxSubdirs => 1,
         },
     },
     0x191 => { #3
@@ -1180,6 +1181,7 @@ my %sampleFormat = (
             TagTable => 'Image::ExifTool::Kodak::IFD',
             DirName => 'KodakIFD',
             Start => '$val',
+            MaxSubdirs => 1,
         },
     },
     0x8298 => {
@@ -1435,6 +1437,7 @@ my %sampleFormat = (
             DirName => 'GPS',
             TagTable => 'Image::ExifTool::GPS::Main',
             Start => '$val',
+            MaxSubdirs => 1,
         },
     },
     0x8827 => {
@@ -1707,6 +1710,7 @@ my %sampleFormat = (
     0x935c => { #3/19
         Name => 'ImageSourceData',
         Binary => 1,
+        Protected => 1, # (because this can be hundreds of megabytes)
     },
     0x9c9b => {
         Name => 'XPTitle',
@@ -1773,6 +1777,7 @@ my %sampleFormat = (
         SubDirectory => {
             DirName => 'InteropIFD',
             Start => '$val',
+            MaxSubdirs => 1,
         },
     },
     0xa20b => {
@@ -2129,6 +2134,7 @@ my %sampleFormat = (
         # must set Writable here so this tag will be saved with MakerNotes option
         Writable => 'undef',
         WriteGroup => 'IFD0',
+        Binary => 1,
         # (don't make Binary/Protected because we can't copy individual PrintIM tags anyway)
         Description => 'Print Image Matching',
         SubDirectory => {
@@ -2242,6 +2248,9 @@ my %sampleFormat = (
         {
             Condition => '$$valPt =~ /^Adobe\0/',
             Name => 'DNGAdobeData',
+            Flags => [ 'Binary', 'Protected' ],
+            Writable => 'undef', # (writable directory!) (to make it possible to delete this mess)
+            WriteGroup => 'IFD0',
             NestedHtmlDump => 1,
             SubDirectory => { TagTable => 'Image::ExifTool::DNG::AdobeData' },
             Format => 'undef',  # written incorrectly as int8u (change to undef for speed)
@@ -2265,8 +2274,10 @@ my %sampleFormat = (
         },
         {
             Name => 'DNGPrivateData',
-            Binary => 1,
+            Flags => [ 'Binary', 'Protected' ],
             Format => 'undef',
+            Writable => 'undef',
+            WriteGroup => 'IFD0',
         },
     ],
     0xc635 => {
@@ -3931,12 +3942,16 @@ sub ProcessExif($$$)
                     $valueDataPos = $valuePtr + $dataPos;
                     $valuePtr = 0;
                 } else {
-                    my ($tagStr, $tmpInfo);
+                    my ($tagStr, $tmpInfo, $leicaTrailer);
                     if ($tagInfo) {
                         $tagStr = $$tagInfo{Name};
+                        $leicaTrailer = $$tagInfo{LeicaTrailer};
                     } elsif (defined $tagInfo) {
                         $tmpInfo = $exifTool->GetTagInfo($tagTablePtr, $tagID, \ '', $formatStr, $count);
-                        $tagStr = $$tmpInfo{Name} if $tmpInfo;
+                        if ($tmpInfo) {
+                            $tagStr = $$tmpInfo{Name};
+                            $leicaTrailer = $$tmpInfo{LeicaTrailer};
+                        }
                     }
                     if ($tagInfo and $$tagInfo{ChangeBase}) {
                         # adjust base offset for this tag only
@@ -3954,7 +3969,7 @@ sub ProcessExif($$$)
                         $valueDataPos = $valuePtr + $dataPos;
                         $valueDataLen = $size;
                         $valuePtr = 0;
-                    } elsif ($tagStr eq 'MakerNoteLeica6' and $exifTool->{RAF}) {
+                    } elsif ($leicaTrailer and $exifTool->{RAF}) {
                         if ($verbose > 0) {
                             $exifTool->VPrint(0, "$$exifTool{INDENT}$index) $tagStr --> (outside APP1 segment)\n");
                         }
@@ -4069,7 +4084,8 @@ sub ProcessExif($$$)
             # (avoids long delays when processing some corrupted files)
             if ($count > 100000 and $formatStr !~ /^(undef|string|binary)$/) {
                 my $tagName = $tagInfo ? $$tagInfo{Name} : sprintf('tag 0x%.4x', $tagID);
-                next if $exifTool->Warn("Ignoring $dirName $tagName with excessive count", 2);
+                my $minor = $count > 2000000 ? 0 : 2;
+                next if $exifTool->Warn("Ignoring $dirName $tagName with excessive count", $minor);
             }
             # convert according to specified format
             $val = ReadValue($valueDataPt,$valuePtr,$formatStr,$count,$readSize,\$rational);
@@ -4192,7 +4208,7 @@ sub ProcessExif($$$)
                 my $over = @values - $$subdir{MaxSubdirs};
                 if ($over > 0) {
                     $exifTool->Warn("Ignoring $over $tagStr directories");
-                    pop @values while $over--;
+                    splice @values, $$subdir{MaxSubdirs};
                 }
                 $val = shift @values;
             }

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

@@ -14,6 +14,7 @@
 #               6) http://forums.dpreview.com/forums/readflat.asp?forum=1012&thread=31350384
 #                  and http://forum.photome.de/viewtopic.php?f=2&t=353&p=742#p740
 #               7) Kai Lappalainen private communication
+#               8) http://u88.n24.queensu.ca/exiftool/forum/index.php/topic,5223.0.html
 #               JD) Jens Duttke private communication
 #------------------------------------------------------------------------------
 
@@ -136,16 +137,17 @@ my %faceCategories = (
         Flags => 'PrintHex',
         Writable => 'int16u',
         PrintConv => {
-            0x0   => 'Normal',
-            0x080 => 'Medium High', #2
-            0x100 => 'High',
-            0x180 => 'Medium Low', #2
+            0x0   => 'Normal', # # ("Color 0", ref 8)
+            0x080 => 'Medium High', #2 ("Color +1", ref 8)
+            0x100 => 'High', # ("Color +2", ref 8)
+            0x180 => 'Medium Low', #2 ("Color -1", ref 8)
             0x200 => 'Low',
             0x300 => 'None (B&W)', #2
-            0x301 => 'B&W Green Filter', #PH (X100)
+            0x301 => 'B&W Red Filter', #PH/8
             0x302 => 'B&W Yellow Filter', #PH (X100)
-            0x303 => 'B&W Blue Filter', #PH (X100)
+            0x303 => 'B&W Green Filter', #PH/8
             0x310 => 'B&W Sepia', #PH (X100)
+            0x400 => 'Low 2', #8 ("Color -2")
             0x8000 => 'Film Simulation', #2
         },
     },
@@ -198,9 +200,11 @@ my %faceCategories = (
         Flags => 'PrintHex',
         Writable => 'int16u',
         PrintConv => {
-            0x000 => 'Normal',
-            0x100 => 'Strong',
-            0x200 => 'Weak',
+            0x000 => 'Normal', # ("NR 0, ref 8)
+            0x100 => 'Strong', # ("NR+2, ref 8)
+            0x180 => 'Medium Strong', #8 ("NR+1")
+            0x200 => 'Weak', # ("NR-2, ref 8)
+            0x280 => 'Medium Weak', #8 ("NR-1")
         },
     },
     0x1010 => {
@@ -234,6 +238,12 @@ my %faceCategories = (
             1 => 'Manual',
         },
     },
+    0x1022 => { #8
+        Name => 'AFPointSet',
+        Writable => 'int16u',
+        Notes => '"No" for manual and AF-multi focus modes',
+        PrintConv => { 0 => 'No', 1 => 'Yes' },
+    },
     0x1023 => { #2
         Name => 'FocusPixel',
         Writable => 'int16u',
@@ -286,11 +296,11 @@ my %faceCategories = (
             0x300 => 'Manual',
         },
     },
-# this usually has a value of 1
-#    0x1032 => { #2
-#        Name => 'ShutterCount',
-#        Writable => 'int16u',
-#    },
+    0x1032 => { #8
+        Name => 'ExposureCount',
+        Writable => 'int16u',
+        Notes => 'number of exposures used for this image',
+    },
     0x1033 => { #6
         Name => 'EXRAuto',
         Writable => 'int16u',
@@ -309,6 +319,28 @@ my %faceCategories = (
             0x300 => 'DR (Dynamic Range priority)',
         },
     },
+    0x1040 => { #8
+        Name => 'ShadowTone',
+        Writable => 'int32s',
+        PrintConv => {
+            -32 => 'Hard',
+            -16 => 'Medium-hard',
+            0 => 'Normal',
+            16 => 'Medium-soft',
+            32 => 'Soft',
+        },
+    },
+    0x1041 => { #8
+        Name => 'HighlightTone',
+        Writable => 'int32s',
+        PrintConv => {
+            -32 => 'Hard',
+            -16 => 'Medium-hard',
+            0 => 'Normal',
+            16 => 'Medium-soft',
+            32 => 'Soft',
+        },
+    },
     0x1100 => {
         Name => 'AutoBracketing',
         Writable => 'int16u',
@@ -434,10 +466,44 @@ my %faceCategories = (
         PrintConv => '"$val%"',
         PrintConvInv => '$val=~s/\s*\%$//; $val',
     },
-    # 0x140b - DR value for AutoDR???? (ref 6) - values: 100
-    # 0x3820 - int16u video frame rate? - PH (HS20EXR)
-    # 0x3821 - int16u video frame width? - PH (HS20EXR)
-    # 0x3822 - int16u video frame height? - PH (HS20EXR)
+    0x1422 => { #8
+        Name => 'ImageStabilization',
+        Writable => 'int16u',
+        Count => 3,
+        PrintConv => [{
+            0 => 'None',
+            1 => 'Optical', #PH
+            2 => 'Sensor-shift', #PH
+            512 => 'Digital', #PH
+        },{
+            0 => 'Off',
+            1 => 'On (mode 1, continuous)',
+            2 => 'On (mode 2, shooting only)',
+        }],
+    },
+    0x1436 => { #8
+        Name => 'ImageGeneration',
+        Format => 'int16u',
+        PrintConv => {
+            0 => 'Original Image',
+            1 => 'Re-developed from RAW',
+        },
+    },
+    0x3820 => { #PH (HS20EXR MOV)
+        Name => 'FrameRate',
+        Writable => 'int16u',
+        Groups => { 2 => 'Video' },
+    },
+    0x3821 => { #PH (HS20EXR MOV)
+        Name => 'FrameWidth',
+        Writable => 'int16u',
+        Groups => { 2 => 'Video' },
+    },
+    0x3822 => { #PH (HS20EXR MOV)
+        Name => 'FrameHeight',
+        Writable => 'int16u',
+        Groups => { 2 => 'Video' },
+    },
     0x4100 => { #PH
         Name => 'FacesDetected',
         Writable => 'int16u',

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

@@ -12,7 +12,7 @@ use strict;
 use vars qw($VERSION);
 use Image::ExifTool::Exif;
 
-$VERSION = '1.38';
+$VERSION = '1.39';
 
 my %coordConv = (
     ValueConv    => 'Image::ExifTool::GPS::ToDegrees($val)',
@@ -38,6 +38,7 @@ my %coordConv = (
     0x0001 => {
         Name => 'GPSLatitudeRef',
         Writable => 'string',
+        Notes => 'tags 0x0001-0x0006 used for camera location according to MWG 2.0',
         Count => 2,
         PrintConv => {
             # extract N/S if written from Composite:GPSLatitude
@@ -209,6 +210,7 @@ my %coordConv = (
     0x0013 => {
         Name => 'GPSDestLatitudeRef',
         Writable => 'string',
+        Notes => 'tags 0x0013-0x001a used for subject location according to MWG 2.0',
         Count => 2,
         PrintConv => {
             N => 'North',
@@ -314,6 +316,7 @@ my %coordConv = (
         PrintConvInv => '$val=~s/\s*m$//; $val',
         Writable => 'rational64u',
     },
+    # 0xea1c - Nokia Lumina 1020 writes this (padding) in GPS IFD - PH
 );
 
 # Composite GPS tags

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

@@ -11,9 +11,8 @@ use strict;
 use vars qw($VERSION);
 use Image::ExifTool qw(:DataAccess :Utils);
 
-$VERSION = '1.17';
+$VERSION = '1.18';
 
-sub ProcessScalado($$$);
 sub ProcessOcad($$$);
 
 # (this main JPEG table is for documentation purposes only)
@@ -94,7 +93,7 @@ sub ProcessOcad($$$);
     APP4 => [{
         Name => 'Scalado',
         Condition => '$$valPt =~ /^SCALADO\0/',
-        SubDirectory => { TagTable => 'Image::ExifTool::JPEG::Scalado' },
+        SubDirectory => { TagTable => 'Image::ExifTool::Scalado::Main' },
       }, {
         Name => 'FPXR', # (non-standard location written by some HP models)
         Condition => '$$valPt =~ /^FPXR\0/',
@@ -464,46 +463,6 @@ sub ProcessOcad($$$);
     },
 );
 
-# information written by Scalado software (PhotoFusion maybe?)
-%Image::ExifTool::JPEG::Scalado = (
-    GROUPS => { 0 => 'APP4', 1 => 'Scalado', 2 => 'Image' },
-    PROCESS_PROC => \&ProcessScalado,
-    TAG_PREFIX => 'Scalado',
-    FORMAT => 'int32s',
-    # I presume this was written by 
-    NOTES => q{
-        Tags extracted from the JPEG APP4 "SCALADO" segment (presumably written by
-        Scalado mobile software, L<http://www.scalado.com/>).
-    },
-    SPMO => {
-        Name => 'DataLength',
-        Unkown => 1,
-    },
-    WDTH => {
-        Name => 'PreviewImageWidth',
-        ValueConv => '$val ? abs($val) : undef',
-    },
-    HGHT => {
-        Name => 'PreviewImageHeight',
-        ValueConv => '$val ? abs($val) : undef',
-    },
-    QUAL => {
-        Name => 'PreviewQuality',
-        ValueConv => '$val ? abs($val) : undef',
-    },
-    # tags not yet decoded with observed values:
-    # CHKH: 0, -9010
-    # CHKL: -2664, -12852
-    # CLEN: -1024
-    # CSPC: -2232593
-    # DATA: (+ve data length)
-    # HDEC: 0
-    # MAIN: 0
-    # SCI0: (+ve data length)
-    # SCX1: (+ve data length)
-    # WDEC: 0
-);
-
 #------------------------------------------------------------------------------
 # Extract information from the JPEG APP0 Ocad segment
 # Inputs: 0) ExifTool object ref, 1) dirInfo ref, 2) tag table ref
@@ -525,35 +484,6 @@ sub ProcessOcad($$$)
     return 1;
 }
 
-#------------------------------------------------------------------------------
-# Extract information from the JPEG APP4 SCALADO segment
-# Inputs: 0) ExifTool object ref, 1) dirInfo ref, 2) tag table ref
-# Returns: 1 on success
-sub ProcessScalado($$$)
-{
-    my ($exifTool, $dirInfo, $tagTablePtr) = @_;
-    my $dataPt = $$dirInfo{DataPt};
-    my $pos = 0;
-    my $end = length $$dataPt;
-    SetByteOrder('MM');
-    $exifTool->VerboseDir('APP4 SCALADO', undef, $end);
-    for (;;) {
-        last if $pos + 12 > $end;
-        my $tag = substr($$dataPt, $pos, 4);
-        my $unk = Get32u($dataPt, $pos + 4); # (what is this?)
-        $exifTool->HandleTag($tagTablePtr, $tag, undef,
-            DataPt  => $dataPt,
-            Start   => $pos + 8,
-            Size    => 4,
-            Extra   => ", unk $unk",
-        );
-        # shorten directory size by length of SPMO
-        $end -= Get32u($dataPt, $pos + 8) if $tag eq 'SPMO';
-        $pos += 12;
-    }
-    return 1;
-}
-
 1;  # end
 
 __END__