exiftool-vendored.exe 13.16.0 → 13.25.0

package/bin/exiftool_files/lib/Image/ExifTool/Trailer.pm

@@ -0,0 +1,318 @@
+#------------------------------------------------------------------------------
+# File:         Trailer.pm
+#
+# Description:  Read JPEG trailer written by various makes of phone
+#
+# Revisions:    2025-01-27 - P. Harvey Created
+#------------------------------------------------------------------------------
+
+package Image::ExifTool::Trailer;
+
+use strict;
+use vars qw($VERSION);
+use Image::ExifTool qw(:DataAccess :Utils);
+
+$VERSION = '1.01';
+
+%Image::ExifTool::Trailer::Vivo = (
+    GROUPS => { 0 => 'Trailer', 1 => 'Vivo', 2 => 'Image' },
+    VARS => { NO_ID => 1 },
+    NOTES => 'Information written in JPEG trailer by some Vivo phones.',
+    # (don't know for sure what type of image this is, but it is in JPEG format)
+    HDRImage => {
+        Notes => 'highlights of HDR image',
+        Groups => { 2 => 'Preview' },
+        Binary => 1,
+    },
+    JSONInfo => { },
+    HiddenData => {
+        Notes => 'hidden in EXIF, not in trailer.  This data is lost if the file is edited',
+        Groups => { 0 => 'EXIF' },
+    },
+);
+
+%Image::ExifTool::Trailer::OnePlus = (
+    GROUPS => { 0 => 'Trailer', 1 => 'OnePlus', 2 => 'Image' },
+    NOTES => 'Information written in JPEG trailer by some OnePlus phones.',
+    JSONInfo => { },
+    'private.emptyspace' => { # length of the entire OnePlus trailer
+        Name => 'OnePlusTrailerLen',
+        ValueConv => 'length $val == 4 ? unpack("N", $val) : $val',
+        Unknown => 1,
+    },
+    'watermark.device' => {
+        Name => 'Device',
+        ValueConv => '"0x" . join(" ", unpack("H10Z*", $val))',
+        Format => 'string',
+    },
+);
+
+# Google and/or Android information in JPEG trailer
+%Image::ExifTool::Trailer::Google = (
+    GROUPS => { 0 => 'Trailer', 1 => 'Google', 2 => 'Image' },
+    NOTES => q{
+        Google-defined information written in the trailer of JPEG images by some
+        phones.  This information is referenced by DirectoryItem entries in the XMP.
+        Note that some of this information may also be referenced from other
+        metadata formats, and hence may be extracted twice.  For example,
+        MotionPhotoVideo may also exist within a Samsung trailer as
+        EmbbededVideoFile, or GainMapImage may also exist in an MPF trailer as
+        MPImage2.
+    },
+    MotionPhoto        => { Name => 'MotionPhotoVideo',  Groups => { 2 => 'Video' } },
+    GainMap            => { Name => 'GainMapImage',      Groups => { 2 => 'Preview' } },
+    Depth              => { Name => 'DepthMapImage',     Groups => { 2 => 'Preview' } },
+    Confidence         => { Name => 'ConfidenceMapImage',Groups => { 2 => 'Preview' } },
+    'android/depthmap' => { Name => 'DepthMapImage',     Groups => { 2 => 'Preview' } },
+    'android/confidencemap' => { Name => 'ConfidenceMapImage', Groups => { 2 => 'Preview' } },
+);
+
+#------------------------------------------------------------------------------
+# Process Vivo trailer
+# Inputs: 0) ExifTool object reference, 1) dirInfo reference
+# Returns: 1 on success, 0 on failure, -1 if we must scan for the start
+#          of the trailer to set the ExifTool TrailerStart member
+# - takes Offset as positive offset from end of trailer to end of file,
+#   and returns DataPos and DirLen, and updates OutFile when writing
+sub ProcessVivo($$)
+{
+    my ($et, $dirInfo) = @_;
+    my $raf = $$dirInfo{RAF};
+    my $buff;
+
+    # return now unless we are at a position to scan for the trailer
+    # (must scan because the trailer footer doesn't indicate the trailer length)
+    return -1 unless $$dirInfo{ScanForTrailer};
+
+    my $pos = $$et{TrailerStart} or return 0;
+    my $len = $$et{FileEnd} - $pos - $$dirInfo{Offset};
+    $raf->Seek($pos, 0) or return 0;
+    return 0 unless $len > 0 and $len < 1e7 and $raf->Read($buff, $len) == $len and
+        $buff =~ /\xff{4}\x1b\*9HWfu\x84\x93\xa2\xb1$/ and # validate footer
+        $buff =~ /(streamdata|vivo\{")/g;   # find start
+    my $start = pos($buff) - length($1);
+    if ($start) {
+        $pos += $start;
+        $len -= $start;
+        $buff = substr($buff, $start);
+    }
+    # set trailer position and length 
+    @$dirInfo{'DataPos','DirLen'} = ($pos, $len);
+
+    # let ProcessTrailers copy or delete this trailer
+    return -1 if $$dirInfo{OutFile};
+
+    $et->DumpTrailer($dirInfo) if $$et{OPTIONS}{Verbose} or $$et{HTML_DUMP};
+    my $tbl = GetTagTable('Image::ExifTool::Trailer::Vivo');
+    pos($buff) = 0; # rewind search to start of buffer
+    if ($buff =~ /^streamdata\xff\xd8\xff/ and $buff =~ /\xff\xd9stream(info|coun)/g) {
+        $et->HandleTag($tbl, HDRImage => substr($buff, 10, pos($buff)-20));
+    }
+    # continue looking for Vivo JSON data
+    if ($buff =~ /vivo\{"/g) {
+        my $jsonStart = pos($buff) - 2;
+        if ($buff =~ /\}\0/g) {
+            my $jsonLen = pos($buff) - 1 - $jsonStart;
+            $et->HandleTag($tbl, JSONInfo => substr($buff, $jsonStart, $jsonLen));
+        }
+    }
+    return 1;
+}
+
+#------------------------------------------------------------------------------
+# Process OnePlus trailer
+# Inputs: 0) ExifTool object reference, 1) dirInfo reference
+# Returns: 1 on success, 0 on failure, -1 if we must scan for the start
+#          of the trailer to set the ExifTool TrailerStart member
+# - takes Offset as positive offset from end of trailer to end of file,
+#   and returns DataPos and DirLen, and updates OutFile when writing
+sub ProcessOnePlus($$)
+{
+    my ($et, $dirInfo) = @_;
+    my $raf = $$dirInfo{RAF};
+    my ($buff, $buf2);
+
+    # return now unless we are at a position to scan for the trailer
+    # (must scan because the trailer footer doesn't indicate the entire trailer length)
+    return -1 unless $$dirInfo{ScanForTrailer};
+
+    # return -1 to let ProcessTrailers copy or delete the entire trailer
+    return -1 if $$dirInfo{OutFile};
+
+    my $start = $$et{TrailerStart} or return 0;
+    $raf->Seek(-8-$$dirInfo{Offset}, 2) and $raf->Read($buff, 8) == 8 or return 0;
+    my $end = $raf->Tell(); # (same as FileEnd - Offset)
+
+    my $dump = ($$et{OPTIONS}{Verbose} or $$et{HTML_DUMP});
+    my $tagTable = GetTagTable('Image::ExifTool::Trailer::OnePlus');
+    my $trailLen = 0;
+    if ($buff =~ /^jxrs...\0$/) {
+        my $jlen = unpack('x4V', $buff);
+        my $maxOff = 0;
+        if ($jlen < $end-$start and $jlen > 8 and $raf->Seek($end-$jlen) and
+            $raf->Read($buff, $jlen-8) == $jlen-8)
+        {
+            $buff =~ s/\0+$//;  # remove trailing null(s)
+            require Image::ExifTool::Import;
+            my $list = Image::ExifTool::Import::ReadJSONObject(undef, \$buff);
+            if (ref $list eq 'ARRAY') {
+                $$_{offset} and $$_{offset} > $maxOff and $maxOff = $$_{offset} foreach @$list;
+                $trailLen = $maxOff + $jlen;
+                if ($dump and $trailLen) {
+                    $et->DumpTrailer({
+                        RAF     => $raf,
+                        DirName => 'OnePlus',
+                        DataPos => $end-$trailLen,
+                        DirLen  => $trailLen,
+                    });
+                }
+                $et->HandleTag($tagTable, JSONInfo => $buff);
+                foreach (@$list) {
+                    my ($off, $name, $len) = @$_{qw(offset name length)};
+                    next unless $off and $name and $len;
+                    if ($raf->Seek($end-$jlen-$off) and $raf->Read($buf2, $len) == $len) {
+                        $et->HandleTag($tagTable, $name, $buf2, DataPos => $end-$jlen-$off, DataPt => \$buf2);
+                    }
+                }
+            } else {
+                $et->HandleTag($tagTable, JSONInfo => $buff);
+                $et->Warn('Error parsing OnePlus JSON information');
+            }
+        }
+    }
+    @$dirInfo{'DataPos','DirLen'} = ($end - $trailLen, $trailLen);
+
+    return 1;
+}
+
+#------------------------------------------------------------------------------
+# Process Google trailer
+# Inputs: 0) ExifTool object reference, 1) dirInfo reference
+# Returns: 1 on success, 0 on failure, -1 if we must scan for the start
+#          of the trailer to set the ExifTool TrailerStart member
+# - this trailer won't be identified when writing because XMP isn't extracted then
+sub ProcessGoogle($$)
+{
+    my ($et, $dirInfo) = @_;
+    my $raf = $$dirInfo{RAF};
+    my $info = $$et{VALUE};
+
+    my ($tag, $mime, $len, $pad) = @$info{qw(DirectoryItemSemantic DirectoryItemMime
+                                             DirectoryItemLength DirectoryItemPadding)};
+
+    unless (ref $tag eq 'ARRAY' and ref $mime eq 'ARRAY') {
+        undef $pad;
+        ($tag, $mime, $len) = @$info{qw(ContainerDirectoryItemDataURI
+            ContainerDirectoryItemMime ContainerDirectoryItemLength)};
+        unless (ref $mime eq 'ARRAY' and ref $tag eq 'ARRAY') {
+            delete $$et{ProcessGoogleTrailer};
+            return 0;
+        }
+    }
+    # we need to know TrailerStart to be able to read/write this trailer
+    return -1 unless $$dirInfo{ScanForTrailer};
+
+    delete $$et{ProcessGoogleTrailer};  # reset flag to process the Google trailer
+
+    return -1 if $$dirInfo{OutFile};    # let caller handle the writing
+
+    # sometimes DirectoryItemLength is missing the Primary entry
+    $len = [ $len ] unless ref $len eq 'ARRAY';
+    unshift @$len, 0 while @$len < @$mime;
+
+    my $start = $$et{TrailerStart} or return 0;
+    my $end = $$et{FileEnd}; # (ignore Offset for now because some entries may run into other trailers)
+
+    my $dump = ($$et{OPTIONS}{Verbose} or $$et{HTML_DUMP});
+    my $tagTable = GetTagTable('Image::ExifTool::Trailer::Google');
+
+    # (ignore first entry: "Primary" or "primary_image")
+    my ($i, $pos, $buff, $regex, $grp, $type);
+    for ($i=1, $pos=0; defined $$mime[$i]; ++$i) {
+        my $more = $end - $start - $pos;
+        last if $more < 16;
+        next unless $$len[$i] and defined $$tag[$i];
+        last if $$len[$i] > $more;
+        $raf->Seek($start+$pos) and $raf->Read($buff, 16) == 16 and $raf->Seek($start+$pos) or last;
+        if ($$mime[$i] eq 'image/jpeg') {
+            $regex = '\xff\xd8\xff[\xdb\xe0\xe1]';
+        } elsif ($$mime[$i] eq 'video/mp4') {
+            $regex = '\0\0\0.ftyp(mp42|isom)';
+        } else {
+            $et->Warn("Google trailer $$tag[$i] $$mime[$i] not handled");
+            next;
+        }
+        if ($buff =~ /^$regex/s) {
+            last unless $raf->Read($buff, $$len[$i]) == $$len[$i];
+        } else {
+            last if $pos; # don't skip unknown information again
+            last unless $raf->Read($buff, $more) == $more;
+            last unless $buff =~ /($regex)/sg;
+            $pos += pos($buff) - length($1);
+            $more = $end - $start - $pos;
+            last if $$len[$i] > $end - $start - $pos;
+            $buff = substr($buff, $pos, $$len[$i]);
+        }
+        unless ($$tagTable{$$tag[$i]}) {
+            my $name = $$tag[$i];
+            $name =~ s/([^A-Za-z])([a-z])/$1\u$2/g; # capitalize words
+            $name = Image::ExifTool::MakeTagName($$tag[$i]);
+            if ($$mime[$i] eq 'image/jpeg') {
+                ($type, $grp) = ('Image', 'Preview');
+            } else {
+                ($type, $grp) = ('Video', 'Video');
+            }
+            $et->VPrint(0, $$et{INDENT}, "[adding Google:$name]\n");
+            AddTagToTable($tagTable, $$tag[$i], { Name => "$name$type", Groups => { 2 => $grp } });
+        }
+        $dump and $et->DumpTrailer({
+            RAF     => $raf,
+            DirName => $$tag[$i],
+            DataPos => $start + $pos,
+            DirLen  => $$len[$i],
+        });
+        $et->HandleTag($tagTable, $$tag[$i], \$buff, DataPos => $start + $pos, DataPt => \$buff);
+        # (haven't seen non-zero padding, but I assume this is how it works
+        $pos += $$len[$i] + (($pad and $$pad[$i]) ? $$pad[$i] : 0);
+    }
+    if (defined $$tag[$i] and defined $$mime[$i]) {
+        $et->Warn("Error reading $$tag[$i] $$mime[$i] from trailer", 1);
+    }
+    return 0 unless $pos;
+
+    @$dirInfo{'DataPos','DirLen'} = ($start, $pos);
+
+    return 1;
+}
+
+1;  # end
+
+__END__
+
+=head1 NAME
+
+Image::ExifTool::Trailer - Read JPEG trailer written by various phone makes
+
+=head1 SYNOPSIS
+
+This module is used by Image::ExifTool
+
+=head1 DESCRIPTION
+
+This module contains definitions required by Image::ExifTool to read
+metadata the trailer written by some Vivo, OnePlus and Google phones.
+
+=head1 AUTHOR
+
+Copyright 2003-2025, 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 SEE ALSO
+
+L<Image::ExifTool::TagNames/Trailer Tags>,
+L<Image::ExifTool(3pm)|Image::ExifTool>
+
+=cut
+

package/bin/exiftool_files/lib/Image/ExifTool/Validate.pm

@@ -188,10 +188,10 @@ my %validValue = (
             0x115 => undef,     # SamplesPerPixel
             0x116 => undef,     # RowsPerStrip
             0x117 => undef,     # StripByteCounts
-            0x11a => 'defined $val',        # XResolution
-            0x11b => 'defined $val',        # YResolution
+            # (optional as of 3.0) 0x11a => 'defined $val',        # XResolution
+            # (optional as of 3.0) 0x11b => 'defined $val',        # YResolution
             0x11c => undef,     # PlanarConfiguration
-            0x128 => '$val =~ /^[123]$/',   # ResolutionUnit
+            # (optional as of 3.0) 0x128 => '$val =~ /^[123]$/',   # ResolutionUnit
             0x201 => undef,     # JPEGInterchangeFormat
             0x202 => undef,     # JPEGInterchangeFormatLength
             0x212 => undef,     # YCbCrSubSampling
@@ -218,7 +218,7 @@ my %validValue = (
         ExifIFD => {
             0x9000 => 'defined $val and $val =~ /^\d{4}$/', # ExifVersion
             0x9101 => 'defined $val',       # ComponentsConfiguration
-            0xa000 => 'defined $val',       # FlashpixVersion
+            # (optional as of 3.0) 0xa000 => 'defined $val',       # FlashpixVersion
             0xa001 => '$val == 1 or $val == 0xffff',    # ColorSpace
             0xa002 => 'defined $val',       # PixelXDimension
             0xa003 => 'defined $val',       # PixelYDimension

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

@@ -566,7 +566,7 @@ sub WriteCRW($$)
     my $trailPt;
     while ($success) {
         # check to see if trailer(s) exist(s)
-        my $trailInfo = Image::ExifTool::IdentifyTrailer($raf) or last;
+        my $trailInfo = $et->IdentifyTrailer($raf) or last;
         # rewrite the trailer(s)
         $buff = '';
         $$trailInfo{OutFile} = \$buff;

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

@@ -25,9 +25,9 @@ my %crossDelete = (
 # mandatory tag default values
 my %mandatory = (
     IFD0 => {
-        0x011a => 72,       # XResolution
-        0x011b => 72,       # YResolution
-        0x0128 => 2,        # ResolutionUnit (inches)
+      # (optional as of 3.0)  0x011a => 72,       # XResolution
+      # (optional as of 3.0)  0x011b => 72,       # YResolution
+      # (optional as of 3.0)  0x0128 => 2,        # ResolutionUnit (inches)
         0x0213 => 1,        # YCbCrPositioning (centered)
       # 0x8769 => ????,     # ExifOffset
     },
@@ -40,7 +40,7 @@ my %mandatory = (
     ExifIFD => {
         0x9000 => '0232',   # ExifVersion
         0x9101 => "1 2 3 0",# ComponentsConfiguration
-        0xa000 => '0100',   # FlashpixVersion
+      # (optional as of 3.0)  0xa000 => '0100',   # FlashpixVersion
         0xa001 => 0xffff,   # ColorSpace (uncalibrated)
       # 0xa002 => ????,     # ExifImageWidth
       # 0xa003 => ????,     # ExifImageHeight
@@ -2269,6 +2269,11 @@ NoOverwrite:            next if $isNew > 0;
             # build list of offsets to process
             my @offsetList;
             if ($ifd >= 0) {
+                $dirName = $$dirInfo{DirName} || 'unknown';
+                if ($ifd) {
+                    $dirName =~ s/\d+$//;
+                    $dirName .= $ifd;
+                }
                 my $offsetInfo = $offsetInfo[$ifd] or next;
                 if ($$offsetInfo{0x111} and $$offsetInfo{0x144}) {
                     # SubIFD may contain double-referenced data as both strips and tiles

package/bin/exiftool_files/lib/Image/ExifTool/WritePDF.pl

@@ -546,7 +546,7 @@ sub WritePDF($$)
     }
     if ($metaChanged) {
         if ($newXMP) {
-            unless ($metaRef) {
+            unless (ref $metaRef) {
                 # allocate new PDF object
                 $metaRef = \ "$nextObject 0 R";
                 ++$nextObject;

package/bin/exiftool_files/lib/Image/ExifTool/WriteQuickTime.pl

@@ -891,7 +891,7 @@ sub WriteQuickTime($$$)
     $et or return 1;    # allow dummy access to autoload this package
     my ($mdat, @mdat, @mdatEdit, $edit, $track, $outBuff, $co, $term, $delCount);
     my (%langTags, $canCreate, $delGrp, %boxPos, %didDir, $writeLast, $err, $atomCount);
-    my ($tag, $lastTag, $lastPos, $errStr, $trailer, $buf2, $keysGrp, $keysPath);
+    my ($tag, $lastTag, $lastPos, $errStr, $trailer, $buf2, $keysGrp, $keysPath, $itemIndex);
     my $outfile = $$dirInfo{OutFile} || return 0;
     my $raf = $$dirInfo{RAF};       # (will be null for lower-level atoms)
     my $dataPt = $$dirInfo{DataPt}; # (will be null for top-level atoms)
@@ -982,8 +982,25 @@ sub WriteQuickTime($$$)
     $atomCount = $$tagTablePtr{VARS}{ATOM_COUNT} if $$tagTablePtr{VARS};
 
     $tag = $lastTag = '';
-
+    $itemIndex = 0 if $dirName eq 'ItemPropertyContainer';
+
+    # read ahead to parse item property associations if this is 'iprp' ItemProperties
+    # (necessary to determine which properties belong to primary item in HEIC file)
+    if ($dirName eq 'ItemProperties') {
+        my $pos = $raf->Tell();
+        for (;;) {
+            $raf->Read($buf2, 8) == 8 or last;
+            my $size = Get32u(\$buf2, 0) - 8;    # (atom size without 8-byte header)
+            $tag = substr($buf2, 4, 4);
+            last if $size < 0;
+            $tag eq 'ipma' or $raf->Seek($size, 1), next;
+            ParseItemPropAssoc($buf2,$et) if $raf->Read($buf2,$size) == $size;
+            last;
+        }
+        $raf->Seek($pos);
+    }
     for (;;) {      # loop through all atoms at this level
+        ++$itemIndex if defined $itemIndex;
         $lastPos = $raf->Tell();
         # stop processing if we reached a known trailer
         if ($trailer and $lastPos >= $$trailer[1]) {
@@ -1061,6 +1078,10 @@ sub WriteQuickTime($$$)
             $et->Error("Can't yet write compressed movie metadata");
             return $rtnVal;
         } elsif ($tag eq 'wide') {
+            if ($size) {
+                $et->Warn("Incorrect size for 'wide' atom ($size bytes)");
+                $raf->Seek($size, 1) or $et->Error('Truncated wide atom');
+            }
             next;   # drop 'wide' tag
         }
 
@@ -1182,6 +1203,36 @@ sub WriteQuickTime($$$)
         }
         undef $tagInfo if $tagInfo and $$tagInfo{AddedUnknown};
 
+        # don't write this tag unless associated with the primary item
+        # (Note: This relies on iinf and dimg coming before iprp)
+        if (defined $itemIndex and $$et{ItemInfo}) {
+            my $items = $$et{ItemInfo};
+            my ($id, $prop, $isPrimary);
+            my $primary = $$et{PrimaryItem};
+            unless (defined $primary) {
+                ($primary) = sort { $a <=> $b } keys %{$$et{ItemInfo}} if $$et{ItemInfo};
+                $primary = 0 unless defined $primary;
+            }
+            my $pitem = $$items{$primary} || { };
+            $$pitem{RefersTo} or $$pitem{RefersTo} = { };
+ItemID2:    foreach $id (reverse sort { $a <=> $b } keys %$items) {
+                next unless $$items{$id}{Association};
+                my $item = $$items{$id};
+                foreach $prop (@{$$item{Association}}) {
+                    next unless $prop == $itemIndex;
+                    my $dont = $dontInherit{$tag} || 0;
+                    last unless $id == $primary or (not $dont and
+                        ($$item{RefersTo} and $$item{RefersTo}{$primary})) or
+                        # special case to assume this property belongs to the primary
+                        # image if it belongs to an item referred to by the primary
+                        ($dont != 1 and $$pitem{RefersTo}{$id});
+                    $isPrimary = 1;
+                    last ItemID2;
+                }
+            }
+            undef $tagInfo unless $isPrimary;
+        }
+
         if ($tagInfo and (not defined $$tagInfo{Writable} or $$tagInfo{Writable})) {
             my $subdir = $$tagInfo{SubDirectory};
             my ($newData, @chunkOffset);
@@ -1221,6 +1272,7 @@ sub WriteQuickTime($$$)
                     OutFile  => $outfile,
                     NoRefTest=> 1,     # don't check directory references
                     WriteGroup => $$tagInfo{WriteGroup},
+                    Permanent => $$tagInfo{Permanent},
                     # initialize array to hold details about chunk offset table
                     # (each entry has 3-5 items: 0=atom type, 1=table offset, 2=table size,
                     #  3=optional base offset, 4=optional item ID)
@@ -1464,7 +1516,10 @@ sub WriteQuickTime($$$)
                             ++$$et{CHANGED};
                             my $grp = $et->GetGroup($langInfo, 1);
                             $et->VerboseValue("- $grp:$$langInfo{Name}", $val);
-                            next unless defined $newData and not $$didTag{$nvHash};
+                            unless (defined $newData and not $$didTag{$nvHash}) {
+                                # must not delete items from iprp because it will mess up the ordering
+                                next unless defined $itemIndex;
+                            }
                             $et->VerboseValue("+ $grp:$$langInfo{Name}", $newData);
                             # add back necessary header and encode as necessary
                             if (defined $lang) {
@@ -1493,7 +1548,7 @@ sub WriteQuickTime($$$)
                                 $newData = $et->Encode($newData, 'UTF8');
                             } elsif ($format and not $$tagInfo{Binary}) {
                                 # format new value for writing
-                                $newData = WriteValue($newData, $format);
+                                $newData = WriteValue($newData, $format, $$tagInfo{Count});
                             }
                         }
                         $$didTag{$nvHash} = 1;   # set flag so we don't add this tag again
@@ -1560,7 +1615,9 @@ sub WriteQuickTime($$$)
             }
             if ($msg) {
                 # (allow empty sample description for non-audio/video handler types, eg. 'url ', 'meta')
-                if ($$et{MediaType}) {
+                # (also, incorrectly written 'mett' SampleEntry by Google phones,
+                #  see https://exiftool.org/forum/index.php?msg=91158)
+                if ($avType{$$et{MediaType}}) {
                     my $grp = $$et{CUR_WRITE_GROUP} || $parent;
                     $et->Error("$msg for $grp");
                     return $rtnErr;

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

@@ -1296,15 +1296,15 @@ sub SetNewValuesFromFile($$;@)
         # ! option to decide how it is handled here. !
         # +------------------------------------------+
         foreach (qw(ByteUnit Charset CharsetEXIF CharsetFileName CharsetID3 CharsetIPTC
-                    CharsetPhotoshop Composite DateFormat Debug EncodeHangs Escape ExtendedXMP
-                    ExtractEmbedded FastScan Filter FixBase Geolocation GeolocAltNames
-                    GeolocFeature GeolocMinPop GeolocMaxDist GlobalTimeShift GPSQuadrant
-                    HexTagIDs IgnoreGroups IgnoreMinorErrors IgnoreTags ImageHashType Lang
-                    LargeFileSupport LigoGPSScale ListItem ListSep MDItemTags
-                    MissingTagValue NoPDFList NoWarning Password PrintConv QuickTimeUTC
-                    RequestTags SaveFormat SavePath ScanForXMP StructFormat SystemTags
-                    TimeZone Unknown UserParam Validate WindowsLongPath WindowsWideFile
-                    XAttrTags XMPAutoConv))
+                    CharsetPhotoshop Composite DateFormat Debug EncodeHangs Escape
+                    ExtendedXMP ExtractEmbedded FastScan Filter FixBase Geolocation
+                    GeolocAltNames GeolocFeature GeolocMinPop GeolocMaxDist
+                    GlobalTimeShift GPSQuadrant HexTagIDs IgnoreGroups IgnoreMinorErrors
+                    IgnoreTags ImageHashType KeepUTCTime Lang LargeFileSupport
+                    LigoGPSScale ListItem ListSep MDItemTags MissingTagValue NoPDFList
+                    NoWarning Password PrintConv QuickTimeUTC RequestTags SaveFormat
+                    SavePath ScanForXMP StructFormat SystemTags TimeZone Unknown UserParam
+                    Validate WindowsLongPath WindowsWideFile XAttrTags XMPAutoConv))
         {
             $srcExifTool->Options($_ => $$options{$_});
         }
@@ -4262,9 +4262,11 @@ sub WriteDirectory($$$;$)
         if ($permanentDir{$grp0} and not ($$dirInfo{TagInfo} and $$dirInfo{TagInfo}{Deletable})) {
             undef $delFlag;
         }
-        # (never delete an entire QuickTime group)
         if ($delFlag) {
-            if (($grp0 =~ /^(MakerNotes)$/ or $grp1 =~ /^(IFD0|ExifIFD|MakerNotes)$/) and
+            if ($$dirInfo{Permanent}) {
+                $self->Warn("Not deleting permanent $dirName directory");
+                undef $grp1;
+            } elsif (($grp0 =~ /^(MakerNotes)$/ or $grp1 =~ /^(IFD0|ExifIFD|MakerNotes)$/) and
                 $self->IsRawType() and
                 # allow non-permanent MakerNote directories to be deleted (ie. NikonCapture)
                 (not $$dirInfo{TagInfo} or not defined $$dirInfo{TagInfo}{Permanent} or
@@ -5044,7 +5046,6 @@ TryLib: for ($lib=$strptimeLib; ; $lib='') {
                 last;
             }
             if (not $lib) {
-                last unless $$self{OPTIONS}{StrictDate};
                 warn $wrn || "Install POSIX::strptime or Time::Piece for inverse date/time conversions\n";
                 return undef;
             } elsif ($lib eq 'POSIX::strptime') {
@@ -6027,7 +6028,7 @@ sub WriteJPEG($$)
             Write($outfile, $hdr, $s, $segData) or $err = 1;
             my ($buff, $endPos, $trailInfo);
             my $delPreview = $$self{DEL_PREVIEW};
-            $trailInfo = IdentifyTrailer($raf) unless $$delGroup{Trailer};
+            $trailInfo = $self->IdentifyTrailer($raf) unless $$delGroup{Trailer};
             my $nvTrail = $self->GetNewValueHash($Image::ExifTool::Extra{Trailer});
             unless ($oldOutfile or $delPreview or $trailInfo or $$delGroup{Trailer} or $nvTrail or
                 $$self{HiddenData})

package/bin/exiftool_files/lib/Image/ExifTool/XMP.pm

@@ -50,7 +50,7 @@ use Image::ExifTool::Exif;
 use Image::ExifTool::GPS;
 require Exporter;
 
-$VERSION = '3.70';
+$VERSION = '3.72';
 @ISA = qw(Exporter);
 @EXPORT_OK = qw(EscapeXML UnescapeXML);
 
@@ -165,7 +165,7 @@ my %xmpNS = (
 #
     plus      => 'http://ns.useplus.org/ldf/xmp/1.0/',
     # (prism recommendations from http://www.prismstandard.org/specifications/3.0/Image_Guide_3.0.htm)
-    prism     => 'http://prismstandard.org/namespaces/basic/2.0/',
+    prism     => 'http://prismstandard.org/namespaces/basic/2.0/', # (maybe left at 2.0 to avoid compatibility issues -- think hard before changing this)
     prl       => 'http://prismstandard.org/namespaces/prl/2.1/',
     pur       => 'http://prismstandard.org/namespaces/prismusagerights/2.1/',
     pmi       => 'http://prismstandard.org/namespaces/pmi/2.2/',
@@ -1247,8 +1247,22 @@ my %sPantryItem = (
     NAMESPACE   => 'pdfx',
     NOTES => q{
         PDF extension tags.  This namespace is used to store application-defined PDF
-        information, so there are no pre-defined tags.  User-defined tags must be
-        created to enable writing of XMP-pdfx information.
+        information, so there are few pre-defined tags.  User-defined tags must be
+        created to enable writing of other XMP-pdfx information.
+    },
+    SourceModified => {
+        Name => 'SourceModified',
+        Groups => { 2 => 'Time' },
+        Shift => 'Time',
+        ValueConv => 'require Image::ExifTool::PDF; $val = Image::ExifTool::PDF::ConvertPDFDate($val)',
+        ValueConvInv => q{
+            require Image::ExifTool::PDF;
+            $val = Image::ExifTool::PDF::WritePDFValue($self,$val,"date");
+            $val =~ tr/()//d;
+            return $val;
+        },
+        PrintConv => '$self->ConvertDateTime($val)',
+        PrintConvInv => '$self->InverseDateTime($val)',
     },
 );
 
@@ -3804,8 +3818,22 @@ sub ParseXMPElement($$$;$$$$)
         my ($parseResource, %attrs, @attrs);
 # this hangs Perl (v5.18.4) for a specific capture string [patched in ExifTool 12.98]
 #        while ($attrs =~ m/(\S+?)\s*=\s*(['"])(.*?)\2/sg) {
-        while ($attrs =~ /(\S+?)\s*=\s*(['"])/g) {
-            my ($attr, $quote) = ($1, $2);
+# this may hang Perl v5.26.3 (but not v5.18.4) if there is lots of garbage in the XMP [patched in 13.23]
+#        while ($attrs =~ /(\S+?)\s*=\s*(['"])/g) {
+        for (;;) {
+            my ($attr, $quote);
+            if (length($attrs) < 2000) { # (do it the easy way if attributes aren't stupid long)
+                last unless $attrs =~ /(\S+)\s*=\s*(['"])/g;
+                ($attr, $quote) = ($1, $2);
+            } else {
+                # 13.23 patch to avoid capturing tons of garbage if XMP is corrupted
+                last unless $attrs =~ /=\s*(['"])/g;
+                $quote = $1;
+                my $p = pos($attrs) > 1000 ? pos($attrs) - 1000 : 0;
+                my $tmp = substr($attrs, $p, pos($attrs)-$p);
+                last unless $tmp =~ /(\S+)\s*=\s*$quote$/;
+                $attr = $1;
+            }
             my $p0 = pos($attrs);
             last unless $attrs =~ /$quote/g;
             my $val = substr($attrs, $p0, pos($attrs)-$p0-1);