exiftool_vendored 10.49.0 → 10.56.0

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

@@ -53,7 +53,7 @@ use vars qw($VERSION $AUTOLOAD @formatSize @formatName %formatNumber %intFormat
 use Image::ExifTool qw(:DataAccess :Utils);
 use Image::ExifTool::MakerNotes;
 
-$VERSION = '3.91';
+$VERSION = '3.92';
 
 sub ProcessExif($$$);
 sub WriteExif($$$);
@@ -1309,8 +1309,9 @@ my %sampleFormat = (
     0x22f => 'StripRowCounts',
     0x2bc => {
         Name => 'ApplicationNotes', # (writable directory!)
-        Writable => 'int8u',
         Format => 'undef',
+        Writable => 'int8u',
+        WriteGroup => 'IFD0', # (only for Validate)
         Flags => [ 'Binary', 'Protected' ],
         # this could be an XMP block
         SubDirectory => {
@@ -1382,7 +1383,7 @@ my %sampleFormat = (
     # 0x7020 - int32u[1] (in SubIFD of Sony ARW images) - values: 0,3
     # 0x7031 - int16u[1] (in SubIFD of Sony ARW images) - values: 256,257
     0x7032 => {
-        Name => 'LightFalloffParams', #forum7640
+        Name => 'VignettingCorrParams', #forum7640
         Notes => 'found in Sony ARW images',
         Protected => 1,
         Writable => 'int16s',
@@ -1659,6 +1660,7 @@ my %sampleFormat = (
     },
     0x8773 => {
         Name => 'ICC_Profile',
+        WriteGroup => 'IFD0', # (only for Validate)
         SubDirectory => {
             TagTable => 'Image::ExifTool::ICC_Profile::Main',
         },
@@ -5279,7 +5281,9 @@ sub ProcessExif($$$)
             }
         }
     }
-    $verbose = -1 if $htmlDump; # mix htmlDump into verbose so we can test for both at once
+    # mix htmlDump and Validate into verbose so we can test for all at once
+    $verbose = -1 if $htmlDump;
+    $verbose = -2 if $validate and not $verbose;
     $dirName eq 'EXIF' and $dirName = $$dirInfo{DirName} = 'IFD0';
     $$dirInfo{Multi} = 1 if $dirName =~ /^(IFD0|SubIFD)$/ and not defined $$dirInfo{Multi};
     # get a more descriptive name for MakerNote sub-directories
@@ -5293,10 +5297,10 @@ sub ProcessExif($$$)
         $dirSize = 2 + 12 * $numEntries;
         $dirEnd = $dirStart + $dirSize;
         if ($dirSize > $dirLen) {
-            if ($verbose > 0 and not $$dirInfo{SubIFD}) {
+            if (($verbose > 0 or $validate) and not $$dirInfo{SubIFD}) {
                 my $short = $dirSize - $dirLen;
                 $$et{INDENT} =~ s/..$//; # keep indent the same
-                $et->Warn("Short directory size (missing $short bytes)");
+                $et->Warn("Short directory size for $name (missing $short bytes)");
                 $$et{INDENT} .= '| ';
             }
             undef $dirSize if $dirEnd > $dataLen; # read from file if necessary
@@ -5759,19 +5763,21 @@ sub ProcessExif($$$)
                     $et->Warn(sprintf('Tag ID 0x%.4x out of sequence in %s', $tagID, $dirName));
                 }
                 $lastID = $tagID;
-                my $fstr = $formatName[$format];
-                $fstr = "$origFormStr read as $fstr" if $origFormStr;
-                $et->VerboseInfo($tagID, $tagInfo,
-                    Table   => $tagTablePtr,
-                    Index   => $index,
-                    Value   => $tval,
-                    DataPt  => $valueDataPt,
-                    DataPos => $valueDataPos + $base,
-                    Size    => $size,
-                    Start   => $valuePtr,
-                    Format  => $fstr,
-                    Count   => $count,
-                );
+                if ($verbose > 0) {
+                    my $fstr = $formatName[$format];
+                    $fstr = "$origFormStr read as $fstr" if $origFormStr;
+                    $et->VerboseInfo($tagID, $tagInfo,
+                        Table   => $tagTablePtr,
+                        Index   => $index,
+                        Value   => $tval,
+                        DataPt  => $valueDataPt,
+                        DataPos => $valueDataPos + $base,
+                        Size    => $size,
+                        Start   => $valuePtr,
+                        Format  => $fstr,
+                        Count   => $count,
+                    );
+                }
             }
             next if not $tagInfo or $wrongFormat;
         }

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

@@ -28,7 +28,7 @@ use vars qw($VERSION);
 use Image::ExifTool qw(:DataAccess :Utils);
 use Image::ExifTool::Exif;
 
-$VERSION = '1.56';
+$VERSION = '1.58';
 
 sub ProcessFujiDir($$$);
 sub ProcessFaceRec($$$);
@@ -102,14 +102,15 @@ my %faceCategories = (
         Flags => 'PrintHex',
         Writable => 'int16u',
         PrintConv => {
-            0x00 => 'Very Soft', #10 (-4)
-            0x01 => 'Soft',
-            0x02 => 'Soft2',
-            0x03 => 'Normal',
-            0x04 => 'Hard',
-            0x05 => 'Hard2',
-            0x82 => 'Medium Soft', #2
-            0x84 => 'Medium Hard', #2
+            0x00 => '-4 (softest)', #10
+            0x01 => '-3 (very soft)',
+            0x02 => '-2 (soft)',
+            0x03 => '0 (normal)',
+            0x04 => '+2 (hard)',
+            0x05 => '+3 (very hard)',
+            0x06 => '+4 (hardest)',
+            0x82 => '-1 (medium soft)', #2
+            0x84 => '+1 (medium hard)', #2
             0x8000 => 'Film Simulation', #2
             0xffff => 'n/a', #2
         },
@@ -144,17 +145,21 @@ my %faceCategories = (
         Flags => 'PrintHex',
         Writable => 'int16u',
         PrintConv => {
-            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)
+            0x0   => '0 (normal)', # # ("Color 0", ref 8)
+            0x080 => '+1 (medium high)', #2 ("Color +1", ref 8)
+            0x100 => '+2 (high)', # ("Color +2", ref 8)
+            0x0c0 => '+3 (very high)',
+            0x0e0 => '+4 (highest)',
+            0x180 => '-1 (medium low)', #2 ("Color -1", ref 8)
             0x200 => 'Low',
             0x300 => 'None (B&W)', #2
             0x301 => 'B&W Red Filter', #PH/8
             0x302 => 'B&W Yellow Filter', #PH (X100)
             0x303 => 'B&W Green Filter', #PH/8
             0x310 => 'B&W Sepia', #PH (X100)
-            0x400 => 'Low 2', #8 ("Color -2")
+            0x400 => '-2 (low)', #8 ("Color -2")
+            0x4c0 => '-3 (very low)',
+            0x4e0 => '-4 (lowest)',
             0x500 => 'Acros', #PH (X-Pro2)
             0x501 => 'Acros Red Filter', #PH (X-Pro2)
             0x502 => 'Acros Yellow Filter', #PH (X-Pro2)
@@ -211,13 +216,15 @@ my %faceCategories = (
         Flags => 'PrintHex',
         Writable => 'int16u',
         PrintConv => {
-            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")
-            0x2c0 => 'Very Weak', #10 (-3)
-            0x2e0 => 'Weakest', #10 (-4)
+            0x000 => '0 (normal)', # ("NR 0, ref 8)
+            0x100 => '+2 (strong)', # ("NR+2, ref 8)
+            0x180 => '+1 (medium strong)', #8 ("NR+1")
+            0x1c0 => '+3 (very strong)',
+            0x1e0 => '+4 (strongest)',
+            0x200 => '-2 (weak)', # ("NR-2, ref 8)
+            0x280 => '-1 (medium weak)', #8 ("NR-1")
+            0x2c0 => '-3 (very weak)', #10 (-3)
+            0x2e0 => '-4 (weakest)', #10 (-4)
         },
     },
     0x1010 => {
@@ -350,22 +357,26 @@ my %faceCategories = (
         Name => 'ShadowTone',
         Writable => 'int32s',
         PrintConv => {
-            -32 => 'Hard',
-            -16 => 'Medium-hard',
-            0 => 'Normal',
-            16 => 'Medium-soft',
-            32 => 'Soft',
+            -64 => '+4 (hardest)',
+            -48 => '+3 (very hard)',
+            -32 => '+2 (hard)',
+            -16 => '+1 (medium hard)',
+            0 => '0 (normal)',
+            16 => '-1 (medium soft)',
+            32 => '-2 (soft)',
         },
     },
     0x1041 => { #8
         Name => 'HighlightTone',
         Writable => 'int32s',
         PrintConv => {
-            -32 => 'Hard',
-            -16 => 'Medium-hard',
-            0 => 'Normal',
-            16 => 'Medium-soft',
-            32 => 'Soft',
+            -64 => '+4 (hardest)',
+            -48 => '+3 (very hard)',
+            -32 => '+2 (hard)',
+            -16 => '+1 (medium hard)',
+            0 => '0 (normal)',
+            16 => '-1 (medium soft)',
+            32 => '-2 (soft)',
         },
     },
     0x1044 => { #forum7668

data/bin/{Image-ExifTool-10.49/lib → lib}/Image/ExifTool/GIF.pm

@@ -11,6 +11,7 @@
 #               2) http://www.adobe.com/devnet/xmp/
 #               3) http://graphcomp.com/info/specs/ani_gif.html
 #               4) http://www.color.org/icc_specs2.html
+#               5) http://www.midiox.com/mmgif.htm
 #------------------------------------------------------------------------------
 
 package Image::ExifTool::GIF;
@@ -19,7 +20,7 @@ use strict;
 use vars qw($VERSION);
 use Image::ExifTool qw(:DataAccess :Utils);
 
-$VERSION = '1.12';
+$VERSION = '1.13';
 
 # road map of directory locations in GIF images
 my %gifMap = (
@@ -50,16 +51,39 @@ my %gifMap = (
     ScreenDescriptor => {
         SubDirectory => { TagTable => 'Image::ExifTool::GIF::Screen' },
     },
-    # GIF89a application extensions:
-    ExtensionAnimation => {
-        SubDirectory => { TagTable => 'Image::ExifTool::GIF::Animate' },
+    Extensions => { # (for documentation only)
+        SubDirectory => { TagTable => 'Image::ExifTool::GIF::Extensions' },
     },
-    ExtensionXMP => { # (for documentation only)
+);
+
+# GIF89a application extensions:
+%Image::ExifTool::GIF::Extensions = (
+    GROUPS => { 2 => 'Image' },
+    NOTES => 'Tags extracted from GIF89a application extensions.',
+    'NETSCAPE/2.0' => { #3
+        Name => 'Animation',
+        SubDirectory => { TagTable => 'Image::ExifTool::GIF::Animation' },
+    },
+    'XMP Data/XMP' => { #2
+        Name => 'XMP',
+        IncludeLengthBytes => 1, # length bytes are included in the data
+        Writable => 1,
         SubDirectory => { TagTable => 'Image::ExifTool::XMP::Main' },
     },
-    ExtensionICC => { # (for documentation only)
+    'ICCRGBG1/012' => { #4
+        Name => 'ICC_Profile',
+        Writable => 1,
         SubDirectory => { TagTable => 'Image::ExifTool::ICC_Profile::Main' },
     },
+    'MIDICTRL/Jon' => { #5
+        Name => 'MIDIControl',
+        SubDirectory => { TagTable => 'Image::ExifTool::GIF::MIDIControl' },
+    },
+    'MIDISONG/Dm7' => { #5
+        Name => 'MIDISong',
+        Groups => { 2 => 'Audio' },
+        Binary => 1,
+    },
 );
 
 # GIF locical screen descriptor
@@ -93,18 +117,40 @@ my %gifMap = (
     5 => 'BackgroundColor',
 );
 
-# GIF Netscape 2.0 animation extension
-%Image::ExifTool::GIF::Animate = (
+# GIF Netscape 2.0 animation extension (ref 3)
+%Image::ExifTool::GIF::Animation = (
     PROCESS_PROC => \&Image::ExifTool::ProcessBinaryData,
     GROUPS => { 2 => 'Image' },
     NOTES => 'Information extracted from the "NETSCAPE2.0" animation extension.',
-    2 => {
+    1 => {
         Name => 'AnimationIterations',
         Format => 'int16u',
         PrintConv => '$val ? $val : "Infinite"',
     },
 );
 
+# GIF MIDICTRL extension (ref 5)
+%Image::ExifTool::GIF::MIDIControl = (
+    PROCESS_PROC => \&Image::ExifTool::ProcessBinaryData,
+    GROUPS => { 2 => 'Audio' },
+    NOTES => 'Information extracted from the MIDI control block extension.',
+    0 => 'MIDIControlVersion',
+    1 => 'SequenceNumber',
+    2 => 'MelodicPolyphony',
+    3 => 'PercussivePolyphony',
+    4 => {
+        Name => 'ChannelUsage',
+        Format => 'int16u',
+        PrintConv => 'sprintf("0x%.4x", $val)',
+    },
+    6 => {
+        Name => 'DelayTime',
+        Format => 'int16u',
+        ValueConv => '$val / 100',
+        PrintConv => '$val . " s"',
+    },
+);
+
 #------------------------------------------------------------------------------
 # Process meta information in GIF image
 # Inputs: 0) ExifTool object reference, 1) Directory information ref
@@ -180,7 +226,7 @@ Block:
                 Write($outfile, "\0") or $err = 1;  # empty chunk as terminator
                 undef $newComment;
                 undef $nvComment;   # delete any other extraneous comments
-                ++$$et{CHANGED};     # increment file changed flag
+                ++$$et{CHANGED};    # increment file changed flag
             }
             # add application extension containing XMP block if necessary
             # (this will place XMP before the first non-extension block)
@@ -333,119 +379,91 @@ Block:
         } elsif ($a == 0xff and $length == 0x0b) {  # application extension
 
             last unless $raf->Read($buff, $length) == $length;
-            if ($verbose) {
-                my @a = unpack('a8a3', $buff);
-                s/\0.*//s foreach @a;
-                print $out "Application Extension: @a\n";
+            my $hdr = "$ch$s$buff";
+            # add "/" for readability
+            my $tag = substr($buff, 0, 8) . '/' . substr($buff, 8);
+            $tag =~ tr/\0-\x1f//d;   # remove nulls and control characters
+            $verbose and print $out "Application Extension: $tag\n";
+
+            my $extTable = GetTagTable('Image::ExifTool::GIF::Extensions');
+            my $extInfo = $$extTable{$tag};
+            my ($subdir, $inclLen, $justCopy);
+            if ($extInfo) {
+                $subdir = $$extInfo{SubDirectory};
+                $inclLen = $$extInfo{IncludeLengthBytes};
+                # rewrite as-is unless this is a writable subdirectory
+                $justCopy = 1 if $outfile and (not $subdir or not $$extInfo{Writable});
+            } else {
+                $justCopy = 1 if $outfile;
             }
-            if ($buff eq 'XMP DataXMP') {   # XMP data (ref 2)
-
-                my $hdr = "$ch$s$buff";
-                # read XMP data
-                my $xmp = '';
-                for (;;) {
-                    $raf->Read($ch, 1) or last Block;   # read next block header
-                    $length = ord($ch) or last;         # get next block size
-                    $raf->Read($buff, $length) == $length or last Block;
-                    $xmp .= $ch . $buff;
-                }
-                # get length of XMP without landing zone data
-                # (note that LZ data may not be exactly the same as what we use)
-                my $xmpLen;
-                if ($xmp =~ /<\?xpacket end=['"][wr]['"]\?>/g) {
-                    $xmpLen = pos($xmp);
-                } else {
-                    $xmpLen = length($xmp);
-                }
-                my %dirInfo = (
-                    DataPt  => \$xmp,
-                    DataLen => length $xmp,
-                    DirLen  => $xmpLen,
-                    Parent  => 'GIF',
-                );
-                my $xmpTable = GetTagTable('Image::ExifTool::XMP::Main');
-                if ($outfile) {
-                    if ($doneDir{XMP} and $doneDir{XMP} > 1) {
-                        $et->Warn('Duplicate XMP block created');
-                    }
-                    $buff = $et->WriteDirectory(\%dirInfo, $xmpTable);
-                    if (not defined $buff) {
-                        # rewrite original XMP with landing zone (adding back null terminator)
-                        Write($outfile, $hdr, $xmp, "\0") or $err = 1;
-                        $doneDir{XMP} = 1;
-                    } elsif (length $buff) {
-                        if ($buff =~ /\0/) { # (check just to be safe)
-                            $et->Error('XMP contained NULL character');
-                        } else {
-                            # write new XMP and landing zone
-                            my $lz = pack('C*',1,reverse(0..255),0);
-                            Write($outfile, $hdr, $buff, $lz) or $err = 1;
-                        }
-                        $doneDir{XMP} = 1;
-                    } # else we are deleting the XMP
-                } else {
-                    $et->ProcessDirectory(\%dirInfo, $xmpTable);
-                }
-                next;
-
-            } elsif ($buff eq 'ICCRGBG1012') {      # ICC_Profile extension (ref 4)
-
-                my $hdr = "$ch$s$buff";
-                # read ICC profile data
-                my $icc_profile = '';
-                for (;;) {
-                    $raf->Read($ch, 1) or last Block;   # read next block header
-                    $length = ord($ch) or last;         # get next block size
-                    $raf->Read($buff, $length) == $length or last Block;
-                    $icc_profile .= $buff;
+            Write($outfile, $hdr) or $err = 1 if $justCopy;
+
+            # read the extension data
+            my $dat = '';
+            for (;;) {
+                $raf->Read($ch, 1) or last Block;   # read next block header
+                $length = ord($ch) or last;         # get next block size
+                $raf->Read($buff, $length) == $length or last Block;
+                Write($outfile, $ch, $buff) or $err = 1 if $justCopy;
+                $dat .= $inclLen ? $ch . $buff : $buff;
+            }
+            Write($outfile, "\0") if $justCopy;
+
+            if ($subdir) {
+                my $dirLen = length $dat;
+                my $name = $$extInfo{Name};
+                if ($name eq 'XMP') {
+                    # get length of XMP without landing zone data
+                    # (note that LZ data may not be exactly the same as what we use)
+                    $dirLen = pos($dat) if $dat =~ /<\?xpacket end=['"][wr]['"]\?>/g;
                 }
                 my %dirInfo = (
-                    DataPt  => \$icc_profile,
-                    DataLen => length $icc_profile,
-                    DirLen  => length $icc_profile,
+                    DataPt  => \$dat,
+                    DataLen => length $dat,
+                    DirLen  => $dirLen,
+                    DirName => $name,
                     Parent  => 'GIF',
                 );
-                my $iccTable = GetTagTable('Image::ExifTool::ICC_Profile::Main');
-                if ($outfile) {
-                    if ($doneDir{ICC_Profile} and $doneDir{ICC_Profile} > 1) {
-                        $et->Warn('Duplicate ICC_Profile block created');
+                my $subTable = GetTagTable($$subdir{TagTable});
+                if (not $outfile) {
+                    $et->ProcessDirectory(\%dirInfo, $subTable);
+                } elsif ($$extInfo{Writable}) {
+                    if ($doneDir{$name} and $doneDir{$name} > 1) {
+                        $et->Warn("Duplicate $name block created");
                     }
-                    $buff = $et->WriteDirectory(\%dirInfo, $iccTable);
-                    # rewrite original ICC_Profile if nothing changed
-                    $buff = $icc_profile unless defined $buff;
-                    if (length $buff) {
-                        # write ICC profile sub-blocks
-                        my $pos = 0;
+                    $buff = $et->WriteDirectory(\%dirInfo, $subTable);
+                    if (defined $buff) {
+                        next unless length $buff;   # delete this extension if length is zero
+                        # check for null just to be safe
+                        $et->Error("$name contained NULL character") if $buff =~ /\0/;
+                        $dat = $buff;
+                        # add landing zone (without terminator, which will be added later)
+                        $dat .= pack('C*',1,reverse(0..255)) if $$extInfo{IncludeLengthBytes};
+                    } # (else rewrite original data)
+
+                    $doneDir{$name} = 1;
+
+                    if ($$extInfo{IncludeLengthBytes}) {
+                        # write data and landing zone
+                        Write($outfile, $hdr, $dat) or $err = 1;
+                    } else {
+                        # write as sub-blocks
                         Write($outfile, $hdr) or $err = 1;
-                        my $len = length $buff;
+                        my $pos = 0;
+                        my $len = length $dat;
                         while ($pos < $len) {
                             my $n = $len - $pos;
                             $n = 255 if $n > 255;
-                            Write($outfile, chr($n), substr($buff, $pos, $n)) or $err = 1;
+                            Write($outfile, chr($n), substr($dat, $pos, $n)) or $err = 1;
                             $pos += $n;
                         }
-                        Write($outfile, "\0") or $err = 1;  # write null terminator
-                        $doneDir{ICC_Profile} = 1;
-                    } # else we are deleting the ICC profile
-                } else {
-                    $et->ProcessDirectory(\%dirInfo, $iccTable);
-                }
-                next;
-
-            } elsif ($buff eq 'NETSCAPE2.0') {      # animated GIF extension (ref 3)
-
-                $raf->Read($buff, 5) == 5 or last;
-                # make sure this contains the expected data
-                if ($buff =~ /^\x03\x01(..)\0$/s) {
-                    $et->HandleTag($tagTablePtr, 'ExtensionAnimation', $buff);
+                    }
+                    Write($outfile, "\0") or $err = 1;  # write null terminator
                 }
-                $raf->Seek(-$length-5, 1) or last;  # seek back to start of block
-
-            } else {
-
-                # rewind to start of application extension to copy the unknown block
-                $raf->Seek(-$length, 1) or last;
+            } elsif (not $outfile) {
+                $et->HandleTag($tagTablePtr, $tag, $dat);
             }
+            next;
 
         } elsif ($a == 0xf9 and $length == 4) {     # graphic control extension
 
@@ -533,6 +551,8 @@ under the same terms as Perl itself.
 
 =item L<http://www.color.org/icc_specs2.html>
 
+=item L<http://www.midiox.com/mmgif.htm>
+
 =back
 
 =head1 SEE ALSO