exiftool_vendored 11.57.0 → 11.60.0

data/bin/lib/Image/ExifTool/Nikon.pm

@@ -60,7 +60,7 @@ use Image::ExifTool qw(:DataAccess :Utils);
 use Image::ExifTool::Exif;
 use Image::ExifTool::GPS;
 
-$VERSION = '3.67';
+$VERSION = '3.68';
 
 sub LensIDConv($$$);
 sub ProcessNikonAVI($$$);
@@ -1719,7 +1719,7 @@ my %binaryDataAttrs = (
                 TagTable => 'Image::ExifTool::Nikon::ShotInfoD500',
                 DecryptStart => 4,
                 DecryptLen => 0x2c24 + 12,
-                DecryptMore => 'Get32u(\$data, 0xa0) + 12',
+                DecryptMore => 'Get32u(\$data, 0xa8) + 0x2ea5 - 0x2c90',
                 ByteOrder => 'LittleEndian',
             },
         },
@@ -1730,7 +1730,7 @@ my %binaryDataAttrs = (
                 TagTable => 'Image::ExifTool::Nikon::ShotInfoD500',
                 DecryptStart => 4,
                 DecryptLen => 0x2cb2 + 4,
-                DecryptMore => 'Get32u(\$data, 0xa0) + 12',
+                DecryptMore => 'Get32u(\$data, 0xa8) + 0x2ea5 - 0x2c90',
                 ByteOrder => 'LittleEndian',
             },
         },
@@ -4466,16 +4466,18 @@ my %nikonFocalConversions = (
         RawConv => '$$self{NewLensData} = 1 unless $val =~ /^.\0+$/s; undef',
         Hidden => 1,
     },
-    #0x30 => {
-    #    Name => 'LensID', ? (NC)
-    #    Condition => '$$self{NewLensData}',
-    #    Format => 'int16u',
-    #    PrintConv => {
-    #        1 => 'Nikkor Z 24-70mm f/4 S',
-    #        4 => 'Nikkor Z 35mm f/1.8 S',
-    #        9 => 'Nikkor Z 50mm f/1.8 S',
-    #    },
-    #},
+    0x30 => {
+        Name => 'LensID',
+        Condition => '$$self{NewLensData}',
+        Format => 'int16u',
+        PrintConv => {
+             1 => 'Nikkor Z 24-70mm f/4 S',
+             2 => 'Nikkor Z 14-30mm f/4 S',
+             4 => 'Nikkor Z 35mm f/1.8 S',
+             9 => 'Nikkor Z 50mm f/1.8 S',
+            13 => 'Nikkor Z 24-70mm f/2.8 S',
+        },
+    },
     0x36 => {
         Name => 'MaxAperture',
         Condition => '$$self{NewLensData}',
@@ -5685,8 +5687,8 @@ my %nikonFocalConversions = (
     WRITE_PROC => \&Image::ExifTool::Nikon::ProcessNikonEncrypted,
     CHECK_PROC => \&Image::ExifTool::CheckBinaryData,
     VARS => { ID_LABEL => 'Index' },
-    DATAMEMBER => [ 0x04, 0x10, 0x14, 0x2c, 0x50, 0x58, 0xa0, 0xb0,
-                    0x07b0, 0x086c, 0x0e7c, 0x0eea, 0x2c23 ],
+    DATAMEMBER => [ 0x04, 0x10, 0x14, 0x2c, 0x50, 0x58, 0xa0, 0xa8, 0xb0,
+                    0x07b0, 0x086c, 0x0e7c, 0x0eea, 0x2c23, 0x2c8f ],
     IS_SUBDIR => [ 0x0eeb ],
     WRITABLE => 1,
     FIRST_ENTRY => 0,
@@ -5752,6 +5754,14 @@ my %nikonFocalConversions = (
         Hidden => 1,
         RawConv => '$$self{OrientationOffset} = $val || 0x10000000; undef', # (ignore if 0)
     },
+    0xa8 => {
+        Name => 'OtherOffset',
+        DataMember => 'OtherOffset',
+        Format => 'int32u',
+        Writable => 0,
+        Hidden => 1,
+        RawConv => '$$self{OtherOffset} = $val || 0x10000000; undef', # (ignore if 0)
+    },
 #
 # Tag ID's below are the offsets for a D500 JPEG image, but these offsets change
 # for various image types according to the offset table above
@@ -6141,9 +6151,15 @@ my %nikonFocalConversions = (
         PrintConv => 'sprintf("%.1f", $val)',
         PrintConvInv => '$val',
     },
-    # note: DecryptLen currently set to OrientationOffset + 12
-
-    # (not sure about how this moves around)
+### 0x2c90 - OtherInfo start (D500 firmware 1.20d)
+    0x2c8f => {
+        Name => 'Hook7',
+        Hidden => 1,
+        RawConv => 'undef',
+        # account for variable location of OtherInfo data
+        Hook => '$varSize = $$self{OtherOffset} - 0x2c90',
+    },
+    # (needs testing)
     #0x2cb2 => {
     #    Name => 'ExtendedPhotoShootingBanks',
     #    Mask => 0x01,
@@ -6152,10 +6168,10 @@ my %nikonFocalConversions = (
     #        1 => 'Off',
     #    },
     #},
-    # don't decode this because it is duplicate information and moves around with firmware versions
+    # (may not be reliable and is found elsewhere)
     #0x2ea2 => {
     #    Name => 'Rotation',
-    #    Condition => '$$self{Model} =~ /\bD500\b/ and $$self{FirmwareVersion} =~ /^1.1/',
+    #    Condition => '$$self{Model} =~ /\bD500\b/',
     #    Notes => 'D500 firmware 1.1x',
     #    Mask => 0x30,
     #    PrintConv => {
@@ -6165,6 +6181,19 @@ my %nikonFocalConversions = (
     #        3 => 'Rotate 180',
     #    },
     #},
+    0x2ea4 => {
+        Name => 'NikonMeteringMode',
+        Condition => '$$self{Model} =~ /\bD500\b/', # (didn't seem to work for D5, but I need more samples)
+        Notes => 'D500 only',
+        Mask => 0x03,
+        PrintConv => {
+            0 => 'Matrix',
+            1 => 'Center',
+            2 => 'Spot',
+            3 => 'Highlight'
+        },
+    },
+    # note: DecryptLen currently set to OtherOffset + 0x2ea5 - 0x2c90
 );
 # shot information for the D610 firmware 1.00 (encrypted) - ref PH
 %Image::ExifTool::Nikon::ShotInfoD610 = (
@@ -6370,7 +6399,7 @@ my %nikonFocalConversions = (
         },
     },
     0x175e => {
-        Name => 'D810MeteringMode',
+        Name => 'NikonMeteringMode',
         Mask => 0x03,
         PrintConv => {
             0 => 'Matrix',

data/bin/lib/Image/ExifTool/PNG.pm

@@ -19,6 +19,14 @@
 #               decompress then decode the ASCII/hex profile information before
 #               you can edit it, then you have to ASCII/hex-encode, recompress
 #               and calculate a CRC before you can write it out again.  gaaaak.
+#
+#               Although XMP is allowed after the IDAT chunk according to the
+#               PNG specifiction, some apps (Apple Spotlight and Preview for
+#               OS X 10.8.5 and Adobe Photoshop CC 14.0) ignore it unless it
+#               comes before IDAT.  As of version 11.58, ExifTool uses a 2-pass
+#               writing algorithm to allow it to be compatible with XMP after
+#               IDAT while writing it before IDAT.  (PNG and EXIF are still
+#               written after IDAT.)
 #------------------------------------------------------------------------------
 
 package Image::ExifTool::PNG;
@@ -27,7 +35,7 @@ use strict;
 use vars qw($VERSION $AUTOLOAD %stdCase);
 use Image::ExifTool qw(:DataAccess :Utils);
 
-$VERSION = '1.47';
+$VERSION = '1.50';
 
 sub ProcessPNG_tEXt($$$);
 sub ProcessPNG_iTXt($$$);
@@ -502,9 +510,7 @@ my %unreg = ( Notes => 'unregistered' );
             XMP specification, and is where ExifTool will add a new XMP chunk if the
             image didn't already contain XMP
         },
-        SubDirectory => {
-            TagTable => 'Image::ExifTool::XMP::Main',
-        },
+        SubDirectory => { TagTable => 'Image::ExifTool::XMP::Main' },
     },
    'Raw profile type APP1' => [
         {
@@ -791,7 +797,7 @@ sub FoundPNG($$$$;$$$$)
         my $tagName = $$tagInfo{Name};
         my $processed;
         if ($$tagInfo{SubDirectory}) {
-            if ($$et{OPTIONS}{Validate} and $$tagInfo{NonStandard}) {
+            if ($$et{OPTIONS}{Validate} and $$tagInfo{NonStandard} and not $wasCompressed) {
                 $et->Warn("Non-standard $$tagInfo{NonStandard} in PNG $tag chunk", 1);
             }
             my $subdir = $$tagInfo{SubDirectory};
@@ -830,23 +836,11 @@ sub FoundPNG($$$$;$$$$)
                     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');
-                        }
+                        # 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
@@ -1148,6 +1142,7 @@ sub ProcessPNG_tEXt($$$)
     my ($et, $dirInfo, $tagTablePtr) = @_;
     my ($tag, $val) = split /\0/, ${$$dirInfo{DataPt}}, 2;
     my $outBuff = $$dirInfo{OutBuff};
+    $$et{INDENT} = substr($$et{INDENT}, 0, -2) if $$et{OPTIONS}{Verbose};
     return FoundPNG($et, $tagTablePtr, $tag, $val, undef, $outBuff, 'Latin');
 }
 
@@ -1166,6 +1161,7 @@ sub ProcessPNG_iTXt($$$)
     # set compressed flag so we will decompress it in FoundPNG()
     $compressed and $compressed = 2 + $meth;
     my $outBuff = $$dirInfo{OutBuff};
+    $$et{INDENT} = substr($$et{INDENT}, 0, -2) if $$et{OPTIONS}{Verbose};
     return FoundPNG($et, $tagTablePtr, $tag, $val, $compressed, $outBuff, 'UTF8', $lang);
 }
 
@@ -1234,14 +1230,14 @@ sub ProcessPNG($$)
     my $datChunk = '';
     my $datCount = 0;
     my $datBytes = 0;
-    my ($sig, $err);
+    my ($sig, $err, $xmp, $foundXMP, $foundIDAT, $editingXMP, $deletingXMP);
 
     # check to be sure this is a valid PNG/MNG/JNG image
     return 0 unless $raf->Read($sig,8) == 8 and $pngLookup{$sig};
 
-    $$raf{NoBuffer} = 1 if $et->Options('FastScan'); # disable buffering in FastScan mode
+    # disable buffering in FastScan mode
+    $$raf{NoBuffer} = 1 if $et->Options('FastScan') and not $outfile;
 
-    my $earlyXMP = $et->Options('PNGEarlyXMP');
     if ($outfile) {
         delete $$et{TextChunkType};
         Write($outfile, $sig) or $err = 1 if $outfile;
@@ -1251,16 +1247,13 @@ sub ProcessPNG($$)
             \%Image::ExifTool::PNG::TextualData);
         # NOTE: PNGDoneTag and PNGDoneDir are used to keep track of metadata added
         # before the PNG IEND chunk is encountered.  Currently this is implemented
-        # only for XMP (written before IDAT with the PNGEarlyXMP option), but
-        # may be implemented in the future for other types - PH
+        # only for XMP, but may be implemented in the future for other types - PH
         $$et{PNGDoneTag} = { };
         $$et{PNGDoneDir} = { };
         # initialize with same directories, with PNG tags taking priority
         $et->InitWriteDirs(\%pngMap,'PNG');
-        # write XMP before IDAT if we would delete it later anyway
-        $earlyXMP = 1 if $$et{DEL_GROUP}{XMP};
-    } elsif ($$et{OPTIONS}{Validate}) {
-        $earlyXMP = 1;  # warn about XMP after IDAT when validating
+        $editingXMP = $$et{EDIT_DIRS}{XMP};
+        $deletingXMP = $$et{DEL_GROUP}{XMP};
     }
     my ($fileType, $hdrChunk, $endChunk) = @{$pngLookup{$sig}};
     $et->SetFileType($fileType);  # set the FileType tag
@@ -1271,9 +1264,34 @@ sub ProcessPNG($$)
         $mngTablePtr = GetTagTable('Image::ExifTool::MNG::Main');
     }
     my $verbose = $et->Options('Verbose');
+    my $validate = $et->Options('Validate');
     my $out = $et->Options('TextOut');
     my ($hbuf, $dbuf, $cbuf, $wasHdr, $wasEnd);
 
+    # scan ahead for XMP if we are editing it
+    if ($outfile and $editingXMP and not $deletingXMP) {
+        while ($raf->Read($hbuf,8) == 8) {
+            my ($len, $chunk) = unpack('Na4',$hbuf);
+            last if $len > 0x7fffffff;
+            if ($chunk ne 'iTXt' or $len < 22) {
+                $raf->Seek($len + 4, 1) or last;
+                next;
+            }
+            $raf->Read($dbuf, 18) == 18 or last;
+            unless ($dbuf eq "XML:com.adobe.xmp\0") {   # is this XMP?
+                $raf->Seek($len - 18 + 4, 1) or last;
+                next;
+            };
+            $raf->Read($dbuf, $len - 18) == $len - 18 or last;
+            my ($compressed, $meth) = unpack('CC', $dbuf);
+            $compressed and $et->Error('XMP is compressed'), last;
+            my ($lang, $trans);
+            ($lang, $trans, $xmp) = split /\0/, substr($dbuf, 2), 3;
+            last;
+        }
+        $raf->Seek(8,0) or $et->Error('Error seeking in file'), return -1;
+    }
+
     # process the PNG/MNG/JNG chunks
     undef $noCompressLib;
     for (;;) {
@@ -1298,25 +1316,52 @@ sub ProcessPNG($$)
                 my $s = $datCount > 1 ? 's' : '';
                 print $out "$fileType $datChunk ($datCount chunk$s, total $datBytes bytes)\n";
                 $datCount = $datBytes = 0;
-                $datChunk = '';
             }
-            if ($chunk =~ /^(IDAT|JDAT|JDAA)$/) {
-                $datChunk = $chunk;
-                $datCount++;
-                $datBytes += $len;
+        }
+        unless ($wasHdr) {
+            if ($chunk eq $hdrChunk) {
+                $wasHdr = 1;
+            } elsif ($hdrChunk eq 'IHDR' and $chunk eq 'CgBI') {
+                $et->Warn('Non-standard PNG image (Apple iPhone format)');
+            } else {
+                $et->Warn("$fileType image did not start with $hdrChunk");
+                last;
             }
         }
+        if ($chunk =~ /^(IDAT|JDAT|JDAA)$/) {
+            $datChunk = $chunk;
+            $datCount++;
+            $datBytes += $len;
+        } else {
+            $datChunk = '';
+        }
         if ($outfile) {
+            # add XMP before any data chunk, or before IEND/MEND if no data
+            if ($datChunk or $chunk eq $endChunk) {
+                if ($xmp) {
+                    # rewrite existing XMP
+                    my $tbl = GetTagTable('Image::ExifTool::PNG::TextualData');
+                    my $buf;
+                    FoundPNG($et, $tbl, 'XML:com.adobe.xmp', $xmp, 0, \$buf, 'UTF8', '');
+                    my $outBuff = defined $buf ? \$buf : \$xmp;
+                    if (length $$outBuff) {
+                        my $hdr = pack('Na4', length($$outBuff), 'iTXt');
+                        my $crc = CalculateCRC(\$hdr, undef, 4);
+                        $crc = CalculateCRC($outBuff, $crc);
+                        Write($outfile, $hdr, $$outBuff, pack('N',$crc)) or $err = 1;
+                    }
+                    undef $xmp;     # done with this XMP
+                } elsif ($$et{ADD_DIRS}{XMP}) {
+                    # add new XMP if necessary
+                    AddChunks($et, $outfile, 'XMP') or $err = 1;
+                }
+            }
             if ($chunk eq $endChunk) {
-                # add any new chunks immediately before the IEND/MEND chunk
+                # add other new chunks immediately before the IEND/MEND chunk
                 AddChunks($et, $outfile) or $err = 1;
             } elsif ($chunk eq 'PLTE' or $chunk eq 'IDAT') {
-                if ($chunk eq 'IDAT') {
-                    # add XMP before IDAT if specified
-                    AddChunks($et, $outfile, 'XMP') or $err = 1 if $earlyXMP;
-                    # pHYs comes before IDAT
-                    AddChunks($et, $outfile, 'PNG-pHYs') or $err = 1;
-                }
+                # pHYs must come before IDAT
+                AddChunks($et, $outfile, 'PNG-pHYs') or $err = 1 if $chunk eq 'IDAT';
                 # iCCP chunk must come before PLTE and IDAT
                 # (ignore errors -- will add later as text profile if this fails)
                 Add_iCCP($et, $outfile);
@@ -1352,34 +1397,61 @@ sub ProcessPNG($$)
             }
             next;
         }
-        # set FoundIDAT flag: 1=after IDAT, 2=after IDAT and warn about late XMP
-        $$et{FoundIDAT} = $earlyXMP ? 2 : 1 if $chunk eq 'IDAT';
+        if ($datChunk) {
+            $foundIDAT = 1 if $chunk eq 'IDAT';     # set flag indicating IDAT was found
+            # skip over data chunks if possible
+            unless ($verbose or $validate or $outfile) {
+                $raf->Seek($len + 4, 1) or $et->Warn('Seek error'), last;
+                next;
+            }
+        }
         # read chunk data and CRC
         unless ($raf->Read($dbuf,$len)==$len and $raf->Read($cbuf, 4)==4) {
             $et->Warn("Corrupted $fileType image") unless $wasEnd;
             last;
         }
-        unless ($wasHdr) {
-            if ($chunk eq $hdrChunk) {
-                $wasHdr = 1;
-            } elsif ($hdrChunk eq 'IHDR' and $chunk eq 'CgBI') {
-                $et->Warn('Non-standard PNG image (Apple iPhone format)');
-            } else {
-                $et->Warn("$fileType image did not start with $hdrChunk");
-                last;
-            }
-        }
-        if ($verbose) {
+        if ($verbose or $validate or $outfile) {
             # check CRC when in verbose mode (since we don't care about speed)
             my $crc = CalculateCRC(\$hbuf, undef, 4);
             $crc = CalculateCRC(\$dbuf, $crc);
-            $crc == unpack('N',$cbuf) or $et->Warn("Bad CRC for $chunk chunk") unless $wasEnd;
+            unless ($crc == unpack('N',$cbuf)) {
+                my $msg = "Bad CRC for $chunk chunk";
+                $outfile ? $et->Error($msg, 1) : $et->Warn($msg);
+            }
             if ($datChunk) {
                 Write($outfile, $hbuf, $dbuf, $cbuf) or $err = 1 if $outfile;
                 next;
             }
-            print $out "$fileType $chunk ($len bytes):\n";
-            $et->VerboseDump(\$dbuf, Addr => $raf->Tell() - $len - 4) if $verbose > 2;
+            if ($verbose) {
+                print $out "$fileType $chunk ($len bytes):\n";
+                $et->VerboseDump(\$dbuf, Addr => $raf->Tell() - $len - 4) if $verbose > 2;
+            }
+        }
+        if ($chunk eq 'iTXt' and $dbuf =~ /^XML:com.adobe.xmp\0/) {
+            $foundXMP = ($foundXMP || 0) + 1;
+            if ($outfile and $editingXMP) {
+                # handle this standard XMP iTXt chunk
+                my $editNow;
+                if ($deletingXMP) {
+                    # just fall through
+                } elsif ($foundXMP > 1) {
+                    $et->Error('Multiple XMP chunks', 1) if $foundXMP == 2;
+                } elsif ($foundIDAT) {
+                    $et->WarnOnce('XMP found after PNG IDAT. Fixed.');
+                } elsif ($xmp) {
+                    # the XMP is already before IDAT, so edit it now
+                    $editNow = 1;
+                    undef $xmp;     # (don't write again later)
+                }
+                unless ($editNow) {
+                    ++$$et{CHANGED};
+                    print $out "  Deleting XMP\n" if $verbose;
+                    next;
+                }
+            } else {
+                $et->WarnOnce('XMP found after PNG IDAT') if $foundIDAT;
+                $et->Warn('Multiple XMP chunks') if $foundXMP == 2;
+            }
         }
         # translate case of chunk name if necessary
         if (not $$tagTablePtr{$chunk}) {

data/bin/lib/Image/ExifTool/QuickTime.pm

@@ -1337,8 +1337,8 @@ my %eeBox = (
         L<ItemList|Image::ExifTool::TagNames/QuickTime ItemList Tags> tags are
         preferred over these, so to create the tag when a same-named ItemList tag
         exists, either "UserData" must be specified (eg. C<-UserData:Artist=Monet>
-        on the command line), or the PREFERRED level must be changed via the config
-        file.
+        on the command line), or the PREFERRED level must be changed via
+        L<the config file|../config.html#PREF>.
     },
     "\xa9cpy" => { Name => 'Copyright',  Groups => { 2 => 'Author' } },
     "\xa9day" => {
@@ -5568,7 +5568,7 @@ my %eeBox = (
         preferred when writing, so to create a tag when a same-named tag exists in
         either of these tables, either the "Keys" location must be specified (eg.
         C<-Keys:Author=Phil> on the command line), or the PREFERRED level must be
-        changed via the config file.
+        changed via L<the config file|../config.html#PREF>.
     },
     version     => 'Version',
     album       => 'Album',