exiftool_vendored 12.58.0 → 12.59.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: daebca4fbc1adcea00bcf7dc637e328f4534a115f69a17f10bca60f8a21dee01
-  data.tar.gz: 512c1da726768d49d97b8262303f8c524b4ea23ccc8c25f1350f93a121813be4
+  metadata.gz: a40c897eadb8162344b81eedcedd1888cfac911d28c1e5542f8e3d323af06768
+  data.tar.gz: a761f6527a380e369e78c34d2c061a9652ae63a3da0b7e70be1854fb8b728ee6
 SHA512:
-  metadata.gz: 6d29ac70643b583a0d01c512e2054700e15cdf60091042ed4de7c3de85feca75fcd94b2201691a0360875c02b293cc00632c6dce29888e735a488dac50712c70
-  data.tar.gz: cee8f9dcbe026dc2e5bb1de5db902904c460c6e71cf4ab9ac64b9f2a8357c3857be328912f1deedf3f51c00f99b50f07b463884e60f235f858ef33bf5cd417f7
+  metadata.gz: 7edad248448957b58317b1621b2ae5b0c67276ee988ec1fb043403f299d6b0476ab7e79f4a15c345f9c655ff79518235350797b65b4b94cc5f80759511a44759
+  data.tar.gz: a4cec80d9709c1145958d4c6590349bdf6b0fc18f041e62962fc736a660d0243a29abc5c68e481198c9b42e584cedc7f1536081c0c59ffd57f90caac704fb0ad

data/bin/Changes

@@ -7,6 +7,31 @@ RSS feed: https://exiftool.org/rss.xml
 Note: The most recent production release is Version 12.50. (Other versions are
 considered development releases, and are not uploaded to MetaCPAN.)
 
+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, PNG, MOV/MP4 and 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 new ImageDataMD5 tag to work properly with PhaseOne IIQ files
+  - 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

data/bin/MANIFEST

@@ -530,6 +530,8 @@ 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_4.out
 t/ExifTool_5.out
 t/ExifTool_6.out
@@ -903,6 +905,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.59"
 }

data/bin/META.yml

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

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.59.tar.gz | tar -xf -
+  cd Image-ExifTool-12.59
   ./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.59';
 
 # 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;
@@ -950,6 +953,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;
@@ -1939,7 +1946,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 +1989,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) {
@@ -2080,6 +2092,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);
@@ -3741,8 +3755,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 +3786,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 +3865,6 @@ sub ScanDir($$;$)
     }
     ++$countDir;
     $et->Options(CharsetFileName => $enc);  # restore original setting
-    # update sequential file base for parent directory
-    $seqFileBase = $oldBase + ($seqFileNum - $seqFileBase);
 }
 
 #------------------------------------------------------------------------------
@@ -4151,16 +4160,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 +4177,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;
             }
@@ -4746,6 +4754,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 +5027,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
@@ -5307,15 +5314,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 +5530,7 @@ with this command:
 
 produces output like this:
 
-    -- Generated by ExifTool 12.58 --
+    -- Generated by ExifTool 12.59 --
     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 +6421,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
 
@@ -6523,6 +6530,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>, C<File2:TAG>, 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/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)
 );

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

@@ -21,7 +21,7 @@ use Image::ExifTool qw(:DataAccess :Utils);
 use Image::ExifTool::Exif;
 use Image::ExifTool::ASF;   # for GetGUID()
 
-$VERSION = '1.43';
+$VERSION = '1.44';
 
 sub ProcessFPX($$);
 sub ProcessFPXR($$$);
@@ -488,16 +488,27 @@ my %fpxFileType = (
     IeImg => {
         Name => 'EmbeddedImage',
         Notes => q{
-            embedded images in Scene7 vignette VNT files.  EmbeddedImageRectangle is
-            generated for applicable images, and may be associated with the
-            corresponding EmbeddedImage via the family 3 group name
+            embedded images in Scene7 vignette VNT files.  The EmbeddedImage Class and
+            Rectangle are also extracted for applicable images, and may be associated
+            with the corresponding EmbeddedImage via the family 3 group name
         },
         Groups => { 2 => 'Preview' },
         Binary => 1,
     },
-    IeImg_rect => { # (not a real tag -- extracted from Contents of VNT file)
+    IeImg_class => {
+        Name => 'EmbeddedImageClass',
+        Notes => q{
+            not a real tag.  This information is extracted if available for the
+            corresponding EmbeddedImage from the Contents of a VNT file
+        },
+        # eg. "Cache", "Mask"
+    },
+    IeImg_rect => { #
         Name => 'EmbeddedImageRectangle',
-        Hidden => 1,
+        Notes => q{
+            not a real tag.  This information is extracted if available for the
+            corresponding EmbeddedImage from the Contents of a VNT file
+        },
     },
 );
 
@@ -1577,13 +1588,16 @@ sub ProcessContents($$$)
                 pos($$dataPt) += $size;
             }
             $$et{IeImg_lkup} = { };
-            # - the byte after TargetRole1 is 0x0d or 0x11 for separate images in my samples,
+            $$et{IeImg_class} = { };
+            # - the byte before \x80 is 0x0d, 0x11 or 0x1f for separate images in my samples,
             #   and 0x1c or 0x23 for inline masks
-            while ($$dataPt =~ /\x0bTargetRole1.\x80\0\0\x01.{4}(.{24})/sg) {
-                my ($index, @coords) = unpack('Vx4V4', $1);
+            # - the byte after \xff\xff is 0x3b in my samples for $1 containing 'VnMask' or 'VnCache'
+            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} = "@coords";
+                $$et{IeImg_class}{$index} = $1 if $1;
             }
         }
     }
@@ -2395,6 +2409,10 @@ sub ProcessFPX($$)
                         # save position of this image
                         $et->HandleTag($tagTablePtr, IeImg_rect => $$et{IeImg_lkup}{$num});
                         delete $$et{IeImg_lkup}{$num};
+                        if ($$et{IeImg_class} and $$et{IeImg_class}{$num}) {
+                            $et->HandleTag($tagTablePtr, IeImg_class => $$et{IeImg_class}{$num});
+                            delete $$et{IeImg_class}{$num};
+                        }
                     }
                     delete $$et{DOC_NUM};
                 } else {

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

@@ -13,7 +13,7 @@ use vars qw($VERSION);
 use Image::ExifTool qw(:DataAccess :Utils);
 use Image::ExifTool::XMP;
 
-$VERSION = '1.00';
+$VERSION = '1.01';
 
 %Image::ExifTool::LIF::Main = (
     GROUPS => { 0 => 'XML', 1 => 'XML', 2 => 'Image' },
@@ -30,7 +30,15 @@ $VERSION = '1.00';
             my $unixTimeZero = 134774 * 24 * 3600;
             my @vals = split ' ', $val;
             foreach (@vals) {
-                $_ = 1e-7 * hex($_);
+                if (/[^0-9a-f]/i) {
+                    $_ = '0000:00:00 00:00:00';
+                } elsif (length $_ > 8) {
+                    my $lo = hex substr($_, -8);
+                    my $hi = hex substr($_, 0, -8);
+                    $_ = 1e-7 * ($hi * 4294967296 + $lo);
+                } else {
+                    $_ = 1e-7 * hex($_);
+                }
                 # shift from Jan 1, 1601 to Jan 1, 1970
                 $_ = Image::ExifTool::ConvertUnixTime($_ - $unixTimeZero);
             }

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

@@ -17,7 +17,7 @@ use vars qw($VERSION);
 use Image::ExifTool qw(:DataAccess :Utils);
 use Image::ExifTool::Minolta;
 
-$VERSION = '1.16';
+$VERSION = '1.17';
 
 sub ProcessMRW($$;$);
 sub WriteMRW($$;$);
@@ -489,6 +489,14 @@ sub ProcessMRW($$;$)
         $err and $et->Error("MRW format error", $$et{TIFF_TYPE} eq 'ARW');
     } else {
         $err and $et->Warn("MRW format error");
+        if ($$et{ImageDataMD5}) {
+            my ($num, $md5) = (0, $$et{ImageDataMD5});
+            while ($raf->Read($data, 65536)) {
+                $md5->add($data);
+                $num += length $data;
+            }
+            $et->VPrint(0, "$$et{INDENT}(ImageDataMD5: $num bytes of raw data)\n");
+        }
     }
     return $rtnVal;
 }

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

@@ -64,7 +64,7 @@ use Image::ExifTool::Exif;
 use Image::ExifTool::GPS;
 use Image::ExifTool::XMP;
 
-$VERSION = '4.20';
+$VERSION = '4.21';
 
 sub LensIDConv($$$);
 sub ProcessNikonAVI($$$);
@@ -5298,6 +5298,7 @@ my %nikonFocalConversions = (
             35 => 'Nikkor Z 28-75mm f/2.8', #IB
             36 => 'Nikkor Z 400mm f/4.5 VR S', #IB
             37 => 'Nikkor Z 600mm f/4 TC VR S', #28
+            38 => 'Nikkor Z 85mm f/1.2 S', #28
             39 => 'Nikkor Z 17-28mm f/2.8', #IB
             32768 => 'Nikkor Z 400mm f/2.8 TC VR S TC-1.4x', #28
             32769 => 'Nikkor Z 600mm f/4 TC VR S TC-1.4x', #28
@@ -11836,19 +11837,19 @@ sub ProcessNikonApp($;$)
     my $trailerLen = unpack('N', $buff);
     $trailerLen > $fileEnd and $et->Warn('Bad NikonApp trailer size'), return 0;
     if ($dirInfo) {
-        $$dirInfo{DirLen} = $trailerLen if $dirInfo;
+        $$dirInfo{DirLen} = $trailerLen;
         $$dirInfo{DataPos} = $fileEnd - $trailerLen;
         if ($$dirInfo{OutFile}) {
             if ($$et{DEL_GROUP}{NikonApp}) {
+                $et->VPrint(0, "  Deleting NikonApp trailer ($trailerLen bytes)\n");
                 ++$$et{CHANGED};
-            # just copy the trailer when writing
+            # just copy the trailer when writing (read directly into output buffer)
             } elsif ($trailerLen > $fileEnd or not $raf->Seek($$dirInfo{DataPos}, 0) or
                      $raf->Read(${$$dirInfo{OutFile}}, $trailerLen) != $trailerLen)
             {
                 return 0;
-            } else {
-                return 1;
             }
+            return 1;
         }
         $et->DumpTrailer($dirInfo) if $verbose or $$et{HTML_DUMP};
     }

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

@@ -40,7 +40,7 @@ use Image::ExifTool qw(:DataAccess :Utils);
 use Image::ExifTool::Exif;
 use Image::ExifTool::APP12;
 
-$VERSION = '2.80';
+$VERSION = '2.81';
 
 sub PrintLensInfo($$$);
 
@@ -3165,21 +3165,38 @@ my %indexInfo = (
             PrintHex => 1,
             ValueConv => '($val & 0x1f) . " " . ($val & 0xffe0)',
             ValueConvInv => 'my @v=split(" ",$val); @v == 2 ? $v[0] + $v[1] : $val',
-            PrintConv => [
+            PrintConv => [ # herb values added:
+                           # based on code of W.P. in https://exiftool.org/forum/index.php?topic=14144.0
                 {
-                    0x00 => '(none)',
-                    0x01 => 'Center',
+                    # 0x00 => '(none)',
+                    # 0x01 => 'Center',
                     # need to fill this in...
+                    0x00 => '(none)',
+                    0x02 => 'Top-center (horizontal)',
+                    0x04 => 'Right (horizontal)',
+                    0x05 => 'Mid-right (horizontal)',
+                    0x06 => 'Center (horizontal)',
+                    0x07 => 'Mid-left (horizontal)',
+                    0x08 => 'Left (horizontal)',
+                    0x0a => 'Bottom-center (horizontal)',
+                    0x0c => 'Top-center (vertical)',
+                    0x0f => 'Right (vertical)',
+                    0x15 => 'Bottom-center (vertical)',
+                    0x10 => 'Mid-right (vertical)',
+                    0x11 => 'Center (vertical)',
+                    0x12 => 'Mid-left (vertical)',
+                    0x13 => 'Left (vertical)',
                 },
                 {
                     0x00 => 'Single Target',
                     0x40 => 'All Target', # (guess)
                 },
             ]
-        },{ #11
+        },{ #herb all camera model except E-Mxxx and OM-x
             Name => 'AFPoint',
+            Condition => '$$self{Model} !~ /^(E-M|OM-)/  ',
             Writable => 'int16u',
-            Notes => 'other models',
+            Notes => 'models other than E-Mxxx and OM-x',
             RawConv => '($val or $$self{Model} ne "E-P1") ? $val : undef',
             PrintConv => {
                 # (E-P1 always writes 0, maybe other models do too - PH)
@@ -3189,10 +3206,73 @@ my %indexInfo = (
                 3 => 'Center (vertical)', #6 (E-510)
                 255 => 'None',
             },
+        },{ #herb all newer models E-Mxxx and OM-x; we do not know details
+            Name => 'AFPoint',
+            Writable => 'int16u',
+            Notes => 'other models',
         }
     ],
     # 0x31a Continuous AF parameters?
-    # 0x31b ContinuousFocusMode? (ref forum78245)
+    0x31b => [ #herb, based on investigations of abgestumpft: https://exiftool.org/forum/index.php?topic=14527.0
+               # for newer models E-Mxxx and OM-x 
+        {
+            Name => 'AFPointDetails',
+            Condition => '$$self{Model} =~ m/^E-M|^OM-/ ',
+            Writable => 'int16u',
+            Notes => 'models E-Mxxx and OM-x',
+            PrintHex => 1,
+            ValueConv => '(($val >> 13) & 0x7) . " " . (($val >> 12) & 0x1) . " " .  (($val >> 11) & 0x1) . " " .
+            #               subject detect               face and eye                  half press
+                          (($val >> 8) & 0x3) . " " . (($val >> 7) & 0x1) . " " . (($val >> 5) & 0x1) . " " .
+            #               eye AF                      face detect                 x-AF with MF
+                          (($val >> 4) & 0x1) . " " . (($val >> 3) & 0x1) . " " . ($val & 0x7)',
+            #               release                     object found               MF...  
+            PrintConvColumns => 4,
+            PrintConv => [
+                {
+                    # should be identical to AISubjectTrackingMode
+                    0 => 'No Subject Detection',
+                    1 => 'Motorsports',
+                    2 => 'Airplanes',
+                    3 => 'Trains',
+                    4 => 'Birds',
+                    5 => 'Dogs & Cats',
+                },{
+                    0 => 'Face Priority',
+                    1 => 'Target Priority',
+                },{
+                    0 => 'Normal AF',
+                    1 => 'AF on Half Press',
+                },{
+                    0 => 'No Eye-AF',
+                    1 => 'Right Eye Priority',
+                    2 => 'Left Eye Priority',
+                    3 => 'Both Eyes Priority',
+                },{
+                    0 => 'No Face Detection',
+                    1 => 'Face Detection',
+                },{
+                    0 => 'No MF',
+                    1 => 'With MF',
+                },{
+                    0 => 'AF Priority',
+                    1 => 'Release Priority',
+                },{
+                    0 => 'No Object found',
+                    1 => 'Object found',
+                },{
+                    0 => 'MF',
+                    1 => 'S-AF',
+                    2 => 'C-AF',
+                    6 => 'C-AF + TR',
+                },
+            ],
+        },{ # for older models
+            Name => 'AFPointDetails',
+            Writable => 'int16u',
+            Notes => 'other models',
+        }
+    ],
     0x328 => { #PH
         Name => 'AFInfo',
         SubDirectory => { TagTable => 'Image::ExifTool::Olympus::AFInfo' },