exiftool_vendored 13.04.0 → 13.08.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 374e7e5a3d68eeca0ec6cb6a40919d056e0731958606daa8bed45a7c4c70daba
-  data.tar.gz: 1263e0b2b35852265b4d5352eae7f35d12cffe0277f916799a8498c75482a9be
+  metadata.gz: 53adc02bd5bb808506a883f10c449fd0172d7d82c099a4c5d5a4dbbcb9971d68
+  data.tar.gz: 76a6795061f0128324568a9907804699dd0635e94bc7042bf5ba1cb3c40c92e2
 SHA512:
-  metadata.gz: 7b5d47b1383f939d76af17239fb4f1e1a486ae619b0d728a010bde7e8ed044de0bfc93d755f8c0a22dfa098ddf997d84f1d7a3f562f07153d1486eee68744929
-  data.tar.gz: b8ba0c1b6c02546df4e54c6d5c4fe072cbb98bc4b6c5b1d0f1ac323ded4ca43e06ff5bcaaaf879005d37533df86f53262cba0dd87d1a09684f360a50a6d4834c
+  metadata.gz: bd68829340a5e18d410b4485e0789bef799d78d2fb7d6ff49612fa4a596b918c86b3515c2cd0ef0d90a0a04c72403a7a2113b86d882c93d5a4e0495d01573bbd
+  data.tar.gz: d44cfcbc7dd21d7e74bc26ea46fcdf19f724ccffcb08e7375f21ae58f1544fcc753804348bb61f3dc706b984e5b8bdc43437f296e85a7e8767c1a168be879df9

data/bin/Changes

@@ -7,6 +7,52 @@ RSS feed: https://exiftool.org/rss.xml
 Note: The most recent production release is Version 13.00. (Other versions are
 considered development releases, and are not uploaded to MetaCPAN.)
 
+Dec. 14, 2024 - Version 13.08
+
+  - Decode ShutterCount for Canon EOS R6 Mark II (thanks Agoston Kapitany)
+  - Decode a few new Photoshop tags
+  - Suppress all duplicate Warning tags and add count to end of message
+  - Changed format of bitmask keys in -list x output
+  - Internal streamlining of LIGOGPSINFO decoding
+  - Fixed issue where some tags were incorrectly shown as writable in -listx
+    output
+  - Fixed incorrect scaling for GPSSpeed in one LIGOGPSINFO variant
+  - Fixed an issue with filename encoding when the -L option is used and the API
+    WindowsLongPath option is active
+
+Dec. 11, 2024 - Version 13.07
+
+  - Decode a number of LIGOGPSINFO encrypted and enciphered timed GPS types
+    (long overdue, but it took me a couple of years to acquire enough sample
+    videos to have a good cross-section of the different formats)
+  - Fixed another place where FileSequence could be incremented twice when a -if
+    condition was used
+  - Fixed a few places where character 0x7f may not have been escaped in string
+    values
+  - API Changes:
+      - Changed default WindowsLongPath option back to 1 after adding a patch to
+        fix issue with piping from stdin
+
+Dec. 5, 2024 - Version 13.06
+
+  - Decode timed metadata from MP4 videos of yet another dashcam model
+  - Patched issue where FileSequence could increment twice for each file when a
+    -if condition was used
+  - API Changes:
+      - Revert default WindowsLongPath option to the pre-13.05 setting
+        until we can solve the pipe problem
+
+Dec. 4, 2024 - Version 13.05
+
+  - Added a new SonyModelID
+  - Added support for XMP HDRGainMap and apdi namespaces
+  - Decode DJI timed djmd and dbgi protobuf-format metadata
+  - Decode APP10 AROT HDRGainCurve and APP2 URN UniformResourceName
+  - Decode a couple of new GoPro tags
+  - API Changes:
+      - Changed default WindowsLongPath option to 1 (please report if this
+        causes any problems)
+
 Nov. 26, 2024 - Version 13.04
 
   - Added the ability to write GPSDOP and GPSMeasureMode from the -geotag option
@@ -21,6 +67,8 @@ Nov. 26, 2024 - Version 13.04
   - Renamed an Unknown Photoshop tag
   - Convert GoPro GPSSpeed and GPSSpeed3D from m/s to km/h
   - Patched to tolerate XML header in DOCX xml files
+  - Fixed incorrect file offsets for tags in some embedded files of -htmldump
+    output
   - Fixed -htmldump output to show the same names for unknown EXIF tags as with
     the -u option
 

data/bin/MANIFEST

@@ -397,6 +397,7 @@ lib/Image/ExifTool/PhotoMechanic.pm
 lib/Image/ExifTool/Photoshop.pm
 lib/Image/ExifTool/PostScript.pm
 lib/Image/ExifTool/PrintIM.pm
+lib/Image/ExifTool/Protobuf.pm
 lib/Image/ExifTool/Qualcomm.pm
 lib/Image/ExifTool/QuickTime.pm
 lib/Image/ExifTool/QuickTimeStream.pl

data/bin/META.json

@@ -50,5 +50,5 @@
       }
    },
    "release_status" : "stable",
-   "version" : "13.04"
+   "version" : "13.08"
 }

data/bin/META.yml

@@ -31,4 +31,4 @@ recommends:
   Time::HiRes: '0'
 requires:
   perl: '5.004'
-version: '13.04'
+version: '13.08'

data/bin/README

@@ -109,8 +109,8 @@ your home directory, then you would type the following commands in a
 terminal window to extract and run ExifTool:
 
   cd ~/Desktop
-  gzip -dc Image-ExifTool-13.04.tar.gz | tar -xf -
-  cd Image-ExifTool-13.04
+  gzip -dc Image-ExifTool-13.08.tar.gz | tar -xf -
+  cd Image-ExifTool-13.08
   ./exiftool t/images/ExifTool.jpg
 
 Note:  These commands extract meta information from one of the test images. 

data/bin/exiftool

@@ -11,7 +11,7 @@ use strict;
 use warnings;
 require 5.004;
 
-my $version = '13.04';
+my $version = '13.08';
 
 # add our 'lib' directory to the include list BEFORE 'use Image::ExifTool'
 my $exePath;
@@ -1918,7 +1918,7 @@ if (@dbKeys) {
                     print $vout "Imported entry for '${_}' (full path: '${absPath}')\n";
                 }
             } elsif ($verbose and $verbose > 1) {
-                print $vout "Imported entry for '${_}' (non-existent file)\n";
+                print $vout "Imported entry for '${_}' (no full path)\n";
             }
         }
     }
@@ -2172,7 +2172,11 @@ sub GetImageInfo($$)
         }
         # can't make use of $info if verbose because we must reprocess
         # the file anyway to generate the verbose output
-        undef $info if $verbose or defined $fastCondition or defined $diff;
+        # (also if writing just to avoid double-incrementing FileSequence)
+        if ($isWriting or $verbose or defined $fastCondition or defined $diff) {
+            undef $info;
+            --$$et{FILE_SEQUENCE};
+        }
     } elsif ($file =~ s/^(\@JSON:)(.*)/$1/) {
         # read JSON file from command line
         my $dat = $2;
@@ -3636,7 +3640,7 @@ sub EscapeJSON($;$)
     if ($json < 2) { # JSON
         $str =~ tr/\0//d;   # remove all nulls
         # escape other control characters with \u
-        $str =~ s/([\0-\x1f])/sprintf("\\u%.4X",ord $1)/sge;
+        $str =~ s/([\0-\x1f\x7f])/sprintf("\\u%.4X",ord $1)/sge;
         # JSON strings must be valid UTF8
         Image::ExifTool::XMP::FixUTF8(\$str) unless $altEnc;
     } else { # PHP
@@ -3644,7 +3648,7 @@ sub EscapeJSON($;$)
         # must escape "$" too for PHP
         $str =~ s/\$/\\\$/sg;
         # escape other control characters with \x
-        $str =~ s/([\0-\x1f])/sprintf("\\x%.2X",ord $1)/sge;
+        $str =~ s/([\0-\x1f\x7f])/sprintf("\\x%.2X",ord $1)/sge;
     }
     return '"' . $str . '"';    # return the quoted string
 }
@@ -4163,11 +4167,12 @@ sub ScanDir($$;$)
     }
     $dir =~ /\/$/ or $dir .= '/';   # make sure directory name ends with '/'
     foreach $file (@fileList) {
+        next if $file eq '.' or $file eq '..';
         my $path = "$dir$file";
         if ($et->IsDirectory($path)) {
             next unless $recurse;
             # ignore directories starting with "." by default
-            next if $file =~ /^\./ and ($recurse == 1 or $file eq '.' or $file eq '..');
+            next if $file =~ /^\./ and $recurse == 1;
             next if $ignore{$file} or ($ignore{SYMLINKS} and -l $path);
             ScanDir($et, $path, $list);
             last if $end;
@@ -4315,14 +4320,15 @@ sub AbsPath($)
 {
     my $file = shift;
     my $path;
-    if (defined $file and eval { require Cwd }) {
-        $path = eval { Cwd::abs_path($file) };
-        # make the delimiters and case consistent
-        # (abs_path is very inconsistent about what it returns in Windows)
-        if (defined $path and Image::ExifTool::IsPC()) {
-            $path =~ tr/\\/\//;
-            $path = lc $path;
+    if (defined $file) {
+        return undef if $file eq '*';   # (CSV SourceFile may be '*' -- no absolute path for that)
+        if ($^O eq 'MSWin32' and $mt->Options('WindowsLongPath')) {
+            $path = $mt->WindowsLongPath($file);
+        } elsif (eval { require Cwd }) {
+            local $SIG{'__WARN__'} = sub { };
+            $path = eval { Cwd::abs_path($file) };
         }
+        $path =~ tr/\\/\// if $^O eq 'MSWin32' and defined $path;   # use forward slashes
     }
     return $path;
 }
@@ -5907,7 +5913,7 @@ with this command:
 
 produces output like this:
 
-    -- Generated by ExifTool 13.04 --
+    -- Generated by ExifTool 13.08 --
     File: a.jpg - 2003:10:31 15:44:19
     (f/5.6, 1/60s, ISO 100)
     File: b.jpg - 2006:05:23 11:57:38
@@ -6022,7 +6028,8 @@ import).  May be combined with B<-s> to print tag names instead of
 descriptions, or B<-S> to print tag values only, tab-delimited on a single
 line.  The B<-t> option may be combined with B<-j>, B<-php> or B<-X> to add
 tag table information (C<table>, tag C<id>, and C<index> for cases where
-multiple conditional tags exist with the same ID).
+multiple conditional tags exist with the same ID), which allows the
+corresponding tag to be located in the B<-listx> output.
 
 =item B<-T> (B<-table>)
 
@@ -6781,14 +6788,14 @@ written (provided they can be calculated from the track log, and they are
 supported by the destination metadata format):  GPSLatitude, GPSLatitudeRef,
 GPSLongitude, GPSLongitudeRef, GPSAltitude, GPSAltitudeRef, GPSDateStamp,
 GPSTimeStamp, GPSDateTime, GPSTrack, GPSTrackRef, GPSSpeed, GPSSpeedRef,
-GPSImgDirection, GPSImgDirectionRef, GPSPitch, GPSRoll, GPSCoordinates,
-AmbientTemperature and CameraElevationAngle.  By default, in image files
-tags are created in EXIF, and updated in XMP only if they already exist.  In
-QuickTime-format files GPSCoordinates is created in the preferred location
-(ItemList by default) as well as in XMP.  However, C<EXIF:Geotime>,
-C<XMP:Geotime> or C<QuickTime:Geotime> may be specified to write to write
-only to one group. Also, C<ItemList:Geotime>, C<Keys:Geotime> or
-C<UserData:Geotime> may be used to write to a specific location in
+GPSImgDirection, GPSImgDirectionRef, GPSMeasureMode, GPSDOP, GPSPitch,
+GPSRoll, GPSCoordinates, AmbientTemperature and CameraElevationAngle.  By
+default, in image files tags are created in EXIF, and updated in XMP only if
+they already exist.  In QuickTime-format files GPSCoordinates is created in
+the preferred location (ItemList by default) as well as in XMP.  However,
+C<EXIF:Geotime>, C<XMP:Geotime> or C<QuickTime:Geotime> may be specified to
+write to write only to one group. Also, C<ItemList:Geotime>, C<Keys:Geotime>
+or C<UserData:Geotime> may be used to write to a specific location in
 QuickTime-format files.  Note that GPSPitch and GPSRoll are non-standard,
 and require user-defined tags in order to be written.
 

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

@@ -231,7 +231,7 @@ sub ProcessAIFF($$)
                     $et->Warn('End of processing at large chunk (LargeFileSupport not enabled)');
                     last;
                 } elsif ($et->Options('LargeFileSupport') eq '2') {
-                    $et->WarnOnce('Skipping large chunk (LargeFileSupport is 2)');
+                    $et->Warn('Skipping large chunk (LargeFileSupport is 2)');
                 }
             }
             if ($tagInfo) {

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

@@ -217,7 +217,7 @@ sub ProcessAPE($$)
             $val = \$buf2;
             # extract cover art description separately (hackitty hack)
             if ($tag =~ /^Cover Art/) {
-                $buf2 =~ s/^([\x20-\x7f]*)\0//;
+                $buf2 =~ s/^([\x20-\x7e]*)\0//;
                 if ($1) {
                     my $t = "$tag Desc";
                     my $v = $1;

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

@@ -781,7 +781,7 @@ sub ProcessASF($$;$)
                 $err = 'Invalid ASF object size';
             } elsif ($et->Options('LargeFileSupport')) {
                 if ($et->Options('LargeFileSupport') eq '2') {
-                    $et->WarnOnce('Skipping large ASF object (LargeFileSupport is 2)');
+                    $et->Warn('Skipping large ASF object (LargeFileSupport is 2)');
                 }
                 if ($raf->Seek($size, 1)) {
                     $et->VPrint(0, "  Skipped large ASF object ($size bytes)\n");

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

@@ -35,7 +35,7 @@ use Image::ExifTool::Sony;
 use Image::ExifTool::Validate;
 use Image::ExifTool::MacOS;
 
-$VERSION = '3.58';
+$VERSION = '3.59';
 @ISA = qw(Exporter);
 
 sub NumbersFirst($$);
@@ -869,7 +869,8 @@ sub new
         my $processBinaryData = ($$table{PROCESS_PROC} and (
             $$table{PROCESS_PROC} eq \&Image::ExifTool::ProcessBinaryData or
             $$table{PROCESS_PROC} eq \&Image::ExifTool::Nikon::ProcessNikonEncrypted or
-            $$table{PROCESS_PROC} eq \&Image::ExifTool::Sony::ProcessEnciphered));
+            $$table{PROCESS_PROC} eq \&Image::ExifTool::Sony::ProcessEnciphered) or
+            $$table{VARS} and $$table{VARS}{IS_BINARY});
         if ($$vars{ID_LABEL} or $processBinaryData) {
             my $s = $$table{FORMAT} ? Image::ExifTool::FormatSize($$table{FORMAT}) || 1 : 1;
             $binaryTable = 1;
@@ -1248,7 +1249,7 @@ TagID:  foreach $tagID (@keys) {
                                     }
                                 } elsif ($$tagInfo{PrintString} or not /^[+-]?(?=\d|\.\d)\d*(\.\d*)?$/) {
                                     # translate unprintable values
-                                    if ($index =~ s/([\x00-\x1f\x80-\xff])/sprintf("\\x%.2x",ord $1)/eg) {
+                                    if ($index =~ s/([\x00-\x1f\x7f-\xff])/sprintf("\\x%.2x",ord $1)/eg) {
                                         $index = qq{"$index"};
                                     } else {
                                         $index = qq{'${index}'};

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

@@ -88,7 +88,7 @@ sub ProcessCTMD($$$);
 sub ProcessExifInfo($$$);
 sub SwapWords($);
 
-$VERSION = '4.85';
+$VERSION = '4.86';
 
 # Note: Removed 'USM' from 'L' lenses since it is redundant - PH
 # (or is it?  Ref 32 shows 5 non-USM L-type lenses)
@@ -1404,6 +1404,11 @@ my %offOn = ( 0 => 'Off', 1 => 'On' );
             Condition => '$$self{Model} =~ /\bEOS R[56]$/',
             SubDirectory => { TagTable => 'Image::ExifTool::Canon::CameraInfoR6' },
         },
+        {
+            Name => 'CanonCameraInfoR6m2',
+            Condition => '$$self{Model} =~ /\bEOS R6m2$/',
+            SubDirectory => { TagTable => 'Image::ExifTool::Canon::CameraInfoR6m2' },
+        },
         {
             Name => 'CanonCameraInfoG5XII',
             Condition => '$$self{Model} =~ /\bG5 X Mark II$/',
@@ -4752,6 +4757,19 @@ my %ciMaxFocal = (
     # 0x0bb7 - counts down during focus stack (ref forum16111)
 );
 
+%Image::ExifTool::Canon::CameraInfoR6m2 = (
+    %binaryDataAttrs,
+    FIRST_ENTRY => 0,
+    PRIORITY => 0,
+    GROUPS => { 0 => 'MakerNotes', 2 => 'Camera' },
+    NOTES => 'CameraInfo tags for the EOS R6 Mark II.',
+    0x0d29 => { #AgostonKapitany
+        Name => 'ShutterCount',
+        Format => 'int32u',
+        Notes => 'includes electronic + mechanical shutter',
+    },
+);
+
 # ref https://exiftool.org/forum/index.php?topic=15356.0
 %Image::ExifTool::Canon::CameraInfoG5XII = (
     %binaryDataAttrs,

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

@@ -15,11 +15,11 @@ use Image::ExifTool qw(:DataAccess :Utils);
 use Image::ExifTool::Exif;
 use Image::ExifTool::XMP;
 use Image::ExifTool::GPS;
+use Image::ExifTool::Protobuf;
 
-$VERSION = '1.09';
+$VERSION = '1.10';
 
 sub ProcessDJIInfo($$$);
-sub Process_djmd($$$);
 
 my %convFloat2 = (
     PrintConv => 'sprintf("%+.2f", $val)',
@@ -187,34 +187,96 @@ my %convFloat2 = (
     },
 );
 
-# TODO - eventually add ability to decode this?
-%Image::ExifTool::DJI::djmd = (
-    PROCESS_PROC => \&Process_djmd,
+# metadata in protobuf format (djmd and dbgi meta types, ref PH)
+%Image::ExifTool::DJI::Protobuf = (
+    GROUPS => { 0 => 'Protobuf', 1 => 'DJI', 2 => 'Location' },
+    TAG_PREFIX => '',
+    PROCESS_PROC => \&Image::ExifTool::Protobuf::ProcessProtobuf,
+    NOTES => q{
+        Tags found in protobuf-format DJI meta djmd and dbgi timed metadata.  Only a
+        few tags are currently known, but unknown djmd tags may be extracted by
+        setting the Unknown option to 1 (or 2 to also extract unknown dbgi debug
+        tags).  Tag ID's are composed of the corresponding .proto file name combined
+        with the hierarchical protobuf field numbers.  The "dvtm_AVATA2.proto" file
+        is used by the DJI Avanta 2, and "dvtm_ac203.proto" by the OsmoAction4.
+    },
+    Protocol => { },
+   # dvtm_ac203_1-1-6 - some version number
+    'dvtm_ac203_1-1-10' => 'Model',
+    'dvtm_ac203_2-3-1' => { Name => 'FrameWidth',  Format => 'unsigned' },
+    'dvtm_ac203_2-3-2' => { Name => 'FrameHeight', Format => 'unsigned' },
+    'dvtm_ac203_2-3-3' => { Name => 'FrameRate',   Format => 'float' },
+   # dvtm_ac203_3-4-1-4 - model code?
+    'dvtm_ac203_3-4-2-1-1' => {
+        Name => 'CoordinateUnits',
+        Format  => 'unsigned',
+        # don't extract this -- just convert to degrees
+        RawConv => '$$self{CoordUnits} = $val; undef',
+        Hidden => 1,
+        # PrintConv => { 0 => 'Radians', 1 => 'Degrees' },
+    },
+    'dvtm_ac203_3-4-2-1-2' => {
+        Name => 'GPSLatitude',
+        Format => 'double',
+        # set ExifTool GPSLatitude/GPSLongitude members so GPSDateTime will be generated if necessary
+        RawConv => '$$self{GPSLatitude} = $$self{CoordUnits} ? $val : $val * 180 / 3.141592653589793', # (NC)
+        PrintConv => 'Image::ExifTool::GPS::ToDMS($self, $val, 1, "N")',
+    },
+    'dvtm_ac203_3-4-2-1-3' => {
+        Name => 'GPSLongitude',
+        Format => 'double',
+        RawConv => '$$self{GPSLongitude} = $$self{CoordUnits} ? $val : $val * 180 / 3.141592653589793', # (NC)
+        PrintConv => 'Image::ExifTool::GPS::ToDMS($self, $val, 1, "E")',
+    },
+    'dvtm_ac203_3-4-2-2' => {
+        Name => 'GPSAltitude',
+        Format => 'unsigned',
+        ValueConv => '$val / 1000',
+    },
+    'dvtm_ac203_3-4-2-6-1' => {
+        Name => 'GPSDateTime',
+        Format => 'string',
+        Groups => { 2 => 'Time' },
+        RawConv => '$$self{GPSDateTime} = $val',
+        ValueConv => '$val =~ tr/-/:/; $val',
+        PrintConv => '$self->ConvertDateTime($val)',
+    },
+   # dvtm_AVATA2_1-1-2 - some version number
+   # dvtm_AVATA2_1-1-3 - some version number
+    'dvtm_AVATA2_1-1-10' => 'Model',
+    'dvtm_AVATA2_2-2-3-1' => 'SerialNumber', # (NC)
+    'dvtm_AVATA2_2-3-1' => { Name => 'FrameWidth',  Format => 'unsigned' },
+    'dvtm_AVATA2_2-3-2' => { Name => 'FrameHeight', Format => 'unsigned' },
+    'dvtm_AVATA2_2-3-3' => { Name => 'FrameRate',   Format => 'float' },
+   # dvtm_AVATA2_3-1-1 - frame number (starting at 1)
+    'dvtm_AVATA2_3-1-2' => { # (also 3-2-1-6 and 3-4-1-6)
+        Name => 'TimeStamp',
+        Format => 'unsigned',
+        # milliseconds, but I don't know what the zero is
+        ValueConv => '$val / 1e6',
+    },
+   # dvtm_AVATA2_3-2-1-4 - model code?
+   # dvtm_AVATA2_3-4-1-4 - model code?
+    'dvtm_AVATA2_3-4-4-1-1' => { # (NC) (default seems to be radians if missing)
+        Name => 'CoordinateDegrees',
+        Format  => 'unsigned',
+        RawConv => '$$self{CoordDegrees} = $val; undef',
+        Hidden => 1,
+    },
+    'dvtm_AVATA2_3-4-4-1-2' => {
+        Name => 'GPSLatitude',
+        Format => 'double',
+        RawConv => '$$self{GPSLatitude} = $$self{CoordDegrees} ? $val : $val * 180 / 3.141592653589793', # (NC)
+        PrintConv => 'Image::ExifTool::GPS::ToDMS($self, $val, 1, "N")',
+    },
+    'dvtm_AVATA2_3-4-4-1-3' => {
+        Name => 'GPSLongitude',
+        Format => 'double',
+        RawConv => '$$self{GPSLongitude} = $$self{CoordDegrees} ? $val : $val * 180 / 3.141592653589793', # (NC)
+        PrintConv => 'Image::ExifTool::GPS::ToDMS($self, $val, 1, "E")',
+    },
 );
 
-#------------------------------------------------------------------------------
-# Process DJI djmd timed data from Action4 videos (ref PH)
-# Inputs: 0) ExifTool ref, 1) dirInfo ref, 2) tag table ref
-# Returns: 1 on success
-# TODO: work in progress
-sub Process_djmd($$$)
-{
-    my ($et, $dirInfo, $tagTbl) = @_;
-    my $dataPt = $$dirInfo{DataPt};
-    my ($pos, $bit, $val) = (6, 0, 0);
-    for (;;) {
-        my $v = Get8u($dataPt, $pos);
-        $val += ($v & 0x7f) << $bit;
-        last unless $v & 0x80;
-        ++$pos;
-        $bit += 7;
-    }
-    $pos += 49;
-    my @a = unpack("x${pos}fxfxfxfx3fxfxf", $$dataPt);
-    print "$val @a\n";
-    return 1;
-}
-
 #------------------------------------------------------------------------------
 # Process DJI info (ref PH)
 # Inputs: 0) ExifTool ref, 1) dirInfo ref, 2) tag table ref
@@ -233,7 +295,7 @@ sub ProcessDJIInfo($$$)
     while ($$dataPt =~ /\G\[(.*?)\](?=(\[|$))/sg) {
         my ($tag, $val) = split /:/, $1, 2;
         next unless defined $tag and defined $val;
-        if ($val =~ /^([\x20-\x7f]+)\0*$/) {
+        if ($val =~ /^([\x20-\x7e]+)\0*$/) {
             $val = $1;
         } else {
             my $buff = $val;

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

@@ -6186,7 +6186,7 @@ sub ProcessExif($$$)
     if ($$dirInfo{DirName} eq 'MakerNotes' and $$et{FileType} eq 'CR3' and
         $$dirInfo{Parent} and $$dirInfo{Parent} eq 'ExifIFD')
     {
-        $et->WarnOnce("MakerNotes shouldn't exist ExifIFD of CR3 image", 1);
+        $et->Warn("MakerNotes shouldn't exist ExifIFD of CR3 image", 1);
     }
     # set flag to calculate image data hash if requested
     $doHash = 1 if $$et{ImageDataHash} and (($$et{FILE_TYPE} eq 'TIFF' and not $base and not $inMakerNotes) or
@@ -6656,7 +6656,7 @@ sub ProcessExif($$$)
             if ($count > 500 and $formatStr !~ /^(undef|string|binary)$/ and
                 (not $tagInfo or $$tagInfo{LongBinary} or $warned) and not $$et{OPTIONS}{IgnoreMinorErrors})
             {
-                $et->WarnOnce('Not decoding some large array(s). Ignore minor errors to decode', 2) unless $warned;
+                $et->Warn('Not decoding some large array(s). Ignore minor errors to decode', 2) unless $warned;
                 next if $$et{TAGS_FROM_FILE};   # don't generate bogus value when copying tags
                 $val = "(large array of $count $formatStr values)";
             } else {

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

@@ -61,7 +61,7 @@ sub ProcessFITS($$)
         my $key = substr($buff, 0, 8);
         $key =~ s/ +$//;    # remove trailing space from key
         if ($key eq 'CONTINUE') {
-            defined $continue or $et->WarnOnce('Unexpected FITS CONTINUE keyword'), next;
+            defined $continue or $et->Warn('Unexpected FITS CONTINUE keyword'), next;
         } else {
             if (defined $continue) {
                 # the previous value wasn't continued, so store with the trailing '&'
@@ -104,7 +104,7 @@ sub ProcessFITS($$)
             # check for possible continuation, removing trailing '&'
             $val =~ s/\&$// and $continue = $val, next;
         } elsif (defined $continue) {
-            $et->WarnOnce('Invalid FITS CONTINUE value');
+            $et->Warn('Invalid FITS CONTINUE value');
             next;
         } else {
             $val =~ s/ *(\/.*)?$//;     # remove trailing spaces and comment

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

@@ -244,7 +244,7 @@ sub WriteFLIF($$)
                     }
                 }
             } else {
-                $et->WarnOnce('Install IO::Compress::RawDeflate to write FLIF metadata');
+                $et->Warn('Install IO::Compress::RawDeflate to write FLIF metadata');
             }
             Write($outfile, $tag, SetVarInt(length $buff), $buff) or return -1;
         } elsif (not defined $soi) {
@@ -301,7 +301,7 @@ sub ProcessFLIF($$)
                     $et->Warn("Error inflating FLIF $tag chunk");
                 }
             } else {
-                $et->WarnOnce('Install IO::Uncompress::RawInflate to decode FLIF metadata');
+                $et->Warn('Install IO::Uncompress::RawInflate to decode FLIF metadata');
             }
         } else {
             $raf->Seek($size, 1) or $et->Warn('Seek error'), last;

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

@@ -1449,7 +1449,7 @@ sub ReadFPXValue($$$$$;$$)
                 $noPad = 1;     # values sometimes aren't padded inside vectors!!
                 my $size = $oleFormatSize{VT_VECTOR};
                 if ($valPos + $size > $dirEnd) {
-                    $et->WarnOnce('Incorrect FPX VT_VECTOR size');
+                    $et->Warn('Incorrect FPX VT_VECTOR size');
                     last;
                 }
                 $count = Get32u($dataPt, $valPos);
@@ -1457,14 +1457,14 @@ sub ReadFPXValue($$$$$;$$)
                 $valPos += 4;
             } else {
                 # can't yet handle this property flag
-                $et->WarnOnce('Unknown FPX property');
+                $et->Warn('Unknown FPX property');
                 last;
             }
         }
         unless ($format =~ /^VT_/) {
             my $size = Image::ExifTool::FormatSize($format) * $count;
             if ($valPos + $size > $dirEnd) {
-                $et->WarnOnce("Incorrect FPX $format size");
+                $et->Warn("Incorrect FPX $format size");
                 last;
             }
             @vals = ReadValue($dataPt, $valPos, $format, $count, $size);
@@ -1476,7 +1476,7 @@ sub ReadFPXValue($$$$$;$$)
         my ($item, $val, $len);
         for ($item=0; $item<$count; ++$item) {
             if ($valPos + $size > $dirEnd) {
-                $et->WarnOnce("Truncated FPX $format value");
+                $et->Warn("Truncated FPX $format value");
                 last;
             }
             # sometimes VT_VECTOR items are padded to even 4-byte boundaries, and sometimes they aren't
@@ -1528,7 +1528,7 @@ sub ReadFPXValue($$$$$;$$)
                 $len = Get32u($dataPt, $valPos);
                 $len *= 2 if $format eq 'VT_LPWSTR';    # convert to byte count
                 if ($valPos + $len + 4 > $dirEnd) {
-                    $et->WarnOnce("Truncated $format value");
+                    $et->Warn("Truncated $format value");
                     last;
                 }
                 $val = substr($$dataPt, $valPos + 4, $len);
@@ -1551,7 +1551,7 @@ sub ReadFPXValue($$$$$;$$)
             } elsif ($format eq 'VT_BLOB' or $format eq 'VT_CF') {
                 my $len = Get32u($dataPt, $valPos); # (use local $len because we always expect padding)
                 if ($valPos + $len + 4 > $dirEnd) {
-                    $et->WarnOnce("Truncated $format value");
+                    $et->Warn("Truncated $format value");
                     last;
                 }
                 $val = substr($$dataPt, $valPos + 4, $len);
@@ -1627,7 +1627,7 @@ sub ProcessContents($$$)
             while ($$dataPt =~ /\x0bTargetRole1(?:.\x80|\xff\xff.\0.\0Vn(\w+))\0\0\x01.{4}(.{24})/sg) {
                 my ($index, @coords) = unpack('Vx4V4', $2);
                 next if $index == 0xffffffff;
-                $$et{IeImg_lkup}{$index} and $et->WarnOnce('Duplicate image index');
+                $$et{IeImg_lkup}{$index} and $et->Warn('Duplicate image index');
                 $$et{IeImg_lkup}{$index} = "@coords";
                 $$et{IeImg_class}{$index} = $1 if $1;
             }
@@ -1661,7 +1661,7 @@ sub ProcessWordDocument($$$)
     my $dirLen = length $$dataPt;
     # validate the FIB signature
     unless ($dirLen > 2 and Get16u($dataPt,0) == 0xa5ec) {
-        $et->WarnOnce('Invalid FIB signature', 1);
+        $et->Warn('Invalid FIB signature', 1);
         return 0;
     }
     $et->ProcessBinaryData($dirInfo, $tagTablePtr); # process FIB
@@ -2098,7 +2098,7 @@ sub ProcessFPXR($$$)
                 my $overlap = length($$obj{Stream}) - $offset;
                 my $start = $dirStart + 13;
                 if ($overlap < 0 or $dirLen - $overlap < 13) {
-                    $et->WarnOnce("Bad FPXR stream $index offset",1);
+                    $et->Warn("Bad FPXR stream $index offset",1);
                 } else {
                     # ignore any overlapping data in this segment
                     # (this seems to be the convention)
@@ -2338,7 +2338,7 @@ sub ProcessFPX($$)
         $tag =~ s/\0.*//s;  # truncate at null (in case length was wrong)
 
         if ($tag eq '0' and not defined $ee) {
-            $et->WarnOnce('Use the ExtractEmbedded option to extract embedded information', 3);
+            $et->Warn('Use the ExtractEmbedded option to extract embedded information', 3);
         }
         my $sect = Get32u(\$dir, $pos + 0x74);  # start sector number
         my $size = Get32u(\$dir, $pos + 0x78);  # stream length
@@ -2441,7 +2441,7 @@ sub ProcessFPX($$)
                 my $subTablePtr = GetTagTable($$subdir{TagTable});
                 $et->ProcessDirectory(\%dirInfo, $subTablePtr,  $$subdir{ProcessProc});
             } elsif (defined $size and $size > length($buff)) {
-                $et->WarnOnce('Truncated object');
+                $et->Warn('Truncated object');
             } else {
                 $buff = substr($buff, 0, $size) if defined $size and $size < length($buff);
                 if ($tag =~ /^IeImg_0*(\d+)$/) {

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

@@ -405,7 +405,7 @@ sub ProcessOTF($$)
             next;
         }
         if ($verbose) {
-            $tag =~ s/([\0-\x1f\x80-\xff])/sprintf('\x%.2x',ord $1)/ge;
+            $tag =~ s/([\0-\x1f\x7f-\xff])/sprintf('\x%.2x',ord $1)/ge;
             my $str = sprintf("%s%d) Tag '%s' (offset 0x%.4x, %d bytes)\n",
                               $$et{INDENT}, $pos/16, $tag, $offset, $size);
             $et->VPrint(0, $str);