exiftool_vendored 12.99.0 → 13.02.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 857ae11921e86ed35a6ca857a912acf876501c139db5e5646b08ebab6a30d02c
-  data.tar.gz: 27bb568a8097d27f5519718fc010df5acddc3976d465bb872492f4bb29f03e7f
+  metadata.gz: 3b02d7fc208b8d2296a64a11ab1c08e1a82eb9d2f3e04443dcef0b2c0cd0a7d6
+  data.tar.gz: 02d7d674c3975c9462c8adfc139e81c692c5f4a1d5dc298a5b83e1f9c1a4def0
 SHA512:
-  metadata.gz: a60c7457c7f88cff4e5f7c78c95463f9f04961ccb67e318518c0b5d86fb9782f043dc422155e33e7309f6e1db3567545d5aab6a597c764f40ec642dde0973c10
-  data.tar.gz: e97a2b5852aa0fd3b8debe38ff11abe65c3850a681526cb40aa65e03dafabcdc0560371b544218918a32221a314b08c5fd0041184a5dcfe7b8f76ad26f9ea537
+  metadata.gz: 04f78c57d35f72c974d88c53b3a900ccd3f25528b5506e6b5b6fb4f9f9b73f509d01b740184e24bc9f445cee9cde5cfd0fefa71b628497bbbf2c20ef142fe723
+  data.tar.gz: 8db5ada7fdd6e765139fbda15720cf1bbf5fb61b015055a9249d18270bc05849aa79ddf20d4107e5de1d4260e68ece57a05d730449cb0b5c3aa1f3fb8b5fbc40

data/bin/Changes

@@ -4,9 +4,62 @@ ExifTool Version History
 
 RSS feed: https://exiftool.org/rss.xml
 
-Note: The most recent production release is Version 12.76. (Other versions are
+Note: The most recent production release is Version 13.00. (Other versions are
 considered development releases, and are not uploaded to MetaCPAN.)
 
+Nov. 5, 2024 - Version 13.02
+
+  - Enhanced -j -l output to add optional "fmt" and "hex" fields
+  - Enhanced -geotag option to support Android "Export Timeline data" JSON
+    format
+  - Changed ProductVersion of Windows launcher to match ExifTool version
+  - Patched to use empty group name instead of "Copy0" for family 4 group name
+    of missing tag when the -f option is used
+  - Patched to avoid showing "Unknown" for group of primary tag when -g4 or -G4
+    was used with the -j or -csv option
+  - Patched to avoid using Encode module in Windows because it can hang if run
+    from a working directory with a long path name
+  - Patched to use -csv output if -j also used
+  - Fixed problem setting FileCreateDate on MacOS Sequoia if the date/time
+    contains a time zone
+  - Fixed problem in -csv output when combined with -g
+  - API Changes:
+      - Added BinVal option
+
+Nov. 1, 2024 - Version 13.01
+
+  - NOTE: Please test the new API WindowsLongPath option because the idea is to
+    enable this by default if everything works out well
+  - Fixed bug which could result in runtime warning if when API IgnoreTags
+    option is set to "all" when reading a TXT file format
+  - Fixed problem reading some information from LNK files
+  - Fixed verbose output to show "Binary data" message for SCALAR values
+  - Fixed bug where part of the hex dump from a -v3 output could go to stdout
+    instead of the file specified by a -w option
+  - API Changes:
+      - Added WindowsLongPath option for testing
+      - Changed CharsetFileName option to automatically assume UTF8 if the file
+        name contains special characters and is valid UTF8
+
+Oct. 29, 2024 - Version 13.00 (production release)
+
+  - Added support for reading GPS from Autel Evo II drone videos
+  - Added a new PhaseOne RawFormat value
+  - Updated XMP-exifEX tags, exif2xmp.args and xmp2exif.args according to the
+    2024 EXIF for XMP specification
+  - Updated Geolocation databases from current geonames.org files
+  - Updated the MIME types for a couple of font formats
+  - Enhanced -diff option to work with -ec (C-style escape of special chars)
+  - Changed name of EXIF Title tag to ImageTitle to correspond with specifiation
+  - Reverted a geotag warning message to remove debugging information that was
+    added in version 12.67 and moved this information into a -v3 verbose message
+  - Patched Perl bug which gave "Can't spawn" warning in Windows if control-C
+    was pressed while displaying the exiftool application help
+  - Fixed API StructFormat JSONQ setting to properly quote values in structures
+  - Fixed incorrect AudioStreamType for M2TS videos containing a PGS stream
+  - Fixed -diff option so "same tags" messages are only shown when -v is added
+    (as per the documentation)
+
 Oct. 18, 2024 - Version 12.99
 
   - Added -diff option to compare the metadata in two files
@@ -23,8 +76,8 @@ Oct. 18, 2024 - Version 12.99
       - Structured values returned as HASH references with the Struct option may
         contain a new "_ordered_keys_" entry used to preserve the order of the
         entries
-      - Added the OrderedKeys method to
-        return the ordered or sorted keys from a returned structure value
+      - Added the OrderedKeys method to return the ordered or sorted keys from a
+        returned structure value
 
 Oct. 8, 2024 - Version 12.98
 

data/bin/META.json

@@ -50,5 +50,5 @@
       }
    },
    "release_status" : "stable",
-   "version" : "12.99"
+   "version" : "13.02"
 }

data/bin/META.yml

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

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-12.99.tar.gz | tar -xf -
-  cd Image-ExifTool-12.99
+  gzip -dc Image-ExifTool-13.02.tar.gz | tar -xf -
+  cd Image-ExifTool-13.02
   ./exiftool t/images/ExifTool.jpg
 
 Note:  These commands extract meta information from one of the test images. 

data/bin/arg_files/exif2xmp.args

@@ -13,6 +13,7 @@
 #               2015/01/12 - PH Avoid copying to non-standard namespaces
 #               2018/05/07 - PH Added support for GPSDestXxxRef tags
 #               2022/03/31 - PH IPTC Photometadata Mapping Guidelines 2202.1 update
+#               2024/10/24 - PH Additions for the 2024 EXIF for XMP spec
 #
 # References:   http://www.metadataworkinggroup.org/specs/
 #               https://iptc.org/std/photometadata/documentation/mappingguidelines/
@@ -50,4 +51,7 @@
 -XMP:GPSDestLatitude < Composite:GPSDestLatitude
 -XMP:GPSDestLongitude < Composite:GPSDestLongitude
 -XMP:GPSDateTime < Composite:GPSDateTime
+# new for the 2024 EXIF for XMP specification
+-XMP-exifEX:PhotographicSensitivity < EXIF:ISO
+-XMP-exif:DateTimeDigitized < EXIF:CreateDate
 # end

data/bin/arg_files/xmp2exif.args

@@ -17,6 +17,7 @@
 #               2022/03/31 - PH IPTC Photometadata Mapping Guidelines 2202.1 update
 #               2023/01/30 - PH Also write Composite:SubSecDateTimeOriginal from
 #                               XMP-exif:DateTimeOriginal
+#               2024/10/24 - PH Additions for the 2024 EXIF for XMP spec
 #
 # References:   http://www.metadataworkinggroup.org/specs/
 #               https://iptc.org/std/photometadata/documentation/mappingguidelines/
@@ -36,6 +37,9 @@
 -EXIF:all < XMP-tiff:all
 -EXIF:ImageDescription < XMP-dc:Description
 -EXIF:DateTimeOriginal < XMP-photoshop:DateCreated
+# new for the 2024 EXIF for XMP specification
+-EXIF:ISO < XMP-exifEX:PhotographicSensitivity
+-EXIF:CreateDate < XMP-exif:DateTimeDigitized
 # the following SubSec tags also write/delete the corresponding EXIF
 # SubSecTime and OffsetTime tags as appropriate
 -Composite:SubSecDateTimeOriginal < XMP-exif:DateTimeOriginal

data/bin/exiftool

@@ -11,7 +11,7 @@ use strict;
 use warnings;
 require 5.004;
 
-my $version = '12.99';
+my $version = '13.02';
 
 # add our 'lib' directory to the include list BEFORE 'use Image::ExifTool'
 my $exePath;
@@ -63,6 +63,7 @@ sub AddSetTagsFile($;$);
 sub Warning($$);
 sub DoSetFromFile($$$);
 sub CleanFilename($);
+sub HasWildcards($);
 sub SetWindowTitle($);
 sub ProcessFiles($;$);
 sub ScanDir($$;$);
@@ -856,7 +857,7 @@ for (;;) {
         } else {
             print "Available API Options:\n";
             my $availableOptions = Image::ExifTool::AvailableOptions();
-            printf("  %-17s - %s\n", $$_[0], $$_[2]) foreach @$availableOptions;
+            $$_[3] or printf("  %-17s - %s\n", $$_[0], $$_[2]) foreach @$availableOptions;
             $helped = 1;
         }
         next;
@@ -1039,7 +1040,7 @@ for (;;) {
         }
         $trkfile or Error("Expecting file name for -geotag option\n"), $badCmd=1, next;
         # allow wildcards in filename
-        if ($trkfile =~ /[*?]/) {
+        if (HasWildcards($trkfile)) {
             # CORE::glob() splits on white space, so use File::Glob if possible
             my @trks;
             if ($^O eq 'MSWin32' and eval { require Win32::FindFile }) {
@@ -1425,7 +1426,7 @@ for (;;) {
         push @nextPass, $_;
         next;
     }
-    if ($doGlob and /[*?]/) {
+    if ($doGlob and HasWildcards($_)) {
         if ($^O eq 'MSWin32' and eval { require Win32::FindFile }) {
             push @files, FindFileWindows($mt, $_);
         } else {
@@ -1522,6 +1523,7 @@ if (($tagOut or defined $diff) and ($csv or $json or %printFmt or $tabFormat or
 }
 
 if ($csv and $csv eq 'CSV' and not $isWriting) {
+    undef $json;    # (not compatible)
     if ($textOut) {
         Warn "Sorry, -w may not be combined with -csv\n";
         $rtnVal = 1;
@@ -1802,7 +1804,7 @@ if ($binaryOutput) {
 }
 
 # sort by groups to look nicer depending on options
-if (defined $showGroup and not (@tags and $allGroup) and ($sortOpt or not defined $sortOpt)) {
+if (defined $showGroup and not (@tags and ($allGroup or $csv)) and ($sortOpt or not defined $sortOpt)) {
     $mt->Options(Sort => "Group$showGroup");
 }
 
@@ -1840,7 +1842,7 @@ $altEnc = $mt->Options('Charset');
 undef $altEnc if $altEnc eq 'UTF8';
 
 # set flag to fix description lengths if necessary
-if (not $altEnc and $mt->Options('Lang') ne 'en' and eval { require Encode }) {
+if (not $altEnc and $mt->Options('Lang') ne 'en') {
     # (note that Unicode::GCString is part of the Unicode::LineBreak package)
     $fixLen = eval { require Unicode::GCString } ? 2 : 1;
 }
@@ -2378,7 +2380,7 @@ sub GetImageInfo($$)
                     $done2{$t2} = 1;
                 }
                 my $str = '';
-                ($v > 1 or $same) and $str = "  ($same same tag" . ($same==1 ? '' : 's') . ')';
+                $v and ($same or $v > 1) and $str = "  ($same same tag" . ($same==1 ? '' : 's') . ')';
                 if (not $allGroup) {
                     print $fp "---- $g2 ----$str\n" if $g2 and ($str or @diffs);
                 } elsif ($str and $g2) {
@@ -2418,12 +2420,12 @@ sub GetImageInfo($$)
                     $grp .= ' ' x (15 - length($grp)) if length($grp) < 15 and $outFormat < 2;
                     push @diffs, sprintf "< %s %s%s: %s\n", $grp, $name, $pad, Printable($val);
                     if (defined $val2) {
-                        $v < 3 and $grp = ' ' x length($grp), $name = ' ' x $len;
+                        $grp = ' ' x length($grp), $name = ' ' x $len if $v < 3;
                         push @diffs, sprintf "> %s %s%s: %s\n", $grp, $name, $pad, Printable($val2);
                     }
                 } else {
                     push @diffs, sprintf "< %s%s: %s\n", $name, $pad, Printable($val);
-                    $v < 3 and $name = ' ' x $len;
+                    $name = ' ' x $len if $v < 3;
                     push @diffs, sprintf "> %s%s  %s\n", $name, $pad, Printable($val2) if defined $val2;
                 }
             }
@@ -2621,7 +2623,13 @@ TAG:    foreach $tag (@foundTags) {
                 # (note that the tag key may look like "TAG #(1)" when the "#" feature is used)
                 next if $noDups and $tag =~ /^(.*?) ?\(/ and defined $$info{$1} and
                         $group eq $et->GetGroup($1, $showGroup);
-                $group = 'Unknown' if not $group and ($xml or $json or $csv);
+                if (not $group and ($xml or $json or $csv)) {
+                    if ($showGroup !~ /\b4\b/) {
+                        $group = 'Unknown';
+                    } elsif ($json and not $allGroup) {
+                        $group = 'Copy0';
+                    }
+                }
                 if ($fp and not ($allGroup or $csv)) {
                     if ($lastGroup ne $group) {
                         if ($html) {
@@ -2843,6 +2851,9 @@ TAG:    foreach $tag (@foundTags) {
                             my $num = $et->GetValue($tag, 'ValueConv');
                             $$val{num} = $num if defined $num and not IsEqual($num, $$val{val});
                         }
+                        my $ex = $$et{TAG_EXTRA}{$tag};
+                        $$val{'hex'} = join ' ', unpack '(H2)*', $$ex{BinVal} if defined $$ex{BinVal};
+                        $$val{'fmt'} = $$ex{G6} if defined $$ex{G6};
                     }
                 }
                 FormatJSON($fp, $val, $ind, $quote);
@@ -3638,7 +3649,7 @@ sub FormatJSON($$$;$)
             print $fp $bra;
             foreach (@$val) {
                 print $fp ',' if $comma;
-                FormatJSON($fp, $_, $ind);
+                FormatJSON($fp, $_, $ind, $quote);
                 $comma = 1,
             }
             print $fp $ket,
@@ -3654,7 +3665,7 @@ sub FormatJSON($$$;$)
             if ($showTagID and $_ eq 'id' and $showTagID eq 'H' and $$val{$_} =~ /^\d+\.\d+$/) {
                 print $fp qq{"$$val{$_}"};
             } else {
-                FormatJSON($fp, $$val{$_}, "$ind  ");
+                FormatJSON($fp, $$val{$_}, "$ind  ", $quote);
             }
             $comma = 1,
         }
@@ -3820,7 +3831,14 @@ sub Printable($)
             $val = '(Binary data '.length($$val).' bytes)';
         }
     }
-    $val =~ tr/\0-\x1f\x7f/./;  # translate unprintable characters
+    if ($escapeC) {
+        $val =~ s/([\0-\x1f\\\x7f])/$escC{$1} || sprintf('\x%.2x', ord $1)/eg;
+    } else {
+        # translate unprintable chars in value and remove trailing spaces
+        $val =~ tr/\x01-\x1f\x7f/./;
+        $val =~ s/\x00//g;
+        $val =~ s/\s+$//;
+    }
     return $val;
 }
 
@@ -3831,17 +3849,23 @@ sub Printable($)
 sub LengthUTF8($)
 {
     my $str = shift;
+    return length $str unless $fixLen;
+    local $SIG{'__WARN__'} = sub { };
+    if (not $$mt{OPTIONS}{EncodeHangs} and eval { require Encode }) {
+        $str = Encode::decode_utf8($str);
+    } else {
+        $str = pack('U0C*', unpack 'C*', $str);
+    }
     my $len;
-    if (not $fixLen) {
+    if ($fixLen == 1) {
         $len = length $str;
-    } elsif ($fixLen == 1) {
-        $len = length Encode::decode_utf8($str);
     } else {
-        my $gcstr = eval { Unicode::GCString->new(Encode::decode_utf8($str)) };
+        my $gcstr = eval { Unicode::GCString->new($str) };
         if ($gcstr) {
             $len = $gcstr->columns;
         } else {
-            $len = length Encode::decode_utf8($str);
+            $len = length $str;
+            delete $SIG{'__WARN__'};
             Warning($mt, 'Unicode::GCString problem.  Columns may be misaligned');
             $fixLen = 1;
         }
@@ -3944,6 +3968,19 @@ sub CleanFilename($)
     $_[0] =~ tr/\\/\// if Image::ExifTool::IsPC();
 }
 
+#------------------------------------------------------------------------------
+# Does path name contain wildcards
+# Inputs: 0) path name
+# Returns: true if path contains wildcards
+sub HasWildcards($)
+{
+    my $path = shift;
+
+    # if this is a Windows path with the long path prefix, then wildcards are not supported
+    return 0 if $^O eq 'MSWin32' and $path =~ m{^[\\/]{2}\?[\\/]};
+    return $path =~ /[*?]/;
+}
+
 #------------------------------------------------------------------------------
 # Check for valid UTF-8 of a file name
 # Inputs: 0) string, 1) original encoding
@@ -4064,7 +4101,7 @@ sub ScanDir($$;$)
     return if $ignore{$dir};
     # use Win32::FindFile on Windows if available
     # (ReadDir will croak if there is a wildcard, so check for this)
-    if ($^O eq 'MSWin32' and $dir !~ /[*?]/) {
+    if ($^O eq 'MSWin32' and not HasWildcards($dir)) {
         undef $evalWarning;
         local $SIG{'__WARN__'} = sub { $evalWarning = $_[0] };;
         if (CheckUTF8($dir, $enc) >= 0) {
@@ -4190,7 +4227,7 @@ sub FindFileWindows($$)
     $wildfile = $et->Decode($wildfile, $enc, undef, 'UTF8') if $enc and $enc ne 'UTF8';
     $wildfile =~ tr/\\/\//; # use forward slashes
     my ($dir, $wildname) = ($wildfile =~ m{(.*[:/])(.*)}) ? ($1, $2) : ('', $wildfile);
-    if ($dir =~ /[*?]/) {
+    if (HasWildcards($dir)) {
         Warn "Wildcards don't work in the directory specification\n";
         return ();
     }
@@ -5130,13 +5167,13 @@ may be used to to indicate any XMP namespace (eg. C<--xmp-all:dabs>).
 Write a new value for the specified tag (eg. C<-comment=wow>), or delete the
 tag if no I<VALUE> is given (eg. C<-comment=>).  C<+=> and C<-=> are used to
 add or remove existing entries from a list, or to shift date/time values
-(see L<Image::ExifTool::Shift.pl|Image::ExifTool::Shift.pl> and note 6 below
-for more details).  C<+=> may also be used to increment numerical values (or
-decrement if I<VALUE> is negative), and C<-=> may be used to conditionally
-delete or replace a tag (see L</WRITING EXAMPLES> for examples).  C<^=> is
-used to write an empty string instead of deleting the tag when no I<VALUE>
-is given, but otherwise it is equivalent to C<=>.  (Note that the caret must
-be quoted on the Windows command line.)
+(see L<Image::ExifTool::Shift.pl|Image::ExifTool::Shift.pl> and notes 6 and
+7 below for more details).  C<+=> may also be used to increment numerical
+values (or decrement if I<VALUE> is negative), and C<-=> may be used to
+conditionally delete or replace a tag (see L</WRITING EXAMPLES> for
+examples).  C<^=> is used to write an empty string instead of deleting the
+tag when no I<VALUE> is given, but otherwise it is equivalent to C<=>. 
+(Note that the caret must be quoted on the Windows command line.)
 
 I<TAG> may contain one or more leading family 0, 1, 2 or 7 group names,
 prefixed by optional family numbers, and separated colons.  If no group name
@@ -5211,6 +5248,10 @@ tag, overriding any other values previously assigned to the tag on the same
 command line.  To shift a date/time value and copy it to another tag in the
 same operation, use the B<-globalTimeShift> option.
 
+7) The C<+=> operator may not be used to shift a List-type date/time tag
+(eg. XMP-dc:Date) because C<+=> is used to add elements to the list. 
+Instead, the B<-globalTimeShift> option should be used.
+
 Special feature:  Integer values may be specified in hexadecimal with a
 leading C<0x>, and simple rational values may be specified as fractions.
 
@@ -5671,16 +5712,17 @@ output as simple strings).  The B<-a> option is implied when B<-json> is
 used, but entries with identical JSON names are suppressed in the output. 
 (B<-G4> may be used to ensure that all tags have unique JSON names.)  Adding
 the B<-D> or B<-H> option changes tag values to JSON objects with "val" and
-"id" fields, and adding B<-l> adds a "desc" field, and a "num" field if the
-numerical value is different from the converted "val".  The B<-b> option may
-be added to output binary data, encoded in base64 if necessary (indicated by
-ASCII "base64:" as the first 7 bytes of the value), and B<-t> may be added
-to include tag table information (see B<-t> for details).  The JSON output
-is UTF-8 regardless of any B<-L> or B<-charset> option setting, but the
-UTF-8 validation is disabled if a character set other than UTF-8 is
-specified.  Note that ExifTool quotes JSON values only if they don't look
-like numbers (regardless of the original storage format or the relevant
-metadata specification).
+"id" fields.  Adding B<-l> adds a "desc" field, and a "num" field if the
+numerical value is different from the converted "val", and "fmt" and "hex"
+fields for EXIF metadata if the API SaveFormat and SaveBin options are set
+respectively.  The B<-b> option may be added to output binary data, encoded
+in base64 if necessary (indicated by ASCII "base64:" as the first 7 bytes of
+the value), and B<-t> may be added to include tag table information (see
+B<-t> for details).  The JSON output is UTF-8 regardless of any B<-L> or
+B<-charset> option setting, but the UTF-8 validation is disabled if a
+character set other than UTF-8 is specified.  Note that ExifTool quotes JSON
+values only if they don't look like numbers (regardless of the original
+storage format or the relevant metadata specification).
 
 If I<JSONFILE> is specified, the file is imported and the tag definitions
 from the file are used to set tag values on a per-file basis.  The special
@@ -5834,7 +5876,7 @@ with this command:
 
 produces output like this:
 
-    -- Generated by ExifTool 12.99 --
+    -- Generated by ExifTool 13.02 --
     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
@@ -6683,8 +6725,8 @@ The B<-g> and B<-G> options may be used to organize the output by the
 specified family of groups, with B<-G1> being the default.  The B<-a> option
 is implied.  Adding B<-v> includes a count of the number of tags that are
 the same in each group.  The following text formatting options are valid
-when B<-diff> is used: B<-c>, B<-charset>, B<-d>, B<-E>, B<-L>, B<-lang>,
-B<-n>, B<-s>, B<-sep>, B<-struct> and B<-w>.
+when B<-diff> is used: B<-c>, B<-charset>, B<-d>, B<-E>, B<-ec>, B<-ex>,
+B<-L>, B<-lang>, B<-n>, B<-s>, B<-sep>, B<-struct> and B<-w>.
 
 =item B<-geotag> I<TRKFILE>
 

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

@@ -16,7 +16,7 @@ use vars qw($VERSION);
 use Image::ExifTool qw(:DataAccess :Utils);
 use Image::ExifTool::JSON;
 
-$VERSION = '1.02';
+$VERSION = '1.03';
 
 sub ProcessCBOR($$$);
 sub ReadCBORValue($$$$);
@@ -160,6 +160,7 @@ sub ReadCBORValue($$$$)
             Start   => $dumpStart,
             DataPos => $$et{cbor_datapos},
             Prefix  => $$et{INDENT},
+            Out     => $et->Options('TextOut'),
         ) if $verbose > 2;
         while ($num) {
             $$et{cbor_pre} = "$i) ";
@@ -200,6 +201,7 @@ sub ReadCBORValue($$$$)
                 Start   => $dumpStart,
                 DataPos => $$et{cbor_datapos},
                 Prefix  => $$et{INDENT} . '  ',
+                Out     => $et->Options('TextOut'),
             ) if $verbose > 2;
         }
         # read next value (note: in the case of multiple tags,
@@ -259,6 +261,7 @@ sub ReadCBORValue($$$$)
         DataPos => $$et{cbor_datapos},
         Prefix  => $$et{INDENT} . '  ',
         MaxLen  => $verbose < 5 ? ($verbose == 3 ? 96 : 2048) : undef,
+        Out     => $et->Options('TextOut'),
     ) if $verbose > 2;
     return($val, $err, $pos);
 }

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

@@ -88,7 +88,7 @@ sub ProcessCTMD($$$);
 sub ProcessExifInfo($$$);
 sub SwapWords($);
 
-$VERSION = '4.82';
+$VERSION = '4.84';
 
 # Note: Removed 'USM' from 'L' lenses since it is redundant - PH
 # (or is it?  Ref 32 shows 5 non-USM L-type lenses)
@@ -9830,35 +9830,39 @@ sub LensWithTC($$)
 
 #------------------------------------------------------------------------------
 # Attempt to calculate sensor size for Canon cameras
-# Inputs: 0/1) rational values for FocalPlaneX/YResolution
+# Inputs: 0) ExifTool ref
 # Returns: Sensor diagonal size in mm, or undef
 # Notes: This algorithm is fairly reliable, but has been found to give incorrect
 #        values for some firmware versions of the EOS 20D, A310, SD40 and IXUS 65
 # (ref http://wyw.dcweb.cn/download.asp?path=&file=jhead-2.96-ccdwidth_hack.zip)
-sub CalcSensorDiag($$)
+sub CalcSensorDiag($)
 {
-    my ($xres, $yres) = @_;
-    # most Canon cameras store the sensor size in the denominator
-    if ($xres and $yres) {
-        # assumptions: 1) numerators are image width/height * 1000
-        # 2) denominators are sensor width/height in inches * 1000
-        my @xres = split /[ \/]/, $xres;
-        my @yres = split /[ \/]/, $yres;
-        # verify assumptions as best we can:
-            # numerators are always divisible by 1000
-        if ($xres[0] % 1000 == 0 and $yres[0] % 1000 == 0 and
-            # at least 640x480 pixels (DC models - PH)
-            $xres[0] >= 640000 and $yres[0] >= 480000 and
-            # ... but not too big!
-            $xres[0] < 10000000 and $yres[0] < 10000000 and
-            # minimum sensor size is 0.061 inches (DC models - PH)
-            $xres[1] >= 61 and $xres[1] < 1500 and
-            $yres[1] >= 61 and $yres[1] < 1000 and
-            # sensor isn't square (may happen if rationals have been reduced)
-            $xres[1] != $yres[1])
-        {
-            return sqrt($xres[1]*$xres[1] + $yres[1]*$yres[1]) * 0.0254;
-        }
+    my $et = shift;
+    # calculation is based on the rational value of FocalPlaneX/YResolution
+    # (most Canon cameras store the sensor size in the denominator)
+    return undef unless $$et{TAG_EXTRA}{FocalPlaneXResolution} and
+                        $$et{TAG_EXTRA}{FocalPlaneYResolution};
+    my $xres = $$et{TAG_EXTRA}{FocalPlaneXResolution}{Rational};
+    my $yres = $$et{TAG_EXTRA}{FocalPlaneYResolution}{Rational};
+    return undef unless $xres and $yres;
+    # assumptions: 1) numerators are image width/height * 1000
+    # 2) denominators are sensor width/height in inches * 1000
+    my @xres = split /[ \/]/, $xres;
+    my @yres = split /[ \/]/, $yres;
+    # verify assumptions as best we can:
+        # numerators are always divisible by 1000
+    if ($xres[0] % 1000 == 0 and $yres[0] % 1000 == 0 and
+        # at least 640x480 pixels (DC models - PH)
+        $xres[0] >= 640000 and $yres[0] >= 480000 and
+        # ... but not too big!
+        $xres[0] < 10000000 and $yres[0] < 10000000 and
+        # minimum sensor size is 0.061 inches (DC models - PH)
+        $xres[1] >= 61 and $xres[1] < 1500 and
+        $yres[1] >= 61 and $yres[1] < 1000 and
+        # sensor isn't square (may happen if rationals have been reduced)
+        $xres[1] != $yres[1])
+    {
+        return sqrt($xres[1]*$xres[1] + $yres[1]*$yres[1]) * 0.0254;
     }
     return undef;
 }
@@ -10251,7 +10255,11 @@ sub ProcessSerialData($$$)
             $et->ProcessDirectory(\%dirInfo, $subTablePtr);
         } elsif (not $$tagInfo{Unknown} or $unknown) {
             # don't extract zero-length information
-            $et->FoundTag($tagInfo, $val) if $count;
+            my $key = $et->FoundTag($tagInfo, $val) if $count;
+            if ($key) {
+                $$et{TAG_EXTRA}{$key}{G6} = $format if $$et{OPTIONS}{SaveFormat};
+                $$et{TAG_EXTRA}{$key}{BinVal} = substr($$dataPt, $pos+$offset, $len) if $$et{OPTIONS}{SaveBin};
+            }
         }
         $pos += $len;
     }
@@ -10448,6 +10456,7 @@ sub ProcessCTMD($$$)
             Start  => $pos + 6,
             Addr   => $$dirInfo{Base} + $pos + 6,
             Prefix => $$et{INDENT},
+            Out    => $et->Options('TextOut'),
         ) if $verbose > 2;
         if ($$tagTablePtr{$type}) {
             $et->HandleTag($tagTablePtr, $type, undef,

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

@@ -57,7 +57,7 @@ use vars qw($VERSION $AUTOLOAD @formatSize @formatName %formatNumber %intFormat
 use Image::ExifTool qw(:DataAccess :Utils);
 use Image::ExifTool::MakerNotes;
 
-$VERSION = '4.52';
+$VERSION = '4.53';
 
 sub ProcessExif($$$);
 sub WriteExif($$$);
@@ -2931,7 +2931,7 @@ my %opcodeInfo = (
     0xa433 => { Name => 'LensMake',         Writable => 'string' }, #24
     0xa434 => { Name => 'LensModel',        Writable => 'string' }, #24
     0xa435 => { Name => 'LensSerialNumber', Writable => 'string' }, #24
-    0xa436 => { Name => 'Title',            Writable => 'string', Avoid => 1 }, #33
+    0xa436 => { Name => 'ImageTitle',       Writable => 'string' }, #33
     0xa437 => { Name => 'Photographer',     Writable => 'string' }, #33
     0xa438 => { Name => 'ImageEditor',      Writable => 'string' }, #33
     0xa439 => { Name => 'CameraFirmware',          Writable => 'string' }, #33
@@ -5346,10 +5346,7 @@ sub CalcScaleFactor35efl
     # calculate Canon sensor size using a dedicated algorithm
     if ($$et{Make} eq 'Canon') {
         require Image::ExifTool::Canon;
-        my $canonDiag = Image::ExifTool::Canon::CalcSensorDiag(
-            $$et{RATIONAL}{FocalPlaneXResolution},
-            $$et{RATIONAL}{FocalPlaneYResolution},
-        );
+        my $canonDiag = Image::ExifTool::Canon::CalcSensorDiag($et);
         $diag = $canonDiag if $canonDiag;
     }
     unless ($diag and Image::ExifTool::IsFloat($diag)) {
@@ -6171,7 +6168,7 @@ sub ProcessExif($$$)
     my $base = $$dirInfo{Base} || 0;
     my $firstBase = $base;
     my $raf = $$dirInfo{RAF};
-    my ($verbose,$validate,$saveFormat) = @{$$et{OPTIONS}}{qw(Verbose Validate SaveFormat)};
+    my ($verbose,$validate,$saveFormat,$saveBin) = @{$$et{OPTIONS}}{qw(Verbose Validate SaveFormat SaveBin)};
     my $htmlDump = $$et{HTML_DUMP};
     my $success = 1;
     my ($tagKey, $dirSize, $makerAddr, $strEnc, %offsetInfo, $offName, $nextOffName, $doHash);
@@ -6361,7 +6358,7 @@ sub ProcessExif($$$)
         my $valueDataLen = $dataLen;
         my $valuePtr = $entry + 8;      # pointer to value within $$dataPt
         my $tagInfo = $et->GetTagInfo($tagTablePtr, $tagID);
-        my ($origFormStr, $bad, $rational, $subOffName);
+        my ($origFormStr, $bad, $rational, $binVal, $subOffName);
         # save the EXIF format codes if requested
         $$et{SaveFormat}{$saveFormat = $formatStr} = 1 if $saveFormat;
         # hack to patch incorrect count in Kodak SubIFD3 tags
@@ -6658,6 +6655,7 @@ sub ProcessExif($$$)
             } else {
                 # convert according to specified format
                 $val = ReadValue($valueDataPt,$valuePtr,$formatStr,$count,$readSize,\$rational);
+                $binVal = substr($$valueDataPt,$valuePtr,$readSize) if $saveBin;
                 # re-code if necessary
                 if (defined $val) {
                     if ($formatStr eq 'utf8') {
@@ -7055,7 +7053,8 @@ sub ProcessExif($$$)
             # set the group 1 name for tags in specified tables
             $et->SetGroup($tagKey, $dirName) if $$tagTablePtr{SET_GROUP1};
             # save original components of rational numbers (used when copying)
-            $$et{RATIONAL}{$tagKey} = $rational if defined $rational;
+            $$et{TAG_EXTRA}{$tagKey}{Rational} = $rational if defined $rational;
+            $$et{TAG_EXTRA}{$tagKey}{BinVal} = $binVal if defined $binVal;
             $$et{TAG_EXTRA}{$tagKey}{G6} = $saveFormat if $saveFormat;
             if ($$et{MAKER_NOTE_FIXUP}) {
                 $$et{TAG_EXTRA}{$tagKey}{Fixup} = $$et{MAKER_NOTE_FIXUP};