exiftool_vendored 12.58.0 → 12.60.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: daebca4fbc1adcea00bcf7dc637e328f4534a115f69a17f10bca60f8a21dee01
-  data.tar.gz: 512c1da726768d49d97b8262303f8c524b4ea23ccc8c25f1350f93a121813be4
+  metadata.gz: 348c2538720f815bacaf609de1dbb52e18f720663ea9e2194c92941b5f80d5ec
+  data.tar.gz: 124c2564aba8f2fa4af8b2bf16c654b46624031b38bb64e6ed4ed3d6cc2fb596
 SHA512:
-  metadata.gz: 6d29ac70643b583a0d01c512e2054700e15cdf60091042ed4de7c3de85feca75fcd94b2201691a0360875c02b293cc00632c6dce29888e735a488dac50712c70
-  data.tar.gz: cee8f9dcbe026dc2e5bb1de5db902904c460c6e71cf4ab9ac64b9f2a8357c3857be328912f1deedf3f51c00f99b50f07b463884e60f235f858ef33bf5cd417f7
+  metadata.gz: b32a41d3586f914940ddfc5f3f947c323006f627ce6c3a050f34111817776e26a4a5e535f56194998ec38aa5ea7f27e350388fbbd517dd366d826324c9dcd9e4
+  data.tar.gz: 9b3d5cb69b62ca6bc41293ec56110e0c28e7510561303bc8c3f3eb0ee01500f5c92dd8ff60ace8f53c54c64a28c92cfa84b0fbebe7238cb190872433c62f4103

data/bin/Changes

@@ -4,9 +4,51 @@ ExifTool Version History
 
 RSS feed: https://exiftool.org/rss.xml
 
-Note: The most recent production release is Version 12.50. (Other versions are
+Note: The most recent production release is Version 12.60. (Other versions are
 considered development releases, and are not uploaded to MetaCPAN.)
 
+Apr. 5, 2023 - Version 12.60 (production release)
+
+  - Added a new Sony FileFormat value
+  - Added Validate warning about duplicate EXIF
+  - Added ability to edit JPEG APP1 EXIF segment with incorrect header
+  - Decode a few new Sony ARW tags
+  - Improved -htmldump of non-EXIF-based maker notes
+  - Enhanced -geotag from CSV files support GPSSpeed (with variable units),
+    "bearing" for GPSTrack, and GPSDateTime in format "dd.mm.YYYY HH:MM:SS"
+  - Enhanced ImageDataMD5 to also support CRW, RAF, X3F and AVIF images
+  - Enhanced -efile option to also record updated and created file names
+  - Family 8 group names may now also be used in Composite Require/Desire tags
+  - Fixed handling of undefined tags in -if conditions to conform with
+    documentation and match -p and -tagsFromFile behaviour when -m or -f option
+    is used
+  - Fixed problem where setting the Geotime value didn't work when using an
+    advanced-formatting expression containing a greater-than symbol (>)
+
+Mar. 28, 2023 - Version 12.59
+
+  - COMPATIBILITY WARNING: Changed the calculated ImageDataMD5 for JPEG images
+    to include all data from the SOS to the EOI (including the SOS marker but
+    not the EOI marker)
+  - Added new -fileNUM option to load tags from alternate files
+  - Added family 8 groups for accessing tags from alternate files
+  - Added new XMP-et:OriginalImageMD5 tag for storing ImageDataMD5 value
+  - Added verbose ImageDataMD5 message for JPEG files
+  - Added a new Nikon LensID (thanks Warren Hatch)
+  - Decode a new Olympus tag and improved decoding of another (thanks Herb)
+  - Decode a couple of new PanasonicRaw tags
+  - Decode image coordinates for a couple more VNT object types
+  - Enhanced ImageDataMD5 to also support MRW, CR3, IIQ, PNG, MOV/MP4 and some
+    RIFF-based files
+  - Improved verbose messages when deleting NikonApp trailer
+  - Patched to avoid structure warnings when copying tags from Nikon files
+    containing NKSC metadata
+  - Fixed %-C filename format code to work properly with the -fileOrder and
+    -progress options
+  - Fixed potential ValueConv warning when reading LIF files
+  - API Changes:
+      - Added SetAlternateFile method
+
 Mar. 15, 2023 - Version 12.58
 
   - Added Extra ImageDataMD5 tag to calculate MD5 of image data only
@@ -171,6 +213,8 @@ Nov. 8, 2022 - Version 12.50 (production release)
   - Fixed inconsistent year and time zone for Kenwood dashcam timed GPS in MP4
     videos
 
+History of older versions (back to Nov. 19, 2003 - Version 1.00) -->
+
 Oct. 19, 2022 - Version 12.49
 
   - Added read support for Windows ICO and CUR files
@@ -338,8 +382,6 @@ June 1, 2022 - Version 12.42 (production release)
   - Patched to allow PDF Encrypt object to be "null"
   - Fixed bug reading ICC_Profile 'meta' tags
 
-History of older versions (back to Nov. 19, 2003 - Version 1.00) -->
-
 Apr. 7, 2022 - Version 12.41
 
   - Added support for "OM SYSTEM" maker notes

data/bin/MANIFEST

@@ -530,6 +530,9 @@ t/ExifTool_3.out
 t/ExifTool_30.out
 t/ExifTool_31.out
 t/ExifTool_32.out
+t/ExifTool_33.out
+t/ExifTool_34.out
+t/ExifTool_35.out
 t/ExifTool_4.out
 t/ExifTool_5.out
 t/ExifTool_6.out
@@ -903,6 +906,7 @@ t/Writer_56.out
 t/Writer_58.out
 t/Writer_59.out
 t/Writer_6.out
+t/Writer_60.out
 t/Writer_7.out
 t/Writer_9.out
 t/XMP.t

data/bin/META.json

@@ -47,5 +47,5 @@
       }
    },
    "release_status" : "stable",
-   "version" : "12.58"
+   "version" : "12.60"
 }

data/bin/META.yml

@@ -28,4 +28,4 @@ recommends:
   Time::HiRes: 0
 requires:
   perl: 5.004
-version: 12.58
+version: 12.60

data/bin/README

@@ -107,8 +107,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.58.tar.gz | tar -xf -
-  cd Image-ExifTool-12.58
+  gzip -dc Image-ExifTool-12.60.tar.gz | tar -xf -
+  cd Image-ExifTool-12.60
   ./exiftool t/images/ExifTool.jpg
 
 Note:  These commands extract meta information from one of the test images. 

data/bin/config_files/example.config

@@ -210,6 +210,7 @@
                 3 => 'PreviewImage (1)',
                 # (if the MPF has 2 previews, MPImage3 could be the larger one)
                 4 => 'MPImage3',
+                5 => 'JpgFromRaw2', # in RW2 from newer Panasonic models
             },
             # ValueConv may also be a code reference
             # Inputs: 0) reference to list of values, 1) ExifTool object

data/bin/exiftool

@@ -11,7 +11,7 @@ use strict;
 use warnings;
 require 5.004;
 
-my $version = '12.58';
+my $version = '12.60';
 
 # add our 'lib' directory to the include list BEFORE 'use Image::ExifTool'
 BEGIN {
@@ -103,6 +103,7 @@ my @newValues;      # list of new tag values to set
 my @requestTags;    # tags to request (for -p or -if option arguments)
 my @srcFmt;         # source file name format strings
 my @tags;           # list of tags to extract
+my %altFile;        # alternate files to extract information (keyed by lower-case family 8 group)
 my %appended;       # list of files appended to
 my %countLink;      # count hard and symbolic links made
 my %created;        # list of files we created
@@ -115,6 +116,7 @@ my %outComma;       # flag that output text file needs a comma
 my %outTrailer;     # trailer for output text file
 my %preserveTime;   # preserved timestamps for files
 my %printFmt;       # the contents of the print format file
+my %seqFileDir;     # file sequence number in each directory
 my %setTags;        # hash of list references for tags to set from files
 my %setTagsList;    # list of other tag lists for multiple -tagsFromFile from the same file
 my %usedFileName;   # lookup for file names we already used in TestName feature
@@ -196,7 +198,7 @@ my $saveCount;      # count the number of times we will/did call SaveNewValues()
 my $scanWritable;   # flag to process only writable file types
 my $sectHeader;     # current section header for -p option
 my $sectTrailer;    # section trailer for -p option
-my $seqFileBase;    # sequential file number at start of directory
+my $seqFileDir;     # sequential file number used for %-C
 my $seqFileNum;     # sequential file number used for %C
 my $setCharset;     # character set setting ('default' if not set and -csv -b used)
 my $showGroup;      # number of group to show (may be zero or '')
@@ -450,6 +452,7 @@ undef %outComma;
 undef %outTrailer;
 undef %printFmt;
 undef %preserveTime;
+undef %seqFileDir;
 undef %setTags;
 undef %setTagsList;
 undef %usedFileName;
@@ -536,7 +539,7 @@ $quiet = 0;
 $rtnVal = 0;
 $saveCount = 0;
 $sectTrailer = '';
-$seqFileBase = 0;
+$seqFileDir = 0;
 $seqFileNum = 0;
 $tabFormat = 0;
 $vout = \*STDOUT;
@@ -919,12 +922,14 @@ for (;;) {
         $mt->Options(Duplicates => 1);
         next;
     }
-    if (/^efile(\d)?(!)?$/i) {
+    if (/^efile(\d+)?(!)?$/i) {
         my $arg = shift;
         defined $arg or Error("Expecting file name for -$_ option\n"), $badCmd=1, next;
-        $efile[0] = $arg if not $1 or $1 & 0x01;
-        $efile[1] = $arg if $1 and $1 & 0x02;
-        $efile[2] = $arg if $1 and $1 & 0x04;
+        $efile[0] = $arg if not $1 or $1 & 0x01;# error
+        $efile[1] = $arg if $1 and $1 & 0x02;   # unchanged
+        $efile[2] = $arg if $1 and $1 & 0x04;   # failed -if condition
+        $efile[3] = $arg if $1 and $1 & 0x08;   # updated
+        $efile[4] = $arg if $1 and $1 & 0x016;  # created
         unlink $arg if $2;
         next;
     }
@@ -950,6 +955,10 @@ for (;;) {
         $mt->Options(FastScan => (length $1 ? $1 : 1));
         next;
     }
+    if (/^(file\d+)$/i) {
+        $altFile{lc $1} = shift or Error("Expecting file name for -file option\n"), $badCmd=1, next;
+        next;
+    }
     if (/^fileorder(\d*)$/i) {
         push @fileOrder, shift if @ARGV;
         my $num = $1 || 0;
@@ -1330,7 +1339,7 @@ for (;;) {
         AddSetTagsFile($setTagsFile = '@') if not $setTagsFile and /(<|>)/;
         if ($setTagsFile) {
             push @{$setTags{$setTagsFile}}, $_;
-            if (/>/) {
+            if ($1 eq '>') {
                 $useMWG = 1 if /^(.*>\s*)?mwg:/si;
                 if (/\b(filename|directory|testname)#?$/i) {
                     $doSetFileName = 1;
@@ -1939,7 +1948,7 @@ Exit $rtnValApp;    # all done
 sub GetImageInfo($$)
 {
     my ($et, $orig) = @_;
-    my (@foundTags, $info, $file, $ind);
+    my (@foundTags, $info, $file, $ind, $g8);
 
     # set window title for this file if necessary
     if (defined $windowTitle and $progressCount >= $progressNext) {
@@ -1982,6 +1991,11 @@ sub GetImageInfo($$)
     } else {
         $file = $orig;
     }
+    # set alternate file names
+    foreach $g8 (sort keys %altFile) {
+        my $altName = FilenameSPrintf($altFile{$g8}, $orig);
+        $et->SetAlternateFile($g8, $altName);
+    }
 
     my $pipe = $file;
     if ($doUnzip) {
@@ -2071,6 +2085,7 @@ sub GetImageInfo($$)
             push @delFiles, $original;
         } elsif ($et->Rename($original, $file)) {
             $verbose and print $vout "Restored from $original\n";
+            EFile($file, 3);
             ++$countGoodWr;
         } else {
             Warn "Error renaming $original\n";
@@ -2080,6 +2095,8 @@ sub GetImageInfo($$)
         return;
     }
     ++$seqFileNum;  # increment our file counter
+    my ($dir) = Image::ExifTool::SplitFileName($orig);
+    $seqFileDir = $seqFileDir{$dir} = ($seqFileDir{$dir} || 0) + 1;
 
     my $lineCount = 0;
     my ($fp, $outfile, $append);
@@ -3028,6 +3045,7 @@ sub SetImageInfo($$$)
                     $r3 = $et->SetSystemTags($file);
                 }
                 if ($r0 > 0 or $r1 > 0 or $r2 > 0 or $r3 > 0) {
+                    EFile($infile, 3);
                     ++$countGoodWr;
                 } elsif ($r0 < 0 or $r1 < 0 or $r2 < 0 or $r3 < 0) {
                     EFile($infile);
@@ -3142,6 +3160,7 @@ sub SetImageInfo($$$)
                                     $preserveTime{$file} = [ $aTime, $mTime, $cTime ];
                                 }
                             }
+                            EFile($infile, 3);
                             ++$countGoodWr;
                         } else {
                             close(NEW_FILE);
@@ -3157,6 +3176,7 @@ sub SetImageInfo($$$)
                     # simply rename temporary file to replace original
                     # (if we didn't already rename it to add "_original")
                     } elsif ($et->Rename($tmpFile, $dstFile)) {
+                        EFile($infile, 3);
                         ++$countGoodWr;
                     } else {
                         my $newFile = $tmpFile;
@@ -3174,21 +3194,26 @@ sub SetImageInfo($$$)
                             # (don't delete tmp file now because it is all we have left)
                             ++$countBadWr;
                         } else {
+                            EFile($infile, 3);
                             ++$countGoodWr;
                         }
                     }
                 } elsif ($overwriteOrig) {
                     # erase original file
+                    EFile($infile, 3);
                     $et->Unlink($file) or Warn "Error erasing original $file\n";
                     ++$countGoodWr;
                 } else {
+                    EFile($infile, 4);
                     ++$countGoodCr;
                 }
             } else {
                 # this file was created from scratch, not edited
+                EFile($infile, 4);
                 ++$countGoodCr;
             }
         } else {
+            EFile($infile, 3);
             ++$countGoodWr;
         }
     } elsif ($success) {
@@ -3741,8 +3766,6 @@ sub ScanDir($$;$)
         $utf8Name = 1;
     }
     return if $ignore{$dir};
-    my $oldBase = $seqFileBase;
-    $seqFileBase = $seqFileNum;
     # 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 !~ /[*?]/) {
@@ -3774,7 +3797,6 @@ sub ScanDir($$;$)
         # use standard perl library routines to read directory
         unless (opendir(DIR_HANDLE, $dir)) {
             Warn("Error opening directory $dir\n");
-            $seqFileBase = $oldBase + ($seqFileNum - $seqFileBase);
             return;
         }
         @fileList = readdir(DIR_HANDLE);
@@ -3854,8 +3876,6 @@ sub ScanDir($$;$)
     }
     ++$countDir;
     $et->Options(CharsetFileName => $enc);  # restore original setting
-    # update sequential file base for parent directory
-    $seqFileBase = $oldBase + ($seqFileNum - $seqFileBase);
 }
 
 #------------------------------------------------------------------------------
@@ -4151,16 +4171,15 @@ sub NextUnusedFilename($;$)
     return $fmt unless $fmt =~ /%[-+]?\d*\.?\d*[lun]?[cC]/;
     my %sep = ( '-' => '-', '+' => '_' );
     my ($copy, $alpha) = (0, 'a');
-    my $seq = $seqFileNum - 1;
     for (;;) {
         my ($filename, $pos) = ('', 0);
         while ($fmt =~ /(%([-+]?)(\d*)(\.?)(\d*)([lun]?)([cC]))/g) {
             $filename .= substr($fmt, $pos, pos($fmt) - $pos - length($1));
             $pos = pos($fmt);
             my ($sign, $wid, $dec, $wid2, $mod, $tok) = ($2, $3 || 0, $4, $5 || 0, $6, $7);
-            my $diff;
+            my $seq;
             if ($tok eq 'C') {
-                $diff = $wid - ($sign eq '-' ? $seqFileBase : 0);
+                $seq = $wid + ($sign eq '-' ? $seqFileDir : $seqFileNum) - 1;
                 $wid = $wid2;
             } else {
                 next unless $dec or $copy;
@@ -4169,13 +4188,13 @@ sub NextUnusedFilename($;$)
                 $filename .= $sep{$sign} if $sign;
             }
             if ($mod and $mod ne 'n') {
-                my $a = $tok eq 'C' ? Num2Alpha($diff + $seq) : $alpha;
+                my $a = $tok eq 'C' ? Num2Alpha($seq) : $alpha;
                 my $str = ($wid and $wid > length $a) ? 'a' x ($wid - length($a)) : '';
                 $str .= $a;
                 $str = uc $str if $mod eq 'u';
                 $filename .= $str;
             } else {
-                my $c = $tok eq 'C' ? ($diff + $seq) : $copy;
+                my $c = $tok eq 'C' ? $seq : $copy;
                 my $num = $c + ($mod ? 1 : 0);
                 $filename .= $wid ? sprintf("%.${wid}d",$num) : $num;
             }
@@ -4431,7 +4450,7 @@ sub ReadStayOpen($)
 
 #------------------------------------------------------------------------------
 # Add new entry to -efile output file
-# Inputs: 0) file name, 1) -efile option number (0=error, 1=same, 2=failed)
+# Inputs: 0) file name, 1) -efile option number (0=error, 1=same, 2=failed, 3=updated, 4=created)
 sub EFile($$)
 {
     my $entry = shift;
@@ -4746,6 +4765,7 @@ L<Advanced options|/Advanced options>
   -echo[NUM] TEXT                  Echo text to stdout or stderr
   -efile[NUM][!] ERRFILE           Save names of files with errors
   -execute[NUM]                    Execute multiple commands on one line
+  -fileNUM ALTFILE                 Load tags from alternate file
   -list_dir                        List directories, not their contents
   -srcfile FMT                     Process a different source file
   -stay_open FLAG                  Keep reading -@ argfile even after EOF
@@ -5018,16 +5038,14 @@ for list-type tags and conditional replacements because each copy operation
 on a tag overrides any previous operations.  While this avoids duplicate
 list items when copying groups of tags from a file containing redundant
 information, it also prevents values of different tags from being copied
-into the same list when this is the intent.  So a B<-addTagsFromFile> option
-is provided which allows copying of multiple tags into the same list.  eg)
+into the same list when this is the intent.  To accumulate values
+from different operations into the same list, add a C<+> after the initial
+C<-> of the argument.  For example:
 
-    exiftool -addtagsfromfile @ '-subject<make' '-subject<model' ...
+    exiftool -tagsfromfile @ '-subject<make' '-+subject<model' ...
 
-Similarly, B<-addTagsFromFile> must be used when conditionally replacing a
-tag to prevent overriding earlier conditions.
-
-Other than these differences, the B<-tagsFromFile> and B<-addTagsFromFile>
-options are equivalent.
+Similarly, C<-+DSTTAG> must be used when conditionally replacing a tag to
+prevent overriding earlier conditions.
 
 6) The B<-a> option (allow duplicate tags) is always in effect when copying
 tags from I<SRCFILE>, but the highest priority tag is always copied last so
@@ -5294,12 +5312,12 @@ escaped.  The inverse conversion is applied when writing tags.
 
 =item B<-f> (B<-forcePrint>)
 
-Force printing of tags even if their values are not found.  This option only
-applies when specific tags are requested on the command line (ie. not with
-wildcards or by C<-all>).  With this option, a dash (C<->) is printed for
-the value of any missing tag, but the dash may be changed via the API
-MissingTagValue option.  May also be used to add a 'flags' attribute to the
-B<-listx> output, or to allow tags to be deleted when writing with the
+Force printing of tags even if they don't exist.  This option applies to
+tags specified on the command line, or with the B<-p>, B<-if> or
+B<-tagsFromFile> options.  When B<-f> is used, the value of any missing tag
+is set to a dash (C<->) by default, but this may be configured via the API
+MissingTagValue option.  B<-f> is also used to add a 'flags' attribute to
+the B<-listx> output, or to allow tags to be deleted when writing with the
 B<-csv>=I<CSVFILE> feature.
 
 =item B<-g>[I<NUM>][:I<NUM>...] (B<-groupHeadings>)
@@ -5307,15 +5325,15 @@ B<-csv>=I<CSVFILE> feature.
 Organize output by tag group.  I<NUM> specifies a group family number, and
 may be 0 (general location), 1 (specific location), 2 (category), 3
 (document number), 4 (instance number), 5 (metadata path), 6 (EXIF/TIFF
-format) or 7 (tag ID).  B<-g0> is assumed if a family number is not
-specified.  May be combined with other options to add group names to the
-output.  Multiple families may be specified by separating them with colons. 
-By default the resulting group name is simplified by removing any leading
-C<Main:> and collapsing adjacent identical group names, but this can be
-avoided by placing a colon before the first family number (eg. B<-g:3:1>).
-Use the B<-listg> option to list group names for a specified family.  The
-API SavePath and SaveFormat options are automatically enabled if the
-respective family 5 or 6 group names are requested.  See the
+format), 7 (tag ID) or 8 (file number).  B<-g0> is assumed if a family
+number is not specified.  May be combined with other options to add group
+names to the output.  Multiple families may be specified by separating them
+with colons.  By default the resulting group name is simplified by removing
+any leading C<Main:> and collapsing adjacent identical group names, but this
+can be avoided by placing a colon before the first family number (eg.
+B<-g:3:1>).  Use the B<-listg> option to list group names for a specified
+family.  The API SavePath and SaveFormat options are automatically enabled
+if the respective family 5 or 6 group names are requested.  See the
 L<API GetGroup documentation|Image::ExifTool/GetGroup> for more information.
 
 =item B<-G>[I<NUM>][:I<NUM>...] (B<-groupNames>)
@@ -5523,7 +5541,7 @@ with this command:
 
 produces output like this:
 
-    -- Generated by ExifTool 12.58 --
+    -- Generated by ExifTool 12.60 --
     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
@@ -6414,12 +6432,12 @@ I<SHIFT> string.  For example:
 
 Add features from specified plug-in I<MODULE>.  Currently, the MWG module is
 the only plug-in module distributed with exiftool.  This module adds
-read/write support for tags as recommended by the Metadata Working Group. 
-As a convenience, C<-use MWG> is assumed if the C<MWG> group is specified
-for any tag on the command line.  See the L<MWG Tags
-documentation|Image::ExifTool::TagNames/MWG Tags> for more details.  Note
-that this option is not reversible, and remains in effect until the
-application terminates, even across the B<-execute> option.
+read/write support for tags as recommended by the Metadata Working Group. As
+a convenience, C<-use MWG> is assumed if the group name prefix starts with
+C<MWG:> exactly for any requested tag.  See the
+L<MWG Tags documentation|Image::ExifTool::TagNames/MWG Tags> for more
+details.  Note that this option is not reversible, and remains in effect
+until the application terminates, even across the B<-execute> option.
 
 =back
 
@@ -6505,10 +6523,11 @@ exit status of the command (see L</EXIT STATUS>).
 
 Save the names of files giving errors (I<NUM> missing or 1), files that were
 unchanged (I<NUM> is 2), files that fail the B<-if> condition (I<NUM> is 4),
-or any combination thereof by summing I<NUM> (eg. B<-efile3> is the same
-has having both B<-efile> and B<-efile2> options with the same I<ERRFILE>).
-By default, file names are appended to any existing I<ERRFILE>, but
-I<ERRFILE> is overwritten if an exclamation point is added to the option
+files that were updated (I<NUM> is 8), files that were created (I<NUM> is
+16), or any combination thereof by summing I<NUM> (eg. B<-efile3> is the
+same has having both B<-efile> and B<-efile2> options with the same
+I<ERRFILE>). By default, file names are appended to any existing I<ERRFILE>,
+but I<ERRFILE> is overwritten if an exclamation point is added to the option
 (eg. B<-efile!>).  Saves the name of the file specified by the B<-srcfile>
 option if applicable.
 
@@ -6523,6 +6542,14 @@ line.  I<NUM> is an optional number that is echoed in the "{ready}" message
 when using the B<-stay_open> feature.  If a I<NUM> is specified, the B<-q>
 option no longer suppresses the output "{readyNUM}" message.
 
+=item B<-file>I<NUM> I<ALTFILE>
+
+Read tags from an alternate source file.  These tags are accessed via the
+family 8 group name (eg. C<File1:TAG> for the B<-file1> option, C<File2:TAG>
+for B<-file2>, etc).  I<ALTFILE> may contain filename formatting codes %d,
+%f and %e.  Among other things, this allows tags from different files to be
+compared and combined using the B<-if> and B<-p> options.
+
 =item B<-list_dir>
 
 List directories themselves instead of their contents.  This option

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

@@ -21,7 +21,7 @@ use Image::ExifTool qw(:DataAccess :Utils);
 use Image::ExifTool::Exif;
 use Image::ExifTool::Canon;
 
-$VERSION = '1.59';
+$VERSION = '1.60';
 
 sub WriteCRW($$);
 sub ProcessCanonRaw($$$);
@@ -698,6 +698,10 @@ sub ProcessCanonRaw($$$)
                           $format ne 'string' and not $subdir;
         } else {
             $valueDataPos = $ptr;
+            # do MD5 of image data if requested
+            if ($$et{ImageDataMD5} and $tagID == 0x2005) {
+                $raf->Seek($ptr, 0) and $et->ImageDataMD5($raf, $size, 'raw');
+            }
             if ($size <= 512 or ($verbose > 2 and $size <= 65536)
                 or ($tagInfo and ($$tagInfo{SubDirectory}
                 or grep(/^$$tagInfo{Name}$/i, $et->GetRequestedTags()) )))

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

@@ -16,7 +16,7 @@ use Image::ExifTool::Exif;
 use Image::ExifTool::XMP;
 use Image::ExifTool::GPS;
 
-$VERSION = '1.07';
+$VERSION = '1.08';
 
 sub ProcessDJIInfo($$$);
 
@@ -104,7 +104,7 @@ my %convFloat2 = (
     0x00 => { Name => 'AmbientTemperature',  Format => 'float', PrintConv => 'sprintf("%.1f C",$val)' }, # (NC)
     0x04 => { Name => 'ObjectDistance',      Format => 'float', PrintConv => 'sprintf("%.1f m",$val)' },
     0x08 => { Name => 'Emissivity',          Format => 'float', PrintConv => 'sprintf("%.2f",$val)' },
-    0x0c => { Name => 'RelativeHumidity',    Format => 'float', PrintConv => 'sprintf("%g %",$val*100)' },
+    0x0c => { Name => 'RelativeHumidity',    Format => 'float', PrintConv => 'sprintf("%g %%",$val*100)' },
     0x10 => { Name => 'ReflectedTemperature',Format => 'float', PrintConv => 'sprintf("%.1f C",$val)' },
     0x65 => { Name => 'IDString',            Format => 'string[16]' }, # (NC)
 );