exiftool-vendored.pl 12.45.0 → 12.50.0

package/bin/lib/Image/ExifTool/Text.pm

@@ -14,9 +14,8 @@ package Image::ExifTool::Text;
 use strict;
 use vars qw($VERSION);
 use Image::ExifTool qw(:DataAccess :Utils);
-use Image::ExifTool::XMP;
 
-$VERSION = '1.03';
+$VERSION = '1.04';
 
 # Text tags
 %Image::ExifTool::Text::Main = (
@@ -97,7 +96,7 @@ sub ProcessTXT($$)
         $nl =~ tr/\0//d;    # remove nulls from newline sequence
         $isBOM = 1;         # (we don't recognize UTF-16/UTF-32 without one)
     } else {
-        $isUTF8 = Image::ExifTool::XMP::IsUTF8($dataPt, 1);
+        $isUTF8 = Image::ExifTool::IsUTF8($dataPt, 1);
         if ($isUTF8 == 0) {
             $enc = 'us-ascii';
         } elsif ($isUTF8 > 0) {
@@ -183,7 +182,7 @@ sub ProcessTXT($$)
         next if $raf->Tell() < 65536;
         # continue to check encoding after the first 64 kB
         if ($isUTF8 >= 0) { # (if ascii or utf8)
-            $isUTF8 = Image::ExifTool::XMP::IsUTF8(\$buff);
+            $isUTF8 = Image::ExifTool::IsUTF8(\$buff);
             if ($isUTF8 > 0) {
                 $enc = 'utf-8';
             } elsif ($isUTF8 < 0) {

package/bin/lib/Image/ExifTool/Torrent.pm

@@ -13,9 +13,8 @@ package Image::ExifTool::Torrent;
 use strict;
 use vars qw($VERSION);
 use Image::ExifTool qw(:DataAccess :Utils);
-use Image::ExifTool::XMP;
 
-$VERSION = '1.05';
+$VERSION = '1.06';
 
 sub ReadBencode($$$);
 sub ExtractTags($$$;$$@);
@@ -169,7 +168,7 @@ sub ReadBencode($$$)
             if (length($value) > 256) {
                 $val = \$value;
             } elsif ($value =~ /[^\t\x20-\x7e]/) {
-                if (Image::ExifTool::XMP::IsUTF8(\$value) >= 0) {
+                if (Image::ExifTool::IsUTF8(\$value) >= 0) {
                     $val = $et->Decode($value, 'UTF8');
                 } else {
                     $val = \$value;

package/bin/lib/Image/ExifTool/WriteCanonRaw.pl

@@ -271,6 +271,13 @@ sub WriteCanonRaw($$$)
     $raf->Seek($blockStart+$blockSize-4, 0) or return 0;
     $raf->Read($buff, 4) == 4 or return 0;
     my $dirOffset = Get32u(\$buff,0) + $blockStart;
+    # avoid infinite recursion
+    $$et{ProcessedCanonRaw} or $$et{ProcessedCanonRaw} = { };
+    if ($$et{ProcessedCanonRaw}{$dirOffset}) {
+        $et->Error("Double-referenced $$dirInfo{DirName} directory");
+        return 0;
+    }
+    $$et{ProcessedCanonRaw}{$dirOffset} = 1;
     $raf->Seek($dirOffset, 0) or return 0;
     $raf->Read($buff, 2) == 2 or return 0;
     my $entries = Get16u(\$buff,0);             # get number of entries in directory

package/bin/lib/Image/ExifTool/WriteExif.pl

@@ -725,7 +725,7 @@ Entry:  for (;;) {
                     $readFormat = $oldFormat = Get16u($dataPt, $entry+2);
                     $readCount = $oldCount = Get32u($dataPt, $entry+4);
                     undef $oldImageData;
-                    if ($oldFormat < 1 or $oldFormat > 13) {
+                    if ($oldFormat < 1 or $oldFormat > 13 and not ($oldFormat == 16 and $$et{Make} eq 'Apple' and $inMakerNotes)) {
                         my $msg = "Bad format ($oldFormat) for $name entry $index";
                         # patch to preserve invalid directory entries in SubIFD3 of
                         # various Kodak Z-series cameras (Z812, Z1085IS, Z1275)
@@ -2244,6 +2244,7 @@ NoOverwrite:            next if $isNew > 0;
                 }
             } else {
                 last unless @writeLater;
+                # finally, copy all deferred data
                 @offsetList = @writeLater;
             }
             my $offsetPair;
@@ -2337,6 +2338,23 @@ NoOverwrite:            next if $isNew > 0;
                         $size = length($buff);
                         Set32u($size, \$newData, $byteCountPos);
                     } elsif ($ifd < 0) {
+                        # hack for fixed-offset data (Panasonic GH6)
+                        if ($$offsetPair[0][6]) {
+                            if ($count > 1) {
+                                $et->Error("Can't handle fixed offsets with count > 1");
+                            } else {
+                                my $fixedOffset = Get32u(\$newData, $offsets);
+                                my $padToFixedOffset = $fixedOffset - ($newOffset + $dpos);
+                                if ($padToFixedOffset < 0) {
+                                    $et->Error('Metadata too large to fit before fixed-offset image data');
+                                } else {
+                                    # add necessary padding before raw data
+                                    push @imageData, [$offset+$dbase+$dpos, 0, $padToFixedOffset];
+                                    $newOffset += $padToFixedOffset;
+                                    $et->Warn("Adding $padToFixedOffset bytes of padding before fixed-offset image data", 1);
+                                }
+                            }
+                        }
                         # pad if necessary (but don't pad contiguous image blocks)
                         my $pad = 0;
                         ++$pad if ($blockSize + $size) & 0x01 and ($n+1 >= $count or

package/bin/lib/Image/ExifTool/WriteRIFF.pl

@@ -0,0 +1,359 @@
+#------------------------------------------------------------------------------
+# File:         WriteRIFF.pl
+#
+# Description:  Write RIFF-format files
+#
+# Revisions:    2020-09-26 - P. Harvey Created
+#
+# Notes:        Currently writes only WEBP files
+#
+# References:   https://developers.google.com/speed/webp/docs/riff_container
+#------------------------------------------------------------------------------
+
+package Image::ExifTool::RIFF;
+
+use strict;
+
+# map of where information is stored in WebP image
+my %webpMap = (
+   'XMP '        => 'RIFF', # (the RIFF chunk name is 'XMP ')
+    EXIF         => 'RIFF',
+    ICCP         => 'RIFF',
+    XMP          => 'XMP ',
+    IFD0         => 'EXIF',
+    IFD1         => 'IFD0',
+    ICC_Profile  => 'ICCP',
+    ExifIFD      => 'IFD0',
+    GPS          => 'IFD0',
+    SubIFD       => 'IFD0',
+    GlobParamIFD => 'IFD0',
+    PrintIM      => 'IFD0',
+    InteropIFD   => 'ExifIFD',
+    MakerNotes   => 'ExifIFD',
+);
+
+#------------------------------------------------------------------------------
+# Write RIFF file (currently WebP-type only)
+# Inputs: 0) ExifTool object ref, 1) dirInfo ref
+# Returns: 1 on success, 0 if this wasn't a valid RIFF file, or -1 if
+#          an output file was specified and a write error occurred
+sub WriteRIFF($$)
+{
+    my ($et, $dirInfo) = @_;
+    $et or return 1;    # allow dummy access to autoload this package
+    my $outfile = $$dirInfo{OutFile};
+    my $outsize = 0;
+    my $raf = $$dirInfo{RAF};
+    my ($buff, $err, $pass, %has, %dirDat, $imageWidth, $imageHeight);
+
+    # do this in 2 passes so we can set the size of the containing RIFF chunk
+    # without having to buffer the output (also to set the WebP_Flags)
+    for ($pass=0; ; ++$pass) {
+        my %doneDir;
+        # verify this is a valid RIFF file
+        return 0 unless $raf->Read($buff, 12) == 12;
+        return 0 unless $buff =~ /^(RIFF|RF64)....(.{4})/s;
+
+        unless ($1 eq 'RIFF' and $2 eq 'WEBP') {
+            my $type = $2;
+            $type =~ tr/-_a-zA-Z//dc;
+            $et->Error("Can't currently write $1 $type files");
+            return 1;
+        }
+        SetByteOrder('II');
+
+        # determine which directories we must write for this file type
+        $et->InitWriteDirs(\%webpMap);
+        my $addDirs = $$et{ADD_DIRS};
+        my $editDirs = $$et{EDIT_DIRS};
+        my ($createVP8X, $deleteVP8X);
+
+        # write header
+        if ($pass) {
+            my $needsVP8X = ($has{ANIM} or $has{'XMP '} or $has{EXIF} or
+                             $has{ALPH} or $has{ICCP});
+            if ($has{VP8X} and not $needsVP8X and $$et{CHANGED}) {
+                $deleteVP8X = 1;    # delete the VP8X chunk
+                $outsize -= 18;     # account for missing VP8X
+            } elsif ($needsVP8X and not $has{VP8X}) {
+                if (defined $imageWidth) {
+                    ++$$et{CHANGED};
+                    $createVP8X = 1;    # add VP8X chunk
+                    $outsize += 18;     # account for VP8X size
+                } else {
+                    $et->Warn('Error getting image size for required VP8X chunk');
+                }
+            }
+            # finally we can set the overall RIFF chunk size:
+            Set32u($outsize - 8, \$buff, 4);
+            Write($outfile, $buff) or $err = 1;
+            # create VP8X chunk if necessary
+            if ($createVP8X) {
+                $et->VPrint(0,"  Adding required VP8X chunk (Extended WEBP)\n");
+                my $flags = 0;
+                $flags |= 0x02 if $has{ANIM};
+                $flags |= 0x04 if $has{'XMP '};
+                $flags |= 0x08 if $has{EXIF};
+                $flags |= 0x10 if $has{ALPH};
+                $flags |= 0x20 if $has{ICCP};
+                Write($outfile, 'VP8X', pack('V3v', 10, $flags,
+                    ($imageWidth-1) | ((($imageHeight-1) & 0xff) << 24),
+                    ($imageHeight-1) >> 8));
+                # write ICCP after VP8X
+                Write($outfile, $dirDat{ICCP}) or $err = 1 if $dirDat{ICCP};
+            }
+        } else {
+            $outsize += length $buff;
+        }
+        my $pos = 12;
+#
+# Read chunks in RIFF image
+#
+        for (;;) {
+            my ($tag, $len);
+            my $num = $raf->Read($buff, 8);
+            if ($num < 8) {
+                $num and $et->Error('RIFF format error'), return 1;
+                # all done if we hit end of file unless we need to add EXIF or XMP
+                last unless $$addDirs{EXIF} or $$addDirs{'XMP '} or $$addDirs{ICCP};
+                # continue to add required EXIF or XMP chunks
+                $num = $len = 0;
+                $buff = $tag = '';
+            } else {
+                $pos += 8;
+                ($tag, $len) = unpack('a4V', $buff);
+                if ($len <= 0) {
+                    if ($len < 0) {
+                        $et->Error('Invalid chunk length');
+                        return 1;
+                    } elsif ($tag eq "\0\0\0\0") {
+                        # avoid reading through corrupted files filled with nulls because it takes forever
+                        $et->Error('Encountered empty null chunk. Processing aborted');
+                        return 1;
+                    } else { # (just in case a tag may have no data)
+                        if ($pass) {
+                            Write($outfile, $buff) or $err = 1;
+                        } else {
+                            $outsize += length $buff;
+                        }
+                        next;
+                    }
+                }
+            }
+            # RIFF chunks are padded to an even number of bytes
+            my $len2 = $len + ($len & 0x01);
+            # edit/add/delete necessary metadata chunks (EXIF must come before XMP)
+            if ($$editDirs{$tag} or $tag eq '' or ($tag eq 'XMP ' and $$addDirs{EXIF})) {
+                my $handledTag;
+                if ($len2) {
+                    $et->Warn("Duplicate '${tag}' chunk") if $doneDir{$tag} and not $pass;
+                    $doneDir{$tag} = 1;
+                    $raf->Read($buff, $len2) == $len2 or $et->Error("Truncated '${tag}' chunk"), last;
+                    $pos += $len2;  # update current position
+                } else {
+                    $buff = '';
+                }
+#
+# add/edit/delete EXIF/XMP/ICCP (note: EXIF must come before XMP, and ICCP is written elsewhere)
+#
+                my %dirName = ( EXIF => 'IFD0', 'XMP ' => 'XMP', ICCP => 'ICC_Profile' );
+                my %tblName = ( EXIF => 'Exif', 'XMP ' => 'XMP', ICCP => 'ICC_Profile' );
+                my $dir;
+                foreach $dir ('EXIF', 'XMP ', 'ICCP' ) {
+                    next unless $tag eq $dir or ($$addDirs{$dir} and
+                        ($tag eq '' or ($tag eq 'XMP ' and $dir eq 'EXIF')));
+                    delete $$addDirs{$dir}; # (don't try to add again)
+                    my $start;
+                    unless ($pass) {
+                        # write the EXIF and save the result for the next pass
+                        my $dataPt = \$buff;
+                        if ($tag eq 'EXIF') {
+                            # (only need to set directory $start for EXIF)
+                            if ($buff =~ /^Exif\0\0/) {
+                                $et->Warn('Improper EXIF header') unless $pass;
+                                $start = 6;
+                            } else {
+                                $start = 0;
+                            }
+                        } elsif ($dir ne $tag) {
+                            # create from scratch
+                            my $buf2 = '';
+                            $dataPt = \$buf2;
+                        }
+                        # write the new directory to memory
+                        my %dirInfo = (
+                            DataPt   => $dataPt,
+                            DataPos  => 0,      # (relative to Base)
+                            DirStart => $start,
+                            Base     => $pos - $len2,
+                            Parent   => $dir,
+                            DirName  => $dirName{$dir},
+                        );
+                        my $tagTablePtr = GetTagTable("Image::ExifTool::$tblName{$dir}::Main");
+                        # (override writeProc for EXIF because it has the TIFF header)
+                        my $writeProc = $dir eq 'EXIF' ? \&Image::ExifTool::WriteTIFF : undef;
+                        $dirDat{$dir} = $et->WriteDirectory(\%dirInfo, $tagTablePtr, $writeProc);
+                    }
+                    if (defined $dirDat{$dir}) {
+                        if ($dir eq $tag) {
+                            $handledTag = 1;    # set flag indicating we edited this tag
+                            # increment CHANGED count if we are deleting the directory
+                            ++$$et{CHANGED} unless length $dirDat{$dir};
+                        }
+                        if (length $dirDat{$dir}) {
+                            if ($pass) {
+                                # write metadata chunk now (but not ICCP because it was added earlier)
+                                Write($outfile, $dirDat{$dir}) or $err = 1 unless $dir eq 'ICCP';
+                            } else {
+                                # preserve (incorrect EXIF) header if it existed
+                                my $hdr = $start ? substr($buff,0,$start) : '';
+                                # (don't overwrite $len here because it may be XMP length)
+                                my $dirLen = length($dirDat{$dir}) + length($hdr);
+                                # add chunk header and padding
+                                my $pad = $dirLen & 0x01 ? "\0" : '';
+                                $dirDat{$dir} = $dir . Set32u($dirLen) . $hdr . $dirDat{$dir} . $pad;
+                                $outsize += length($dirDat{$dir});
+                                $has{$dir} = 1;
+                            }
+                        }
+                    }
+                }
+#
+# just copy XMP, EXIF or ICC if nothing changed
+#
+                if (not $handledTag and length $buff) {
+                    # write the chunk without changes
+                    if ($pass) {
+                        Write($outfile, $tag, Set32u($len), $buff) or $err = 1;
+                    } else {
+                        $outsize += 8 + length($buff);
+                        $has{$tag} = 1;
+                    }
+                }
+                next;
+            }
+            $pos += $len2;  # set read position at end of chunk data
+#
+# update necessary flags in VP8X chunk
+#
+            if ($tag eq 'VP8X') {
+                my $buf2;
+                if ($len2 < 10 or $raf->Read($buf2, $len2) != $len2) {
+                    $et->Error('Truncated VP8X chunk');
+                    return 1;
+                }
+                if ($pass) {
+                    if ($deleteVP8X) {
+                        $et->VPrint(0,"  Deleting unnecessary VP8X chunk (Standard WEBP)\n");
+                        next;
+                    }
+                    # ...but first set the VP8X flags
+                    my $flags = Get32u(\$buf2, 0);
+                    $flags &= ~0x2c; # (reset flags for everything we can write)
+                    $flags |= 0x04 if $has{'XMP '};
+                    $flags |= 0x08 if $has{EXIF};
+                    $flags |= 0x20 if $has{ICCP};
+                    Set32u($flags, \$buf2, 0);
+                    Write($outfile, $buff, $buf2) or $err = 1;
+                } else {
+                    # get the image size
+                    $imageWidth  = (Get32u(\$buf2, 4) & 0xffffff) + 1;
+                    $imageHeight = (Get32u(\$buf2, 6) >> 8) + 1;
+                    $outsize += 8 + $len2;
+                    $has{$tag} = 1;
+                }
+                # write ICCP after VP8X
+                Write($outfile, $dirDat{ICCP}) or $err = 1 if $dirDat{ICCP};
+                next;
+            }
+#
+# just copy all other chunks
+#
+            if ($pass) {
+                # write chunk header (still in $buff)
+                Write($outfile, $buff) or $err = 1;
+            } else {
+                $outsize += length $buff;
+                $has{$tag} = 1;
+            }
+            unless ($pass or defined $imageWidth) {
+                # get WebP image size from VP8 or VP8L header
+                if ($tag eq 'VP8 ' and $len2 >= 16) {
+                    $raf->Read($buff, 16) == 16 or $et->Error('Truncated VP8 chunk'), return 1;
+                    $outsize += 16;
+                    if ($buff =~ /^...\x9d\x01\x2a/s) {
+                        $imageWidth  = Get16u(\$buff, 6) & 0x3fff;
+                        $imageHeight = Get16u(\$buff, 8) & 0x3fff;
+                    }
+                    $len2 -= 16;
+                } elsif ($tag eq 'VP8L' and $len2 >= 6) {
+                    $raf->Read($buff, 6) == 6 or $et->Error('Truncated VP8L chunk'), return 1;
+                    $outsize += 6;
+                    if ($buff =~ /^\x2f/s) {
+                        $imageWidth  =  (Get16u(\$buff, 1) & 0x3fff) + 1;
+                        $imageHeight = ((Get32u(\$buff, 2) >> 6) & 0x3fff) + 1;
+                    }
+                    $len2 -= 6;
+                }
+            }
+            if ($pass) {
+                # copy the chunk data in 64k blocks
+                while ($len2) {
+                    my $num = $len2;
+                    $num = 65536 if $num > 65536;
+                    $raf->Read($buff, $num) == $num or $et->Error('Truncated RIFF chunk'), last;
+                    Write($outfile, $buff) or $err = 1, last;
+                    $len2 -= $num;
+                }
+            } else {
+                $raf->Seek($len2, 1) or $et->Error('Seek error'), last;
+                $outsize += $len2;
+            }
+        }
+        last if $pass;
+        $raf->Seek(0,0) or $et->Error('Seek error'), last;
+    }
+    return $err ? -1 : 1;
+}
+
+1; # end
+
+__END__
+
+=head1 NAME
+
+Image::ExifTool::WriteRIFF.pl - Write RIFF-format files
+
+=head1 SYNOPSIS
+
+This file is autoloaded by Image::ExifTool::RIFF.
+
+=head1 DESCRIPTION
+
+This file contains routines to write metadata to RIFF-format files.
+
+=head1 NOTES
+
+Currently writes only WebP files.
+
+=head1 AUTHOR
+
+Copyright 2003-2022, Phil Harvey (philharvey66 at gmail.com)
+
+This library is free software; you can redistribute it and/or modify it
+under the same terms as Perl itself.
+
+=head1 REFERENCES
+
+=over 4
+
+=item L<https://developers.google.com/speed/webp/docs/riff_container>
+
+=back
+
+=head1 SEE ALSO
+
+L<Image::ExifTool::Photoshop(3pm)|Image::ExifTool::RIFF>,
+L<Image::ExifTool(3pm)|Image::ExifTool>
+
+=cut

package/bin/lib/Image/ExifTool/Writer.pl

@@ -115,7 +115,9 @@ my %writableType = (
     PS  => [ 'PostScript',  'WritePS'  ],
     PSD =>   'Photoshop',
     RAF => [ 'FujiFilm',    'WriteRAF' ],
+    RIFF=> [ 'RIFF',        'WriteRIFF'],
     VRD =>   'CanonVRD',
+    WEBP=> [ 'RIFF',        'WriteRIFF'],
     X3F =>   'SigmaRaw',
     XMP => [ undef,         'WriteXMP' ],
 );
@@ -240,7 +242,7 @@ my %intRange = (
     'int64s' => [-9223372036854775808, 9223372036854775807],
 );
 # lookup for file types with block-writable EXIF
-my %blockExifTypes = map { $_ => 1 } qw(JPEG PNG JP2 MIE EXIF FLIF MOV MP4);
+my %blockExifTypes = map { $_ => 1 } qw(JPEG PNG JP2 MIE EXIF FLIF MOV MP4 RIFF);
 
 my $maxSegmentLen = 0xfffd;     # maximum length of data in a JPEG segment
 my $maxXMPLen = $maxSegmentLen; # maximum length of XMP data in JPEG
@@ -4244,7 +4246,9 @@ sub WriteDirectory($$$;$)
     SetByteOrder($saveOrder);
     if ($out) {
         print $out "  Deleting $name\n" if defined $newData and not length $newData;
-        print $out "$$self{INDENT}  [nothing changed in $dirName]\n" if $$self{CHANGED} == $oldChanged;
+        if ($$self{CHANGED} == $oldChanged and $$self{OPTIONS}{Verbose} > 2) {
+            print $out "$$self{INDENT}  [nothing changed in $dirName]\n";
+        }
     }
     return $newData;
 }