exiftool_vendored 13.06.0 → 13.10.0

data/bin/lib/Image/ExifTool/TagNames.pod

@@ -12,7 +12,7 @@ meta information extracted from or written to a file.
 =head1 TAG TABLES
 
 The tables listed below give the names of all tags recognized by ExifTool.
-They contain a total of 28212 tags, with 17509 unique tag names.
+They contain a total of 28224 tags, with 17515 unique tag names.
 
 B<Tag ID>, B<Index#> or B<Sequence> is given in the first column of each
 table.  A B<Tag ID> is the computer-readable equivalent of a tag name, and
@@ -8643,6 +8643,7 @@ specification.
   'cept'   ColorEncodingParams                  no
   'chad'   ChromaticAdaptation                  no
   'chrm'   Chromaticity                         ICC_Profile Chromaticity
+  'cicp'   ColorRepresentation                  ICC_Profile ColorRep
   'ciis'   ColorimetricIntentImageState         no
   'clio'   ColorantInfoOut                      no
   'cloo'   ColorantOrderOut                     no
@@ -8681,6 +8682,7 @@ specification.
   'gdb1'   GamutBoundaryDescription1            no
   'gdb2'   GamutBoundaryDescription2            no
   'gdb3'   GamutBoundaryDescription3            no
+  'hdgm'   HDGainMapInfo                        no
   'kTRC'   GrayTRC                              no
   'lumi'   Luminance                            no
   'mcta'   MultiplexTypeArray                   no
@@ -8762,6 +8764,15 @@ specification.
      28    ChromaticityChannel3                 no
      36    ChromaticityChannel4                 no
 
+=head3 ICC_Profile ColorRep Tags
+
+  Index1   Tag Name                             Writable
+  ------   --------                             --------
+      8    ColorPrimaries                       no
+      9    TransferCharacteristics              no
+     10    MatrixCoefficients                   no
+     11    VideoFullRangeFlag                   no
+
 =head3 ICC_Profile ColorantTable Tags
 
   Index1   Tag Name                             Writable
@@ -8903,7 +8914,7 @@ access to this information.
   0x0432   MeasurementScale?                    no
   0x0433   TimelineInfo?                        no
   0x0434   SheetDisclosure?                     no
-  0x0435   ChannelOptions?                      no
+  0x0435   ChannelOptions                       Photoshop ChannelOptions
   0x0436   OnionSkins?                          no
   0x0438   CountInfo?                           no
   0x043a   PrintInfo2?                          no
@@ -8966,6 +8977,17 @@ access to this information.
   ------   --------                             --------
       4    PixelAspectRatio                     no
 
+=head3 Photoshop ChannelOptions Tags
+
+These tags relate only to the appearance of a channel.
+
+  Index1   Tag Name                             Writable
+  ------   --------                             --------
+      0    ChannelColorSpace                    no
+      2    ChannelColorData                     no
+     11    ChannelOpacity                       no
+     12    ChannelColorIndicates                no
+
 =head3 Photoshop DocumentData Tags
 
   Tag ID   Tag Name                             Writable
@@ -9325,6 +9347,7 @@ Unknown only to reduce the volume of the normal output.
            CanonCameraInfo1100D                 Canon CameraInfo600D
            CanonCameraInfo1200D                 Canon CameraInfo60D
            CanonCameraInfoR6                    Canon CameraInfoR6
+           CanonCameraInfoR6m2                  Canon CameraInfoR6m2
            CanonCameraInfoG5XII                 Canon CameraInfoG5XII
            CanonCameraInfoPowerShot             Canon CameraInfoPowerShot
            CanonCameraInfoPowerShot2            Canon CameraInfoPowerShot2
@@ -10321,6 +10344,14 @@ CameraInfo tags for the EOS R5 and R6.
   ------   --------                             --------
    2801    ShutterCount                         int32u
 
+=head3 Canon CameraInfoR6m2 Tags
+
+CameraInfo tags for the EOS R6 Mark II.
+
+  Index1   Tag Name                             Writable
+  ------   --------                             --------
+   3369    ShutterCount                         int32u
+
 =head3 Canon CameraInfoG5XII Tags
 
 CameraInfo tags for the PowerShot G5 X Mark II.
@@ -29993,13 +30024,14 @@ for the official QuickTime specification.
   'sefd'               SamsungTrailer           Samsung Trailer
   'skip'               CanonSkip                Canon Skip
                        PreviewImage             no
-                       SkipInfo                 -
+                       SkipInfo                 QuickTime Stream
+                       LigoGPSInfo              -
                        Skip?                    no
   'thm '               ThumbnailImage           no
   'thum'               ThumbnailImage           no
   'udat'               GPSLog                   no
   'udta'               KenwoodData              QuickTime Stream
-                       LIGO_JSON                QuickTime Stream
+                       LigoJSON                 QuickTime Stream
                        FLIRData                 FLIR UserData
   'uuid'               XMP                      XMP
                        UUID-PROF                QuickTime Profile
@@ -30019,7 +30051,7 @@ for the official QuickTime specification.
 The tags below are extracted from timed metadata in QuickTime and other
 formats of video files when the ExtractEmbedded option is used.  Although
 most of these tags are combined into the single table below, ExifTool
-currently reads 85 different formats of timed GPS metadata from video files.
+currently reads 96 different types of timed GPS metadata from video files.
 
   Tag Name                                      Writable
   --------                                      --------
@@ -30071,6 +30103,8 @@ currently reads 85 different formats of timed GPS metadata from video files.
   Unknown01?                                    no
   Unknown02?                                    no
   Unknown03?                                    no
+  Unknown_H?                                    no
+  Unknown_M?                                    no
   UserLabel                                     no
   VerticalSpeed                                 no
   VideoTimeStamp                                no
@@ -30252,6 +30286,8 @@ changed via the config file.
   'director'    Director                        yes
   'displayname' DisplayName                     yes
   'encoder'     Encoder                         yes
+  'full-frame-rate-playback-intent'
+                FullFrameRatePlaybackIntent     yes
   'genre'       Genre                           yes
   'information' Information                     yes
   'keywords'    Keywords                        yes
@@ -30384,6 +30420,7 @@ Tags found in Pittasoft Blackvue dashcam "free" data.
   'bxml'   BinaryXML?                           no
   'dinf'   DataInfo                             QuickTime DataInfo
   'free'   Free?                                no
+  'grpl'   Unknown_grpl                         QuickTime grpl
   'hdlr'   Handler                              QuickTime Handler
   'idat'   MetaImageSize                        no
   'iinf'   ItemInformation                      QuickTime ItemInfo
@@ -30418,6 +30455,12 @@ MP4 data reference box.
   'url '   URL                                  no
   'urn '   URN                                  no
 
+=head3 QuickTime grpl Tags
+
+  Tag ID   Tag Name                             Writable
+  ------   --------                             --------
+  [no tags known]
+
 =head3 QuickTime Handler Tags
 
   Index1   Tag Name                             Writable

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

@@ -325,7 +325,7 @@ sub ProcessVCard($$)
             $$et{DOC_NUM} = ++$$et{DOC_COUNT};  # read next card as a new document
         }
         unless ($val =~ s/^([-A-Za-z0-9.]+)//) {
-            $et->WarnOnce("Unrecognized line in $lbl file");
+            $et->Warn("Unrecognized line in $lbl file");
             next;
         }
         my $tag = $1;
@@ -379,7 +379,7 @@ sub ProcessVCard($$)
                 $param{$p} = '';
             }
         }
-        $val =~ s/^:// or $et->WarnOnce("Invalid line in $lbl file"), next;
+        $val =~ s/^:// or $et->Warn("Invalid line in $lbl file"), next;
         # add 'Type' parameter to id and name if it exists
         $param{Type} and $tag .= $param{Type}, $name .= $param{Type};
         # convert base64-encoded data

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

@@ -421,7 +421,7 @@ sub ValidateExif($$$$$$$$)
 {
     my ($et, $tagTablePtr, $tag, $tagInfo, $lastTag, $ifd, $count, $formatStr) = @_;
 
-    $et->WarnOnce("Entries in $ifd are out of order") if $tag <= $lastTag;
+    $et->Warn("Entries in $ifd are out of order") if $tag <= $lastTag;
 
     # (get tagInfo for unknown tags if Unknown option not used)
     if (not defined $tagInfo and $$tagTablePtr{$tag} and ref $$tagTablePtr{$tag} eq 'HASH') {
@@ -532,8 +532,8 @@ sub ValidateOffsetInfo($$$;$)
         while (@offsets) {
             my $start = pop @offsets;
             my $end = $start + pop @sizes;
-            $et->WarnOnce("$dirName:$$offsets[0]{Name} is zero", $minor) if $start == 0;
-            $et->WarnOnce("$dirName:$$sizes[0]{Name} is zero", $minor) if $start == $end;
+            $et->Warn("$dirName:$$offsets[0]{Name} is zero", $minor) if $start == 0;
+            $et->Warn("$dirName:$$sizes[0]{Name} is zero", $minor) if $start == $end;
             next unless $end > $fileSize;
             if ($start >= $fileSize) {
                 if ($start == 0xffffffff) {

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

@@ -387,8 +387,8 @@ sub ValidateImageData($$$;$)
             }
             push @bitsPerSample, $bitsPerSample[0] while @bitsPerSample < $samplesPerPix;
             foreach (@bitsPerSample) {
-                $et->WarnOnce("$dirName BitsPerSample values are different", $minor) if $_ ne $bitsPerSample[0];
-                $et->WarnOnce("Invalid $dirName BitsPerSample value", $minor) if $_ < 1 or $_ > 32;
+                $et->Warn("$dirName BitsPerSample values are different", $minor) if $_ ne $bitsPerSample[0];
+                $et->Warn("Invalid $dirName BitsPerSample value", $minor) if $_ < 1 or $_ > 32;
             }
         }
         my $bitsPerPixel = 0;

data/bin/lib/Image/ExifTool/WriteQuickTime.pl

@@ -339,7 +339,7 @@ sub FormatQTValue($$;$$)
         $flags = 0x01;  # UTF8
         $$valPt = $et->Encode($$valPt, 'UTF8');
     }
-    defined $$valPt or $et->WarnOnce("Error converting value for $$tagInfo{Name}");
+    defined $$valPt or $et->Warn("Error converting value for $$tagInfo{Name}");
     return $flags;
 }
 
@@ -482,23 +482,26 @@ sub WriteKeys($$$)
 sub WriteItemInfo($$$)
 {
     my ($et, $dirInfo, $outfile) = @_;
-    my $boxPos = $$dirInfo{BoxPos};     # hash of [length,position] for each box
+    my $boxPos = $$dirInfo{BoxPos}; # hash of [position,length,irefVer(iref only)] for box in $outfile
     my $raf = $$et{RAF};
     my $items = $$et{ItemInfo};
-    my (%did, @mdatEdit, $name);
+    my (%did, @mdatEdit, $name, $tmap);
 
     return () unless $items and $raf;
 
     # extract information from EXIF/XMP metadata items
     my $primary = $$et{PrimaryItem};
     my $curPos = $raf->Tell();
+    my $lastID = 0;
     my $id;
     foreach $id (sort { $a <=> $b } keys %$items) {
+        $lastID = $id;
         $primary = $id unless defined $primary; # assume primary is lowest-number item if pitm missing
         my $item = $$items{$id};
         # only edit primary EXIF/XMP metadata
         next unless $$item{RefersTo} and $$item{RefersTo}{$primary};
         my $type = $$item{ContentType} || $$item{Type} || next;
+        $tmap = $id if $type eq 'tmap'; # save ID of primary 'tmap' item (tone-mapped image)
         # get ExifTool name for this item
         $name = { Exif => 'EXIF', 'application/rdf+xml' => 'XMP' }->{$type};
         next unless $name;  # only care about EXIF and XMP
@@ -548,7 +551,7 @@ sub WriteItemInfo($$$)
                 $buff = $v2;
                 $wasDeflated = 1;
             } else {
-                $et->WarnOnce("Error inflating $name metadata");
+                $et->Warn("Error inflating $name metadata");
                 next;
             }
         }
@@ -683,7 +686,7 @@ sub WriteItemInfo($$$)
                 # write compressed XMP if Compress option is set
                 if ($et->Options('Compress') and length $newVal) {
                     if (not eval { require Compress::Zlib }) {
-                        $et->WarnOnce('Install Compress::Zlib to write compressed metadata');
+                        $et->Warn('Install Compress::Zlib to write compressed metadata');
                     } else {
                         my $deflate = Compress::Zlib::deflateInit();
                         if ($deflate) {
@@ -700,8 +703,10 @@ sub WriteItemInfo($$$)
                 $type = "Exif\0";
                 $mime = '';
             }
-            my $id = 1;
-            ++$id while $$items{$id} or $usedID{$id};   # find next unused item ID
+            my $id = ++$lastID; # use next highest available ID (so ID's in iinf are in order)
+            #[retracted] # create new item information hash to save infe box in case we need it for sorting
+            #[retracted] my $item = $$items{$id} = { };
+            # add new infe entry to iinf box
             my $n = length($type) + length($mime) + length($enc) + 16;
             if ($id < 0x10000) {
                 $add{iinf} .= pack('Na4CCCCnn', $n, 'infe', 2, 0, 0, 1, $id, 0) . $type . $mime . $enc;
@@ -709,11 +714,14 @@ sub WriteItemInfo($$$)
                 $n += 2;
                 $add{iinf} .= pack('Na4CCCCNn', $n, 'infe', 3, 0, 0, 1, $id, 0) . $type . $mime . $enc;
             }
-            # add new cdsc to iref
+            #[retracted] $add{iinf} .= $$item{infe};
+            # add new cdsc to iref (also refer to primary 'tmap' if it exists)
             if ($irefVer) {
-                $add{iref} .= pack('Na4NnN', 18, 'cdsc', $id, 1, $primary);
+                my ($fmt, $siz, $num) = defined $tmap ? ('N', 22, 2) : ('', 18, 1);
+                $add{iref} .= pack('Na4NnN'.$fmt, $siz, 'cdsc', $id, $num, $primary, $tmap);
             } else {
-                $add{iref} .= pack('Na4nnn', 14, 'cdsc', $id, 1, $primary);
+                my ($fmt, $siz, $num) = defined $tmap ? ('n', 16, 2) : ('', 14, 1);
+                $add{iref} .= pack('Na4nnn'.$fmt, $siz, 'cdsc', $id, $num, $primary, $tmap);
             }
             # add new entry to iloc table (see ISO14496-12:2015 pg.79)
             my $ilocVer = Get8u($outfile, $$boxPos{iloc}[0] + 8);
@@ -778,8 +786,9 @@ sub WriteItemInfo($$$)
         my $added = 0;
         my $tag;
         foreach $tag (sort { $$boxPos{$a}[0] <=> $$boxPos{$b}[0] } keys %$boxPos) {
+            $$boxPos{$tag}[0] += $added;
             next unless $add{$tag};
-            my $pos = $$boxPos{$tag}[0] + $added;
+            my $pos = $$boxPos{$tag}[0];
             unless ($$boxPos{$tag}[1]) {
                 $tag eq 'iref' or $et->Error('Internal error adding iref box'), last;
                 # create new iref box
@@ -826,9 +835,34 @@ sub WriteItemInfo($$$)
             }
             # add new entries to this box (or add pitm after hdlr)
             substr($$outfile, $pos + $$boxPos{$tag}[1], 0) = $add{$tag};
+            $$boxPos{$tag}[1] += length $add{$tag};
             $added += length $add{$tag};    # positions are shifted by length of new entries
         }
     }
+    #[This sorting idea was retracted because just sorting 'iinf' wasn't sufficient to
+    # repair the problem where an out-of-order ID was added -- Apple Preview still
+    # ignores the gain-map image.  It looks like either or both 'iref' and 'iloc' must
+    # also be sorted by ID, although the spec doesn't mention this]
+    #[retracted] # sort infe entries in iinf box if necessary
+    #[retracted] if ($$et{ItemsNotSorted}) {
+    #[retracted]     if ($$boxPos{iinf}) {
+    #[retracted]         my $iinfVer = Get8u($outfile, $$boxPos{iinf}[0] + 8);
+    #[retracted]         my $off = $iinfVer == 0 ? 14 : 16;  # offset to first infe item
+    #[retracted]         my $sorted = '';    # sorted iinf payload
+    #[retracted]         $sorted .= $$items{$_}{infe} || '' foreach sort { $a <=> $b } keys %$items;
+    #[retracted]         if (length $sorted == $$boxPos{iinf}[1]-$off) {
+    #[retracted]             # replace with sorted infe entries
+    #[retracted]             substr($$outfile, $$boxPos{iinf}[0] + $off, length $sorted) = $sorted;
+    #[retracted]             $et->Warn('Item info entries are out of order. Fixed.');
+    #[retracted]             ++$$et{CHANGED};
+    #[retracted]         } else {
+    #[retracted]             $et->Warn('Error sorting item info entries');
+    #[retracted]         }
+    #[retracted]     } else {
+    #[retracted]         $et->Warn('Item info entries are out of order');
+    #[retracted]     }
+    #[retracted]     delete $$et{ItemsNotSorted};
+    #[retracted] }
     delete $$et{ItemInfo};
     return @mdatEdit ? \@mdatEdit : undef;
 }
@@ -973,7 +1007,7 @@ sub WriteQuickTime($$$)
                     $et->Error('End of processing at large atom (LargeFileSupport not enabled)');
                     last;
                 } elsif ($et->Options('LargeFileSupport') eq '2') {
-                    $et->WarnOnce('Processing large atom (LargeFileSupport is 2)');
+                    $et->Warn('Processing large atom (LargeFileSupport is 2)');
                 }
             }
             $size = $hi * 4294967296 + $lo - 16;
@@ -1129,7 +1163,7 @@ sub WriteQuickTime($$$)
                 next;
             }
         }
-        undef $tagInfo if $tagInfo and $$tagInfo{Unknown};
+        undef $tagInfo if $tagInfo and $$tagInfo{AddedUnknown};
 
         if ($tagInfo and (not defined $$tagInfo{Writable} or $$tagInfo{Writable})) {
             my $subdir = $$tagInfo{SubDirectory};

data/bin/lib/Image/ExifTool/WriteXMP.pl

@@ -112,7 +112,7 @@ sub ValidateProperty($$;$)
                             my $valLang = $$et{XmpValidateLangAlt} || ($$et{XmpValidateLangAlt} = { });
                             $$valLang{$langPath} or $$valLang{$langPath} = { };
                             if ($$valLang{$langPath}{$lang}) {
-                                $et->WarnOnce("Duplicate language ($lang) in lang-alt list: $langPath");
+                                $et->Warn("Duplicate language ($lang) in lang-alt list: $langPath");
                             } else {
                                 $$valLang{$langPath}{$lang} = 1;
                             }
@@ -984,7 +984,7 @@ sub WriteXMP($$;$)
                         (not @fixInfo or $fixInfo[0] ne $info);
                     pop @props;
                 }
-                $et->WarnOnce("Error finding parent structure for $$tagInfo{Name}") unless @fixInfo;
+                $et->Warn("Error finding parent structure for $$tagInfo{Name}") unless @fixInfo;
             }
             # fix property path for this tag (last in the @fixInfo list)
             push @fixInfo, $tagInfo unless @fixInfo and $isStruct;

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

@@ -1299,10 +1299,10 @@ sub SetNewValuesFromFile($$;@)
                     ExtractEmbedded FastScan Filter FixBase Geolocation GeolocAltNames
                     GeolocFeature GeolocMinPop GeolocMaxDist GlobalTimeShift HexTagIDs
                     IgnoreGroups IgnoreMinorErrors IgnoreTags ImageHashType Lang
-                    LargeFileSupport ListItem ListSep MDItemTags MissingTagValue NoPDFList
-                    NoWarning Password PrintConv QuickTimeUTC RequestTags SaveFormat SavePath
-                    ScanForXMP StructFormat SystemTags TimeZone Unknown UserParam Validate
-                    WindowsLongPath WindowsWideFile XAttrTags XMPAutoConv))
+                    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{$_});
         }
@@ -1749,7 +1749,7 @@ GNV_TagInfo:    foreach $tagInfo (@tagInfoList) {
                 my $err = &$checkProc($self, $tagInfo, \$val);
                 if ($err or not defined $val) {
                     $err or $err = 'Error generating raw value';
-                    $self->WarnOnce("$err for $$tagInfo{Name}");
+                    $self->Warn("$err for $$tagInfo{Name}");
                     @$vals = ();
                     last;
                 }
@@ -1769,7 +1769,7 @@ GNV_TagInfo:    foreach $tagInfo (@tagInfoList) {
                 # an empty warning ("\n") ignores tag with no error
                 if ($evalWarning ne "\n") {
                     my $err = CleanWarning() . " in $$tagInfo{Name} (RawConvInv)";
-                    $self->WarnOnce($err);
+                    $self->Warn($err);
                 }
                 @$vals = ();
                 last;
@@ -1953,8 +1953,8 @@ sub SetFileModifyDate($$;$$$)
     }
     my ($aTime, $mTime, $cTime);
     if ($tag eq 'FileCreateDate') {
-        eval { require Win32::API } or $self->WarnOnce("Install Win32::API to set $tag"), return -1;
-        eval { require Win32API::File } or $self->WarnOnce("Install Win32API::File to set $tag"), return -1;
+        eval { require Win32::API } or $self->Warn("Install Win32::API to set $tag"), return -1;
+        eval { require Win32API::File } or $self->Warn("Install Win32API::File to set $tag"), return -1;
         $cTime = $val;
     } else {
         $aTime = $mTime = $val;
@@ -2151,7 +2151,7 @@ sub SetSystemTags($$)
             $self->VerboseValue('+ FilePermissions', $perm);
             $result = 1;
         } else {
-            $self->WarnOnce('Error setting FilePermissions');
+            $self->Warn('Error setting FilePermissions');
             $result = -1;
         }
     }
@@ -2165,7 +2165,7 @@ sub SetSystemTags($$)
             $self->VerboseValue('+ FileGroupID', $gid) if $gid >= 0;
             $result = 1;
         } else {
-            $self->WarnOnce('Error setting FileGroup/UserID');
+            $self->Warn('Error setting FileGroup/UserID');
             $result = -1 unless $result;
         }
     }
@@ -2181,7 +2181,7 @@ sub SetSystemTags($$)
             $result = $res if $res == 1 or not $result;
             last;
         } elsif ($tag ne 'FileCreateDate') {
-            $self->WarnOnce('Can only set MDItem tags on MacOS');
+            $self->Warn('Can only set MDItem tags on MacOS');
             last;
         }
     }
@@ -4266,7 +4266,7 @@ sub WriteDirectory($$$;$)
                 # allow MakerNotes to be deleted from ExifIFD of CR3 file
                 not ($self->IsRawType() == 2 and $parent eq 'ExifIFD'))
             {
-                $self->WarnOnce("Can't delete $1 from $$self{FileType}",1);
+                $self->Warn("Can't delete $1 from $$self{FileType}",1);
                 undef $grp1;
             } elsif (not $blockExifTypes{$$self{FILE_TYPE}}) {
                 # restrict delete logic to prevent entire tiff image from being killed
@@ -4993,7 +4993,7 @@ my $strptimeLib; # strptime library name if available
 sub InverseDateTime($$;$$)
 {
     my ($self, $val, $tzFlag, $dateOnly) = @_;
-    my ($rtnVal, $tz);
+    my ($rtnVal, $tz, $fs);
     my $fmt = $$self{OPTIONS}{DateFormat};
     # strip off timezone first if it exists
     if (not $fmt and $val =~ s/([-+])(\d{1,2}):?(\d{2})\s*(DST)?$//i) {
@@ -5019,8 +5019,17 @@ sub InverseDateTime($$;$$)
                 $strptimeLib = '';
             }
         }
-        # handle factional seconds (%f), but only at the end of the string
-        my $fs = ($fmt =~ s/%f$// and $val =~ s/(\.\d+)\s*$//) ? $1 : '';
+        # handle fractional seconds (%f) and time zone (%z)
+        ($fs, $tz) = ('', '');
+        if ($fmt =~ /%(f|:?z)/) {
+            if ($fmt =~ s/(.*[^%])%f/$1/) {
+                $fs = $2 if $val =~ s/(.*)(\.\d+)/$1/;  # (take last .### as fractional seconds)
+            }
+            if ($fmt =~ s/(.*[^%])%(:?)z/$1/) {
+                my $colon = $2;
+                $tz = "$2:$3" if $val =~ s/(.*)([-+]\d{2})$colon(\d{2})/$1/;
+            }
+        }
         my ($lib, $wrn, @a);
 TryLib: for ($lib=$strptimeLib; ; $lib='') {
             # handle %s format ourself (not supported in Fedora, see forum15032)
@@ -5065,7 +5074,7 @@ TryLib: for ($lib=$strptimeLib; ; $lib='') {
                     $a[$i] = "0$a[$i]"; # pad to 2 digits if necessary
                 }
             }
-            $val = join(':', @a[5,4,3]) . ' ' . join(':', @a[2,1,0]) . $fs;
+            $val = join(':', @a[5,4,3]) . ' ' . join(':', @a[2,1,0]) . $fs . $tz;
             last;
         }
     }
@@ -5077,7 +5086,9 @@ TryLib: for ($lib=$strptimeLib; ; $lib='') {
             my $ss = $a[4];             # get SS
             push @a, '00' while @a < 5; # add MM, SS if not given
             # get sub-seconds if they exist (must be after SS, and have leading ".")
-            my $fs = (@a > 5 and $val =~ /(\.\d+)\s*$/) ? $1 : '';
+            unless ($fmt) {
+                $fs = (@a > 5 and $val =~ /(\.\d+)\s*$/) ? $1 : '';
+            }
             # add/remove timezone if necessary
             if ($tzFlag) {
                 if (not $tz) {
@@ -6430,7 +6441,7 @@ sub WriteJPEG($$)
                                 # warn of subsequent XMP blocks specifying a different
                                 # HasExtendedXMP (have never seen this)
                                 if ($goodGuid and $goodGuid ne $2) {
-                                    $self->WarnOnce('Multiple XMP segments specifying different extended XMP GUID');
+                                    $self->Warn('Multiple XMP segments specifying different extended XMP GUID');
                                 }
                                 $goodGuid = $2; # GUID for the standard extended XMP
                             }
@@ -6578,7 +6589,7 @@ sub WriteJPEG($$)
                         undef $$segDataPt;
                         next Marker;
                     } elsif (defined $chunkNum) {
-                        $self->WarnOnce('Invalid or extraneous ICC_Profile chunk(s)');
+                        $self->Warn('Invalid or extraneous ICC_Profile chunk(s)');
                         # fall through to preserve this extra profile...
                     }
                 } elsif ($$segDataPt =~ /^FPXR\0/) {
@@ -6985,9 +6996,9 @@ sub SetFileTime($$;$$$$)
     # on Windows, try to work around incorrect file times when daylight saving time is in effect
     if ($^O eq 'MSWin32') {
         if (not eval { require Win32::API }) {
-            $self->WarnOnce('Install Win32::API for proper handling of Windows file times');
+            $self->Warn('Install Win32::API for proper handling of Windows file times');
         } elsif (not eval { require Win32API::File }) {
-            $self->WarnOnce('Install Win32API::File for proper handling of Windows file times');
+            $self->Warn('Install Win32API::File for proper handling of Windows file times');
         } else {
             # get Win32 handle, needed for SetFileTime
             my $win32Handle = eval { Win32API::File::GetOsFHandle($file) };

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

@@ -2849,7 +2849,7 @@ sub FullEscapeXML($)
     $str =~ s/\\/\/sg;                  # escape backslashes too
     # then use C-escape sequences for invalid characters
     if ($str =~ /[\0-\x1f]/ or Image::ExifTool::IsUTF8(\$str) < 0) {
-        $str =~ s/([\0-\x1f\x80-\xff])/sprintf("\\x%.2x",ord $1)/sge;
+        $str =~ s/([\0-\x1f\x7f-\xff])/sprintf("\\x%.2x",ord $1)/sge;
     }
     return $str;
 }
@@ -3630,9 +3630,9 @@ NoLoop:
         }
         if ($$et{XmpValidate} and $fmt and $fmt eq 'boolean' and $val!~/^True|False$/) {
             if ($val =~ /^true|false$/) {
-                $et->WarnOnce("Boolean value for XMP-$ns:$$tagInfo{Name} should be capitalized",1);
+                $et->Warn("Boolean value for XMP-$ns:$$tagInfo{Name} should be capitalized",1);
             } else {
-                $et->WarnOnce(qq(Boolean value for XMP-$ns:$$tagInfo{Name} should be "True" or "False"),1);
+                $et->Warn(qq(Boolean value for XMP-$ns:$$tagInfo{Name} should be "True" or "False"),1);
             }
         }
         # protect against large binary data in unknown tags
@@ -3823,7 +3823,7 @@ sub ParseXMPElement($$$;$$$$)
                         $stdNS = $uri2ns{$try};
                         if ($stdNS) {
                             $val = $try;
-                            $et->WarnOnce("Fixed incorrect URI for xmlns:$ns", 1);
+                            $et->Warn("Fixed incorrect URI for xmlns:$ns", 1);
                         } elsif ($val =~ m(^http://ns.nikon.com/BASIC_PARAM)) {
                             $et->OverrideFileType('NXD','application/x-nikon-nxd');
                         } else {
@@ -3904,9 +3904,9 @@ sub ParseXMPElement($$$;$$$$)
             if ($nItems == 1000) {
                 my ($tg,$ns) = GetXMPTagID($propList);
                 if ($isWriting) {
-                    $et->WarnOnce("Excessive number of items for $ns:$tg. Processing may be slow", 1);
+                    $et->Warn("Excessive number of items for $ns:$tg. Processing may be slow", 1);
                 } elsif (not $$et{OPTIONS}{IgnoreMinorErrors}) {
-                    $et->WarnOnce("Extracted only 1000 $ns:$tg items. Ignore minor errors to extract all", 2);
+                    $et->Warn("Extracted only 1000 $ns:$tg items. Ignore minor errors to extract all", 2);
                     last;
                 }
             }
@@ -4006,12 +4006,12 @@ sub ParseXMPElement($$$;$$$$)
                 } elsif ($$et{XmpAbout} ne $attrs{$shortName}) {
                     if ($isWriting) {
                         my $str = "Different 'rdf:about' attributes not handled";
-                        unless ($$et{WARNED_ONCE}{$str}) {
+                        unless ($$et{WAS_WARNED}{$str}) {
                             $et->Error($str, 1);
-                            $$et{WARNED_ONCE}{$str} = 1;
+                            $$et{WAS_WARNED}{$str} = 1;
                         }
                     } elsif ($$et{XmpValidate}) {
-                        $et->WarnOnce("Different 'rdf:about' attributes");
+                        $et->Warn("Different 'rdf:about' attributes");
                     }
                 }
             }

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

@@ -330,7 +330,7 @@ sub ProcessRAR($$)
                     $et->Warn('Large block encountered. Aborting.');
                     last;
                 } elsif ($et->Options('LargeFileSupport') eq '2') {
-                    $et->WarnOnce('Processing large block (LargeFileSupport is 2)');
+                    $et->Warn('Processing large block (LargeFileSupport is 2)');
                 }
             }
             # process the block