exiftool_vendored 10.40.0 → 10.43.0

data/bin/{Image-ExifTool-10.40 → Image-ExifTool-10.43}/lib/Image/ExifTool/PNG.pm

@@ -23,13 +23,14 @@
 package Image::ExifTool::PNG;
 
 use strict;
-use vars qw($VERSION $AUTOLOAD);
+use vars qw($VERSION $AUTOLOAD %stdCase);
 use Image::ExifTool qw(:DataAccess :Utils);
 
-$VERSION = '1.39';
+$VERSION = '1.40';
 
 sub ProcessPNG_tEXt($$$);
 sub ProcessPNG_iTXt($$$);
+sub ProcessPNG_eXIf($$$);
 sub ProcessPNG_Compressed($$$);
 sub CalculateCRC($;$$$);
 sub HexEncode($);
@@ -39,6 +40,9 @@ sub DoneDir($$$;$);
 sub GetLangInfo($$);
 sub BuildTextChunk($$$$$);
 
+# translate lower-case to actual case used for eXIf/zXIf chunks
+%stdCase = ( 'zxif' => 'zxIf', exif => 'exIf' );
+
 my $noCompressLib;
 
 # look up for file type, header chunk and end chunk, based on file signature
@@ -251,6 +255,32 @@ $Image::ExifTool::PNG::colorType = -1;
             TagTable => 'Image::ExifTool::PNG::AnimationControl',
         },
     },
+    # eXIf
+    $stdCase{exif} => {
+        Name => $stdCase{exif},
+        Notes => q{
+            proposed but not yet registered.  This is where ExifTool will create new
+            EXIF without the Compress option
+        },
+        SubDirectory => {
+            TagTable => 'Image::ExifTool::Exif::Main',
+            DirName => 'EXIF', # (to write as a block)
+            ProcessProc => \&ProcessPNG_eXIf,
+        },
+    },
+    # zXIf
+    $stdCase{zxif} => {
+        Name => $stdCase{zxif},
+        Notes => q{
+            proposed but not yet registered.  This is where ExifTool will create new
+            EXIF with the Compress option
+        },
+        SubDirectory => {
+            TagTable => 'Image::ExifTool::Exif::Main',
+            DirName => 'EXIF', # (to write as a block)
+            ProcessProc => \&ProcessPNG_eXIf,
+        },
+    },
     # fcTL - animation frame control for each frame
     # fdAT - animation data for each frame
 );
@@ -477,7 +507,8 @@ my %unreg = ( Notes => 'unregistered' );
             # EXIF table must come first because we key on this in ProcessProfile()
             # (No condition because this is just for BuildTagLookup)
             Name => 'APP1_Profile',
-            Notes => 'unregistered.  This is where ExifTool will create new EXIF',
+            %unreg,
+            NonStandard => 1,
             SubDirectory => {
                 TagTable => 'Image::ExifTool::Exif::Main',
                 ProcessProc => \&ProcessProfile,
@@ -657,9 +688,7 @@ sub FoundPNG($$$$;$$$$)
             $et->VerboseDir("Unable to decompress $$tagInfo{Name}", 0, length($val));
         }
         # issue warning if relevant
-        if ($deflateErr and (not $outBuff or
-            ($tagInfo and $$tagInfo{SubDirectory} and $$et{EDIT_DIRS}{$$tagInfo{Name}})))
-        {
+        if ($deflateErr and not $outBuff) {
             $et->Warn($deflateErr);
             $noCompressLib = 1 if $deflateErr =~ /^Install/;
         }
@@ -674,61 +703,76 @@ sub FoundPNG($$$$;$$$$)
     if ($tagInfo) {
         my $tagName = $$tagInfo{Name};
         my $processed;
-        if ($$tagInfo{SubDirectory} and not $compressed) {
-            my $len = length $val;
-            if ($verbose and $$et{INDENT} ne '  ') {
-                if ($wasCompressed and $verbose > 2) {
-                    my $name = $tagName;
-                    $wasCompressed and $name = "Decompressed $name";
-                    $et->VerboseDir($name, 0, $len);
-                    $et->VerboseDump(\$val);
-                }
-                # don't indent next directory (since it is really the same data)
-                $$et{INDENT} =~ s/..$//;
-            }
+        if ($$tagInfo{SubDirectory}) {
             my $subdir = $$tagInfo{SubDirectory};
-            my $processProc = $$subdir{ProcessProc};
-            # nothing more to do if writing and subdirectory is not writable
-            my $subTable = GetTagTable($$subdir{TagTable});
-            return 1 if $outBuff and not $$subTable{WRITE_PROC};
             my $dirName = $$subdir{DirName} || $tagName;
-            my %subdirInfo = (
-                DataPt   => \$val,
-                DirStart => 0,
-                DataLen  => $len,
-                DirLen   => $len,
-                DirName  => $dirName,
-                TagInfo  => $tagInfo,
-                ReadOnly => 1, # (used only by WriteXMP)
-                OutBuff  => $outBuff,
-            );
-            # no need to re-decompress if already done
-            undef $processProc if $wasCompressed and $processProc and $processProc eq \&ProcessPNG_Compressed;
-            # rewrite this directory if necessary (but always process TextualData normally)
-            if ($outBuff and not $processProc and $subTable ne \%Image::ExifTool::PNG::TextualData) {
-                return 1 unless $$et{EDIT_DIRS}{$dirName};
-                $$outBuff = $et->WriteDirectory(\%subdirInfo, $subTable);
-                if ($tagName eq 'XMP' and $$outBuff) {
-                    if ($$et{FoundIDAT} and $$et{DEL_GROUP}{XMP}) {
-                        $et->VPrint(0,'  Deleting XMP');
-                        $$outBuff = '';
-                    } else {
-                        # make sure the XMP is marked as read-only
-                        Image::ExifTool::XMP::ValidateXMP($outBuff,'r');
+            if (not $compressed) {
+                my $len = length $val;
+                if ($verbose and $$et{INDENT} ne '  ') {
+                    if ($wasCompressed and $verbose > 2) {
+                        my $name = $tagName;
+                        $wasCompressed and $name = "Decompressed $name";
+                        $et->VerboseDir($name, 0, $len);
+                        $et->VerboseDump(\$val);
                     }
+                    # don't indent next directory (since it is really the same data)
+                    $$et{INDENT} =~ s/..$//;
                 }
-                DoneDir($et, $dirName, $outBuff, $$tagInfo{NonStandard});
-            } else {
-                # issue warning for standard XMP after IDAT (PNGEarlyXMP option)
-                if ($tagName eq 'XMP' and not $$tagInfo{NonStandard} and
-                    $$et{FoundIDAT} and $$et{FoundIDAT} == 2)
-                {
-                    $et->Warn('XMP found after PNG IDAT');
-                    $$et{FoundIDAT} = 1;
+                my $processProc = $$subdir{ProcessProc};
+                # nothing more to do if writing and subdirectory is not writable
+                my $subTable = GetTagTable($$subdir{TagTable});
+                return 1 if $outBuff and not $$subTable{WRITE_PROC};
+                my $dirName = $$subdir{DirName} || $tagName;
+                my %subdirInfo = (
+                    DataPt   => \$val,
+                    DirStart => 0,
+                    DataLen  => $len,
+                    DirLen   => $len,
+                    DirName  => $dirName,
+                    TagInfo  => $tagInfo,
+                    ReadOnly => 1, # (used only by WriteXMP)
+                    OutBuff  => $outBuff,
+                );
+                # no need to re-decompress if already done
+                undef $processProc if $wasCompressed and $processProc and $processProc eq \&ProcessPNG_Compressed;
+                # rewrite this directory if necessary (but always process TextualData normally)
+                if ($outBuff and not $processProc and $subTable ne \%Image::ExifTool::PNG::TextualData) {
+                    return 1 unless $$et{EDIT_DIRS}{$dirName};
+                    $$outBuff = $et->WriteDirectory(\%subdirInfo, $subTable);
+                    if ($tagName eq 'XMP' and $$outBuff) {
+                        if ($$et{FoundIDAT} and $$et{DEL_GROUP}{XMP}) {
+                            $et->VPrint(0,'  Deleting XMP');
+                            $$outBuff = '';
+                        } else {
+                            # make sure the XMP is marked as read-only
+                            Image::ExifTool::XMP::ValidateXMP($outBuff,'r');
+                        }
+                    }
+                    DoneDir($et, $dirName, $outBuff, $$tagInfo{NonStandard});
+                } else {
+                    # issue warning for standard XMP after IDAT (PNGEarlyXMP option)
+                    if ($tagName eq 'XMP' and not $$tagInfo{NonStandard} and
+                        $$et{FoundIDAT} and $$et{FoundIDAT} == 2)
+                    {
+                        $et->Warn('XMP found after PNG IDAT');
+                        $$et{FoundIDAT} = 1;
+                    }
+                    $processed = $et->ProcessDirectory(\%subdirInfo, $subTable, $processProc);
+                }
+                $compressed = 1;    # pretend this is compressed since it is binary data
+            } elsif ($outBuff) {
+                if ($$et{DEL_GROUP}{$dirName} or ($dirName eq 'EXIF' and $$et{DEL_GROUP}{IFD0})) {
+                    $$outBuff = '';
+                    ++$$et{CHANGED};
+                    $et->VPrint(0, "  Deleting $tag chunk");
+                } else {
+                    if ($$et{EDIT_DIRS}{$dirName} or ($dirName eq 'EXIF' and $$et{EDIT_DIRS}{IFD0})) {
+                        $et->Warn("Can't write $dirName. Requires Compress::Zlib");
+                    }
+                    # pretend we did this directory so we don't try to recreate it
+                    DoneDir($et, $dirName, $outBuff, $$tagInfo{NonStandard});
                 }
-                $processed = $et->ProcessDirectory(\%subdirInfo, $subTable, $processProc);
             }
-            $compressed = 1;    # pretend this is compressed since it is binary data
         }
         if ($outBuff) {
             my $writable = $$tagInfo{Writable};
@@ -779,17 +823,19 @@ sub FoundPNG($$$$;$$$$)
                     $$outBuff = BuildTextChunk($et, $tag, $tagInfo, $$outBuff, $lang);
                 } elsif ($wasCompressed) {
                     # re-compress the output data
-                    my $deflate;
-                    if (eval { require Compress::Zlib }) {
-                        my $deflate = Compress::Zlib::deflateInit();
-                        if ($deflate) {
-                            $$outBuff = $deflate->deflate($$outBuff);
-                            $$outBuff .= $deflate->flush() if defined $$outBuff;
-                        } else {
-                            undef $$outBuff;
-                        }
+                    my $len = length $$outBuff;
+                    my $deflate = Compress::Zlib::deflateInit();
+                    if ($deflate) {
+                        $$outBuff = $deflate->deflate($$outBuff);
+                        $$outBuff .= $deflate->flush() if defined $$outBuff;
+                    } else {
+                        undef $$outBuff;
+                    }
+                    if (not $$outBuff) {
+                        $et->Warn("PNG:$tagName not written (compress error)");
+                    } elsif (lc $tag eq 'zxif') {
+                        $$outBuff = "\0" . pack('N',$len) . $$outBuff;  # add zXIf header
                     }
-                    $$outBuff or $et->Warn("PNG:$tagName not written (compress error)");
                 }
             }
             return 1;
@@ -910,6 +956,12 @@ sub ProcessProfile($$$)
         $dirInfo{DirStart} += $hdrLen;
         $dirInfo{DirLen} -= $hdrLen;
         if ($outBuff) {
+            # delete non-standard EXIF if recreating from scratch
+            if ($$et{DEL_GROUP}{EXIF} or $$et{DEL_GROUP}{IFD0}) {
+                $$outBuff = '';
+                $et->VPrint(0, '  Deleting non-standard APP1 EXIF information');
+                return 1;
+            }
             $$outBuff = $et->WriteDirectory(\%dirInfo, $tagTablePtr,
                                             \&Image::ExifTool::WriteTIFF);
             $$outBuff = $Image::ExifTool::exifAPP1hdr . $$outBuff if $$outBuff;
@@ -933,8 +985,14 @@ sub ProcessProfile($$$)
         }
     } elsif ($buff =~ /^(MM\0\x2a|II\x2a\0)/) {
         # TIFF information
-        return 1 if $outBuff and not $$editDirs{IFD0};
+        return 1 if $outBuff and not $$editDirs{IFD0};  
         if ($outBuff) {
+            # delete non-standard EXIF if recreating from scratch
+            if ($$et{DEL_GROUP}{EXIF} or $$et{DEL_GROUP}{IFD0}) {
+                $$outBuff = '';
+                $et->VPrint(0, '  Deleting non-standard EXIF/TIFF information');
+                return 1;
+            }
             $$outBuff = $et->WriteDirectory(\%dirInfo, $tagTablePtr,
                                             \&Image::ExifTool::WriteTIFF);
             DoneDir($et, 'IFD0', $outBuff);
@@ -1021,6 +1079,51 @@ sub ProcessPNG_iTXt($$$)
     return FoundPNG($et, $tagTablePtr, $tag, $val, $compressed, $outBuff, 'UTF8', $lang);
 }
 
+#------------------------------------------------------------------------------
+# Process PNG eXIf/zXIf chunk
+# Inputs: 0) ExifTool object reference, 1) DirInfo reference, 2) Pointer to tag table
+# Returns: 1 on success
+# Notes: writes new chunk data to ${$$dirInfo{OutBuff}} if writing tag
+sub ProcessPNG_eXIf($$$)
+{
+    my ($et, $dirInfo, $tagTablePtr) = @_;
+    my $outBuff = $$dirInfo{OutBuff};
+    my $dataPt = $$dirInfo{DataPt};
+    my $tagInfo = $$dirInfo{TagInfo};
+    my $tag = $$tagInfo{TagID};
+    my $del = $outBuff && ($$et{DEL_GROUP}{EXIF} or $$et{DEL_GROUP}{IFD0});
+    my $type;
+
+    if ($$dataPt =~ /^(\0|II|MM)/) {
+        $type = $1;
+    } elsif ($del) {
+        $et->VPrint(0, "  Deleting invalid $tag chunk");
+        $$outBuff = '';
+        ++$$et{CHANGED};
+        return 1;
+    } else {
+        $et->Warn("Invalid $tag chunk");
+        return 0;
+    }
+    if ($type eq "\0") {    # is this compressed EXIF?
+        my $buf = substr($$dataPt, 5);
+        # go around again to uncompress the data
+        $tagTablePtr = GetTagTable('Image::ExifTool::PNG::Main');
+        return FoundPNG($et, $tagTablePtr, $$tagInfo{TagID}, \$buf, 2, $outBuff);
+    } elsif (not $outBuff) {
+        return $et->ProcessTIFF($dirInfo);
+    } elsif ($del and ($et->Options('Compress') xor lc($tag) eq 'zxif')) {
+        $et->VPrint(0, "  Deleting $tag chunk");
+        $$outBuff = '';
+        ++$$et{CHANGED};
+    } elsif ($$et{EDIT_DIRS}{IFD0}) {
+        $$outBuff = $et->WriteDirectory($dirInfo, $tagTablePtr,
+                                        \&Image::ExifTool::WriteTIFF);
+        DoneDir($et, 'IFD0', $outBuff, $$tagInfo{NonStandard});
+    }
+    return 1;
+}
+
 #------------------------------------------------------------------------------
 # Extract meta information from a PNG image
 # Inputs: 0) ExifTool object reference, 1) dirInfo reference
@@ -1176,6 +1279,19 @@ sub ProcessPNG($$)
             print $out "$fileType $chunk ($len bytes):\n";
             $et->VerboseDump(\$dbuf, Addr => $raf->Tell() - $len - 4) if $verbose > 2;
         }
+        # translate case of chunk name if necessary
+        if (not $$tagTablePtr{$chunk}) {
+            my $stdChunk = $stdCase{lc $chunk};
+            if ($stdChunk) {
+                if ($outfile and ($$et{EDIT_DIRS}{IFD0} or $stdChunk !~ /^[ez]xif$/i)) {
+                    $et->Warn("Changed $chunk chunk to $stdChunk", 1);
+                    ++$$et{CHANGED};
+                } else {
+                    $et->Warn("$chunk chunk should be $stdChunk", 1);
+                }
+                $chunk = $stdCase{lc $chunk};
+            }
+        }
         # only extract information from chunks in our tables
         my ($theBuff, $outBuff);
         $outBuff = \$theBuff if $outfile;

data/bin/{Image-ExifTool-10.40 → Image-ExifTool-10.43}/lib/Image/ExifTool/Pentax.pm

@@ -57,7 +57,7 @@ use Image::ExifTool::Exif;
 use Image::ExifTool::GPS;
 use Image::ExifTool::HP;
 
-$VERSION = '3.08';
+$VERSION = '3.09';
 
 sub CryptShutterCount($$);
 sub PrintFilter($$$);
@@ -531,6 +531,7 @@ my %pentaxModelID = (
     0x1309c => 'K-3 II', #29 (Ricoh)
     0x131f0 => 'WG-M2', # (Ricoh)
     0x13222 => 'K-70', #29 (Ricoh)
+    0x1322c => 'KP', #29 (Ricoh)
 );
 
 # Pentax city codes - (PH, Optio WP)

data/bin/{Image-ExifTool-10.40 → Image-ExifTool-10.43}/lib/Image/ExifTool/README

@@ -491,7 +491,7 @@ numerical.
                   with $val and $self as arguments (in which case $$self{grps}
                   may be used to set the groups).  For Composite tags, $val is a
                   reference to a hash of source ("derived from") tag names, and
-                  @val may be used to access the Raw values of these tags. The
+                  @val may be used to access the Raw values of these tags.  The
                   returned value may be a scalar which is used as the new Raw
                   value, a scalar reference to a binary data value, a hash
                   reference for Composite tags, an ARRAY reference for a list of

data/bin/{Image-ExifTool-10.40 → Image-ExifTool-10.43}/lib/Image/ExifTool/Sony.pm

@@ -31,7 +31,7 @@ use Image::ExifTool qw(:DataAccess :Utils);
 use Image::ExifTool::Exif;
 use Image::ExifTool::Minolta;
 
-$VERSION = '2.51';
+$VERSION = '2.54';
 
 sub ProcessSRF($$$);
 sub ProcessSR2($$$);
@@ -136,6 +136,7 @@ my %sonyLensTypes2 = (
     50493 => 'Sigma 17-70mm F2.8-4 DC MACRO OS HSM | C 013 + MC-11', #JR
     50495 => 'Sigma 50-100mm F1.8 DC HSM | A 016 + MC-11', #JR
 
+    50992 => 'Voigtlander SUPER WIDE-HELIAR 15mm F4.5 III', #JR
     50993 => 'Voigtlander HELIAR-HYPER WIDE 10mm F5.6', #IB
     50994 => 'Voigtlander ULTRA WIDE-HELIAR 12mm F5.6 III', #IB
 
@@ -6589,10 +6590,14 @@ my %pictureProfile2010 = (
     },
     0x0032 => { #13
         Name => 'ImageCount',
-        # this seems to be valid for the A37,A57,A65,A77,A99, and possibly the NEX-5N/7
-        # but I haven't seen a count over 65536, so the Format is not confirmed - PH
+        # this seems to be valid for the A7R,A37,A57,A65,A77,A99,A99V and possibly the
+        # NEX-5N/7.  For the A99V it is definitely more than 16 bits, but it wraps at
+        # 65536 for the A7R.
         Format => 'int32u',
-        Notes => 'total number of image exposures made by the camera',
+        Notes => q{
+            total number of image exposures made by the camera, modulo 65536 for some
+            models
+        },
         RawConv => '$val & 0x00ffffff',
     },
     0x003a => { # appr. same value as Exif ExposureTime, but longer in HDR-modes
@@ -7817,8 +7822,9 @@ my %pictureProfile2010 = (
         # 1.40: SEL1635Z, SEL24240, SEL35F14Z, SELP28135G, Zeiss Loxia 35mm/50mm Ver.01, Zeiss Touit Ver.02
         # 1.41: SELP18105G Ver.02
         # 1.50: SEL28F20, SEL90M28G, Zeiss Batis 18mm/25mm/85mm, Zeiss Loxia 21mm, Zeiss Loxia 35mm/50mm Ver.02
-        # 1.60: SEL85F14GM, SEL2470GM, SEL70200GM, SEL50F18F, SEL50F14Z, SEL50M28, SEL70300G, Sigma 30mm F1.4 DC DN, Sigma MC-11
-        # 1.70: Voigtlander ULTRA WIDE-HELIAR 12mm F5.6 III
+        # 1.60: SEL85F14GM, SEL2470GM, SEL70200GM, SEL50F18F, SEL50F14Z, SEL50M28, SEL70300G, Sigma 30mm F1.4 DC DN,
+        #       Sigma MC-11, Voigtlander SUPER WIDE-HELIAR 15mm F4.5 III
+        # 1.70: Voigtlander HELIAR-HYPER WIDE 10mm F5.6, ULTRA WIDE-HELIAR 12mm F5.6 III, Zeiss Loxia 85mm
     },
     0x0015 => {
         Name => 'LensFirmwareVersion',