exiftool_vendored 11.99.0 → 12.11.0

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

@@ -14,16 +14,33 @@ use vars qw($VERSION);
 use Image::ExifTool qw(:DataAccess :Utils);
 use Image::ExifTool::Import;
 
-$VERSION = '1.01';
+$VERSION = '1.02';
 
 sub ProcessTag($$$$%);
 
 %Image::ExifTool::JSON::Main = (
     GROUPS => { 0 => 'JSON', 1 => 'JSON', 2 => 'Other' },
+    VARS => { NO_ID => 1 },
     NOTES => q{
-        No JSON tags have been pre-defined, but ExifTool will read any existing
-        tags from basic JSON-formatted files.
+        Other than a few tags in the table below, JSON tags have not been
+        pre-defined.  However, ExifTool will read any existing tags from basic
+        JSON-formatted files.
     },
+    # ON1 settings tags
+    ON1_SettingsData => {
+        RawConv => q{
+            require Image::ExifTool::XMP;
+            $val = Image::ExifTool::XMP::DecodeBase64($val);
+        },
+        SubDirectory => { TagTable => 'Image::ExifTool::PLIST::Main' },
+    },
+    ON1_SettingsMetadataCreated     => { Groups => { 2 => 'Time' } },
+    ON1_SettingsMetadataModified    => { Groups => { 2 => 'Time' } },
+    ON1_SettingsMetadataName        => { },
+    ON1_SettingsMetadataPluginID    => { },
+    ON1_SettingsMetadataTimestamp   => { Groups => { 2 => 'Time' } },
+    ON1_SettingsMetadataUsage       => { },
+    ON1_SettingsMetadataVisibleToUser=>{ },
 );
 
 #------------------------------------------------------------------------------
@@ -33,12 +50,18 @@ sub FoundTag($$$$%)
 {
     my ($et, $tagTablePtr, $tag, $val, %flags) = @_;
 
+    # special case to reformat ON1 tag names
+    if ($tag =~ s/^settings\w{8}-\w{4}-\w{4}-\w{4}-\w{12}(Data|Metadata.+)$/ON1_Settings$1/) {
+        $et->OverrideFileType('ONP','application/on1') if $$et{FILE_TYPE} eq 'JSON';
+    }
+
     # avoid conflict with special table entries
     $tag .= '!' if $Image::ExifTool::specialTags{$tag};
 
     AddTagToTable($tagTablePtr, $tag, {
         Name => Image::ExifTool::MakeTagName($tag),
         %flags,
+        Temporary => 1,
     }) unless $$tagTablePtr{$tag};
 
     $et->HandleTag($tagTablePtr, $tag, $val);
@@ -94,7 +117,7 @@ sub ProcessJSON($$)
 
     # remove any old tag definitions in case they change flags
     foreach $key (TagTableKeys($tagTablePtr)) {
-        delete $$tagTablePtr{$key};
+        delete $$tagTablePtr{$key} if $$tagTablePtr{$key}{Temporary};
     }
 
     # extract tags from JSON database

data/bin/lib/Image/ExifTool/Lang/de.pm

@@ -11,7 +11,7 @@ package Image::ExifTool::Lang::de;
 use strict;
 use vars qw($VERSION);
 
-$VERSION = '1.35';
+$VERSION = '1.36';
 
 %Image::ExifTool::Lang::de::Translate = (
    'AEAperture' => 'AE-Blende',
@@ -993,7 +993,9 @@ $VERSION = '1.35';
       },
     },
    'AdvancedSceneMode' => {
+      Description => 'Erweiteter Szenenmodus',
       PrintConv => {
+        'Off' => 'Aus',
         'Creative Macro' => 'Makro kreativ',
         'Flower' => 'Blumen',
         'HDR B&W' => 'HDR Schwarz-Weiß',

data/bin/lib/Image/ExifTool/Lang/es.pm

@@ -1302,7 +1302,7 @@ $VERSION = '1.16';
    'ExifImageHeight' => 'Alto Imagen',
    'ExifImageWidth' => 'Ancho Imagen',
    'ExifOffset' => 'Puntero Exif IFD',
-   'ExifToolVersion' => 'Versión Exiftool',
+   'ExifToolVersion' => 'Versión ExifTool',
    'ExifVersion' => 'Versión Exif',
    'ExpandFilm' => 'Película Expandida',
    'ExpandFilterLens' => 'Filtro Objetivo Expandida',

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

@@ -262,7 +262,7 @@ sub ParseAC3Descriptor($$)
 
 #------------------------------------------------------------------------------
 # Parse PID stream data
-# Inputs: 0) Exiftool ref, 1) PID number, 2) PID type, 3) PID name, 4) data ref
+# Inputs: 0) ExifTool ref, 1) PID number, 2) PID type, 3) PID name, 4) data ref
 # Returns: 0=stream parsed OK,
 #          1=stream parsed but we want to parse more of these,
 #          -1=can't parse yet because we don't know the type

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

@@ -28,8 +28,8 @@ sub ProcessMPImageList($$$);
         from this segment is stored as a JPEG trailer.  The MPF tags are not
         writable, however the MPF segment may be deleted as a group (with "MPF:All")
         but then the JPEG trailer should also be deleted (with "Trailer:All").  See
-        L<http://www.cipa.jp/std/documents/e/DC-007_E.pdf> for the official
-        specification.
+        L<https://web.archive.org/web/20190713230858/http://www.cipa.jp/std/documents/e/DC-007_E.pdf>
+        for the official specification.
     },
     0xb000 => 'MPFVersion',
     0xb001 => 'NumberOfImages',

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

@@ -4,6 +4,7 @@
 # Description:  Read/write MacOS system tags
 #
 # Revisions:    2017/03/01 - P. Harvey Created
+#               2020/10/13 - PH Added ability to read MacOS "._" files
 #------------------------------------------------------------------------------
 
 package Image::ExifTool::MacOS;
@@ -11,15 +12,38 @@ use strict;
 use vars qw($VERSION);
 use Image::ExifTool qw(:DataAccess :Utils);
 
-$VERSION = '1.09';
+$VERSION = '1.11';
 
 sub MDItemLocalTime($);
+sub ProcessATTR($$$);
 
 my %mdDateInfo = (
     ValueConv => \&MDItemLocalTime,
     PrintConv => '$self->ConvertDateTime($val)',
 );
 
+# Information decoded from Mac OS sidecar files
+%Image::ExifTool::MacOS::Main = (
+    GROUPS => { 0 => 'File', 1 => 'MacOS' },
+    NOTES => q{
+        Note that on some filesystems, MacOS creates sidecar files with names that
+        begin with "._".  ExifTool will read these files if specified, and extract
+        the information listed in the following table without the need for extra
+        options, but these files are not writable directly.
+    },
+    2 => {
+        Name => 'RSRC',
+        SubDirectory => { TagTable => 'Image::ExifTool::RSRC::Main' },
+    },
+    9 => {
+        Name => 'ATTR',
+        SubDirectory => {
+            TagTable => 'Image::ExifTool::MacOS::XAttr',
+            ProcessProc => \&ProcessATTR,
+        },
+    },
+);
+
 # "mdls" tags (ref PH)
 %Image::ExifTool::MacOS::MDItem = (
     WRITE_PROC => \&Image::ExifTool::DummyWriteProc,
@@ -221,6 +245,8 @@ my %mdDateInfo = (
         XAttr tags are extracted using the "xattr" utility.  They are extracted if
         any "XAttr*" tag or the MacOS group is specifically requested, or by setting
         the L<XAttrTags|../ExifTool.html#XAttrTags> API option to 1 or the L<RequestAll|../ExifTool.html#RequestAll> API option to 2 or higher.
+        And they extracted by default from MacOS "._" files when reading
+        these files directly.
     },
     'com.apple.FinderInfo' => {
         Name => 'XAttrFinderInfo',
@@ -325,7 +351,7 @@ sub MDItemLocalTime($)
 
 #------------------------------------------------------------------------------
 # Set MacOS MDItem and XAttr tags from new tag values
-# Inputs: 0) Exiftool ref, 1) file name, 2) list of tags to set
+# Inputs: 0) ExifTool ref, 1) file name, 2) list of tags to set
 # Returns: 1=something was set OK, 0=didn't try, -1=error (and warning set)
 # Notes: There may be errors even if 1 is returned
 sub SetMacOSTags($$$)
@@ -486,8 +512,50 @@ sub ExtractMDItemTags($$)
     $$et{INDENT} =~ s/\| $//;
 }
 
+        
+#------------------------------------------------------------------------------
+# Read MacOS XAttr value
+# Inputs: 0) ExifTool object ref, 1) file name
+sub ReadXAttrValue($$$$)
+{
+    my ($et, $tagTablePtr, $tag, $val) = @_;
+    # add to our table if necessary
+    unless ($$tagTablePtr{$tag}) {
+        my $name;
+        # generate tag name from attribute name
+        if ($tag =~ /^com\.apple\.(.*)$/) {
+            ($name = $1) =~ s/^metadata:_?k//;
+            $name =~ s/^metadata:(com_)?//;
+        } else {
+            $name = $tag;
+        }
+        $name =~ s/[.:_]([a-z])/\U$1/g;
+        $name = 'XAttr' . ucfirst $name;
+        my %tagInfo = ( Name => $name );
+        $tagInfo{Groups} = { 2 => 'Time' } if $tag=~/Date$/;
+        $et->VPrint(0, "  [adding $tag]\n");
+        AddTagToTable($tagTablePtr, $tag, \%tagInfo);
+    }
+    if ($val =~ /^bplist0/) {
+        my %dirInfo = ( DataPt => \$val );
+        require Image::ExifTool::PLIST;
+        if (Image::ExifTool::PLIST::ProcessBinaryPLIST($et, \%dirInfo, $tagTablePtr)) {
+            return undef if ref $dirInfo{Value} eq 'HASH';
+            $val = $dirInfo{Value}
+        } else {
+            $et->Warn("Error decoding $$tagTablePtr{$tag}{Name}");
+            return undef;
+        }
+    }
+    if (not ref $val and ($val =~ /\0/ or length($val) > 200) or $tag eq 'XAttrMDLabel') {
+        my $buff = $val;
+        $val = \$buff;
+    }
+    return $val;
+}
+
 #------------------------------------------------------------------------------
-# Extract MacOS extended attribute tags
+# Read MacOS extended attribute tags using 'xattr' utility
 # Inputs: 0) ExifTool object ref, 1) file name
 sub ExtractXAttrTags($$)
 {
@@ -517,39 +585,8 @@ sub ExtractXAttrTags($$)
             $val .= pack('H*', $_);
             next;
         } elsif ($tag and defined $val) {
-            # add to our table if necessary
-            unless ($$tagTablePtr{$tag}) {
-                my $name;
-                # generate tag name from attribute name
-                if ($tag =~ /^com\.apple\.(.*)$/) {
-                    ($name = $1) =~ s/^metadata:_?k//;
-                    $name =~ s/^metadata:(com_)?//;
-                } else {
-                    $name = $tag;
-                }
-                $name =~ s/[.:_]([a-z])/\U$1/g;
-                $name = 'XAttr' . ucfirst $name;
-                my %tagInfo = ( Name => $name );
-                $tagInfo{Groups} = { 2 => 'Time' } if $tag=~/Date$/;
-                $et->VPrint(0, "  [adding $tag]\n");
-                AddTagToTable($tagTablePtr, $tag, \%tagInfo);
-            }
-            if ($val =~ /^bplist0/) {
-                my %dirInfo = ( DataPt => \$val );
-                require Image::ExifTool::PLIST;
-                if (Image::ExifTool::PLIST::ProcessBinaryPLIST($et, \%dirInfo, $tagTablePtr)) {
-                    next if ref $dirInfo{Value} eq 'HASH';
-                    $val = $dirInfo{Value}
-                } else {
-                    $et->Warn("Error decoding $$tagTablePtr{$tag}{Name}");
-                    next;
-                }
-            }
-            if (not ref $val and ($val =~ /\0/ or length($val) > 200) or $tag eq 'XAttrMDLabel') {
-                my $buff = $val;
-                $val = \$buff;
-            }
-            $et->HandleTag($tagTablePtr, $tag, $val);
+            $val = ReadXAttrValue($et, $tagTablePtr, $tag, $val);
+            $et->HandleTag($tagTablePtr, $tag, $val) if defined $val;
             undef $tag;
             undef $val;
         }
@@ -584,6 +621,84 @@ sub GetFileCreateDate($$)
     delete $$et{SET_GROUP1};
 }
 
+#------------------------------------------------------------------------------
+# Read ATTR metadata from "._" file
+# Inputs: 0) ExifTool ref, 1) dirInfo ref, 2) tag table ref
+# Return: 1 on success
+# (ref https://www.swiftforensics.com/2018/11/the-dot-underscore-file-format.html)
+sub ProcessATTR($$$)
+{
+    my ($et, $dirInfo, $tagTablePtr) = @_;
+    my $dataPt = $$dirInfo{DataPt};
+    my $dataPos = $$dirInfo{DataPos};
+    my $dataLen = length $$dataPt;
+
+    $dataLen >= 58 and $$dataPt =~ /^.{34}ATTR/s or $et->Warn('Invalid ATTR header'), return 0;
+    my $entries = Get32u($dataPt, 66);
+    $et->VerboseDir('ATTR', $entries);
+    # (Note: The RAF is not in $dirInfo because it would break RSRC reading --
+    # the RSCR block uses relative offsets, while the ATTR block uses absolute! grrr!)
+    my $raf = $$et{RAF};
+    my $pos = 70;       # first entry is after ATTR header
+    my $i;
+    for ($i=0; $i<$entries; ++$i) {
+        $pos + 12 > $dataLen and $et->Warn('Truncated ATTR entry'), last;
+        my $off = Get32u($dataPt, $pos);
+        my $len = Get32u($dataPt, $pos + 4);
+        my $n = Get8u($dataPt, $pos + 10);  # number of characters in tag name
+        $pos + 11 + $n > $dataLen and $et->Warn('Truncated ATTR name'), last;
+        $off -= $dataPos;       # convert to relative offset (grrr!)
+        $off < 0 or $off > $dataLen and $et->Warn('Invalid ATTR offset'), last;
+        my $tag = substr($$dataPt, $pos + 11, $n);
+        $tag =~ s/\0+$//;       # remove null terminator
+        # remove random ID after kMDLabel in tag ID
+        $tag =~ s/^com.apple.metadata:kMDLabel_.*/com.apple.metadata:kMDLabel/s;
+        $off + $len > $dataLen and $et->Warn('Truncated ATTR value'), last;
+        my $val = ReadXAttrValue($et, $tagTablePtr, $tag, substr($$dataPt, $off, $len));
+        $et->HandleTag($tagTablePtr, $tag, $val,
+            DataPt  => $dataPt,
+            DataPos => $dataPos,
+            Start   => $off,
+            Size    => $len,
+        ) if defined $val;
+        $pos += (11 + $n + 3) & -4; # step to next entry (on even 4-byte boundary)
+    }
+    return 1;
+}
+
+#------------------------------------------------------------------------------
+# Read information from a MacOS "._" sidecar file
+# Inputs: 0) ExifTool ref, 1) dirInfo ref
+# Returns: 1 on success, 0 if this wasn't a valid "._" file
+# (ref https://www.swiftforensics.com/2018/11/the-dot-underscore-file-format.html)
+sub ProcessMacOS($$)
+{
+    my ($et, $dirInfo) = @_;
+    my $raf = $$dirInfo{RAF};
+    my ($hdr, $buff, $i);
+
+    return 0 unless $raf->Read($hdr, 26) == 26 and $hdr =~ /^\0\x05\x16\x07\0(.)\0\0Mac OS X        /s;
+    my $ver = ord $1;
+    # (extension may be anything, so just echo back the incoming file extension if it exists)
+    $et->SetFileType(undef, undef, $$et{FILE_EXT});
+    $ver == 2 or $et->Warn("Unsupported file version $ver"), return 1;
+    SetByteOrder('MM');
+    my $tagTablePtr = GetTagTable('Image::ExifTool::MacOS::Main');
+    my $entries = Get16u(\$hdr, 0x18);
+    $et->VerboseDir('MacOS', $entries);
+    $raf->Read($hdr, $entries * 12) == $entries * 12 or $et->Warn('Truncated header'), return 1;
+    for ($i=0; $i<$entries; ++$i) {
+        my $pos = $i * 12;
+        my $tag = Get32u(\$hdr, $pos);
+        my $off = Get32u(\$hdr, $pos + 4);
+        my $len = Get32u(\$hdr, $pos + 8);
+        $len > 100000000 and $et->Warn('Record size too large'), last;
+        $raf->Seek($off,0) and $raf->Read($buff,$len) == $len or $et->Warn('Truncated record'), last;
+        $et->HandleTag($tagTablePtr, $tag, undef, DataPt => \$buff, DataPos => $off, Index => $i);
+    }
+    return 1;
+}
+
 1;  # end
 
 __END__
@@ -600,8 +715,9 @@ This module is used by Image::ExifTool
 
 This module contains definitions required by Image::ExifTool to extract
 MDItem* and XAttr* tags on MacOS systems using the "mdls" and "xattr"
-utilities respectively.  Writable tags use "xattr", "setfile" or "osascript"
-for writing.
+utilities respectively.  It also reads metadata directly from the MacOS "_."
+sidecar files that are used on some filesystems to store file attributes. 
+Writable tags use "xattr", "setfile" or "osascript" for writing.
 
 =head1 AUTHOR
 

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

@@ -14,7 +14,7 @@ use strict;
 use vars qw($VERSION);
 use Image::ExifTool qw(:DataAccess :Utils);
 
-$VERSION = '1.09';
+$VERSION = '1.10';
 
 my %noYes = ( 0 => 'No', 1 => 'Yes' );
 
@@ -221,6 +221,8 @@ my %noYes = ( 0 => 'No', 1 => 'Yes' );
     },
     0x2e => {
         Name => 'TrackEntry',
+        # reset TrackType member at the start of each track
+        Condition => 'delete $$self{TrackType}; 1',
         SubDirectory => { TagTable => 'Image::ExifTool::Matroska::Main' },
     },
     0x57   => { Name => 'TrackNumber',      Format => 'unsigned' },

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

@@ -49,7 +49,7 @@ use vars qw($VERSION %minoltaLensTypes %minoltaTeleconverters %minoltaColorMode
 use Image::ExifTool qw(:DataAccess :Utils);
 use Image::ExifTool::Exif;
 
-$VERSION = '2.83';
+$VERSION = '2.87';
 
 # Full list of product codes for Sony-compatible Minolta lenses
 # (ref http://www.kb.sony.com/selfservice/documentLink.do?externalId=C1000570)
@@ -602,13 +602,18 @@ $VERSION = '2.83';
     15 => 'Light', #JR (NC)
     16 => 'Autumn Leaves', #JR (NC)
     17 => 'Sepia', #JR
+    18 => 'FL', #JR (7SM3)
+    19 => 'Vivid 2', #JR (7SM3)
+    20 => 'IN', #JR (7SM3)
+    21 => 'SH', #JR (7SM3)
     100 => 'Neutral', #JD
     101 => 'Clear', #JD
     102 => 'Deep', #JD
     103 => 'Light', #JD
     104 => 'Night View', #JD
     105 => 'Autumn Leaves', #JD
-    0xffffffff => 'n/a', #PH
+    255 => 'Off', #JR (new for ILCE-7SM3, July 2020)
+   0xffffffff => 'n/a', #PH
 );
 
 %minoltaSceneMode = (

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

@@ -62,7 +62,7 @@ use Image::ExifTool qw(:DataAccess :Utils);
 use Image::ExifTool::Exif;
 use Image::ExifTool::GPS;
 
-$VERSION = '3.83';
+$VERSION = '3.89';
 
 sub LensIDConv($$$);
 sub ProcessNikonAVI($$$);
@@ -349,6 +349,7 @@ sub GetAFPointGrid($$;$);
     'FE 47 00 00 24 24 4B 06' => 'Sigma 4.5mm F2.8 EX DC HSM Circular Fisheye', #JD
     '26 48 11 11 30 30 1C 02' => 'Sigma 8mm F4 EX Circular Fisheye',
     '79 40 11 11 2C 2C 1C 06' => 'Sigma 8mm F3.5 EX Circular Fisheye', #JD
+    'DB 40 11 11 2C 2C 1C 06' => 'Sigma 8mm F3.5 EX DG Circular Fisheye', #30
     'DC 48 19 19 24 24 4B 06' => 'Sigma 10mm F2.8 EX DC HSM Fisheye',
     'C2 4C 24 24 14 14 4B 06' => 'Sigma 14mm F1.8 DG HSM | A', #IB
     '48 48 24 24 24 24 4B 02' => 'Sigma 14mm F2.8 EX Aspherical HSM',
@@ -449,6 +450,7 @@ sub GetAFPointGrid($$;$);
   # '92 3E 2D 88 2C 40 4B 0E' (22mm)
   # '92 40 2D 88 2C 40 4B 0E' (18mm)
     '26 48 31 49 24 24 1C 02' => 'Sigma 20-40mm F2.8',
+    '7B 48 37 44 18 18 4B 06' => 'Sigma 24-35mm F2.0 DG HSM | A', #30
     '02 3A 37 50 31 3D 02 00' => 'Sigma 24-50mm F4-5.6 UC',
     '26 48 37 56 24 24 1C 02' => 'Sigma 24-60mm F2.8 EX DG',
     'B6 48 37 56 24 24 1C 02' => 'Sigma 24-60mm F2.8 EX DG',
@@ -513,6 +515,7 @@ sub GetAFPointGrid($$;$);
     'CE 34 76 A0 38 40 4B 0E' => 'Sigma 150-500mm F5-6.3 DG OS APO HSM', #JD
     '81 34 76 A6 38 40 4B 0E' => 'Sigma 150-600mm F5-6.3 DG OS HSM | S', #Jaap Voets
     '82 34 76 A6 38 40 4B 0E' => 'Sigma 150-600mm F5-6.3 DG OS HSM | C',
+    'C4 4C 73 73 14 14 4B 46' => 'Sigma 135mm F1.8 DG HSM | A', #forum3833
     '26 40 7B A0 34 40 1C 02' => 'Sigma APO 170-500mm F5-6.3 Aspherical RF',
     'A7 49 80 A0 24 24 4B 06' => 'Sigma APO 200-500mm F2.8 EX DG',
     '48 3C 8E B0 3C 3C 4B 02' => 'Sigma APO 300-800mm F5.6 EX DG HSM',
@@ -579,6 +582,7 @@ sub GetAFPointGrid($$;$);
     '4D 41 3C 8E 2B 40 62 02' => 'Tamron AF 28-300mm f/3.5-6.3 XR Di LD Aspherical (IF) (A061)',
     '4D 41 3C 8E 2C 40 62 02' => 'Tamron AF 28-300mm f/3.5-6.3 XR LD Aspherical (IF) (185D)',
     'F9 40 3C 8E 2C 40 40 0E' => 'Tamron AF 28-300mm f/3.5-6.3 XR Di VC LD Aspherical (IF) Macro (A20)',
+    'C9 3C 44 76 25 31 DF 4E' => 'Tamron 35-150mm f/2.8-4 Di VC OSD (A043)', #30
     '00 47 53 80 30 3C 00 06' => 'Tamron AF 55-200mm f/4-5.6 Di II LD (A15)',
     'F7 53 5C 80 24 24 84 06' => 'Tamron SP AF 70-200mm f/2.8 Di LD (IF) Macro (A001)',
     'FE 53 5C 80 24 24 84 06' => 'Tamron SP AF 70-200mm f/2.8 Di LD (IF) Macro (A001)',
@@ -711,6 +715,7 @@ sub GetAFPointGrid($$;$);
     '00 48 80 80 30 30 00 00' => 'Nikkor 200mm f/4 AiS',
     '00 40 11 11 2C 2C 00 00' => 'Samyang 8mm f/3.5 Fish-Eye',
     '00 58 64 64 20 20 00 00' => 'Soligor C/D Macro MC 90mm f/2.5',
+    '4A 58 30 30 14 0C 4D 02' => 'Rokinon 20mm f/1.8 ED AS UMC', #30
 );
 
 # text encoding used in LocationInfo (ref PH)
@@ -878,6 +883,38 @@ my %afPoints39 = (
     10 => 'E3', 20 => 'B9', 30 => 'D4',
 );
 
+# AF point indices for models with 105 focus points, eg. D6 (ref 28)
+# - 7 rows (A-G) with 15 columns (1-15), center is D8
+my %afPoints105 = (
+     1 => 'D8',  28 => 'G7',  55 => 'F13', 82 => 'E4', 
+     2 => 'C8',  29 => 'D6',  56 => 'G13', 83 => 'F4', 
+     3 => 'B8',  30 => 'C6',  57 => 'D14', 84 => 'G4', 
+     4 => 'A8',  31 => 'B6',  58 => 'C14', 85 => 'D3', 
+     5 => 'E8',  32 => 'A6',  59 => 'B14', 86 => 'C3', 
+     6 => 'F8',  33 => 'E6',  60 => 'A14', 87 => 'B3', 
+     7 => 'G8',  34 => 'F6',  61 => 'E14', 88 => 'A3',
+     8 => 'D9',  35 => 'G6',  62 => 'F14', 89 => 'E3', 
+     9 => 'C9',  36 => 'D11', 63 => 'G14', 90 => 'F3', 
+    10 => 'B9',  37 => 'C11', 64 => 'D15', 91 => 'G3', 
+    11 => 'A9',  38 => 'B11', 65 => 'C15', 92 => 'D2', 
+    12 => 'E9',  39 => 'A11', 66 => 'B15', 93 => 'C2', 
+    13 => 'F9',  40 => 'E11', 67 => 'A15', 94 => 'B2', 
+    14 => 'G9',  41 => 'F11', 68 => 'E15', 95 => 'A2', 
+    15 => 'D10', 42 => 'G11', 69 => 'F15', 96 => 'E2', 
+    16 => 'C10', 43 => 'D12', 70 => 'G15', 97 => 'F2', 
+    17 => 'B10', 44 => 'C12', 71 => 'D5',  98 => 'G2', 
+    18 => 'A10', 45 => 'B12', 72 => 'C5',  99 => 'D1', 
+    19 => 'E10', 46 => 'A12', 73 => 'B5', 100 => 'C1', 
+    20 => 'F10', 47 => 'E12', 74 => 'A5', 101 => 'B1', 
+    21 => 'G10', 48 => 'F12', 75 => 'E5', 102 => 'A1',
+    22 => 'D7',  49 => 'G12', 76 => 'F5', 103 => 'E1', 
+    23 => 'C7',  50 => 'D13', 77 => 'G5', 104 => 'F1', 
+    24 => 'B7',  51 => 'C13', 78 => 'D4', 105 => 'G1', 
+    25 => 'A7',  52 => 'B13', 79 => 'C4', 
+    26 => 'E7',  53 => 'A13', 80 => 'B4', 
+    27 => 'F7',  54 => 'E13', 81 => 'A4', 
+);
+
 # AF point indices for models with 135 focus points, eg. 1J1 (ref PH)
 # - 9 rows (A-I) with 15 columns (1-15), center is E8
 # - odd columns, columns 2 and 14, and the remaining corner points are
@@ -1540,7 +1577,7 @@ my %binaryDataAttrs = (
     0x008c => {
         Name => 'ContrastCurve', #JD
         Writable => 'undef',
-        Flags => [ 'Binary', 'Protected' ],
+        Flags => [ 'Binary', 'Protected', 'Drop' ], # (drop because not found in Nikon JPEG's)
     },
     # ColorHue: MODE1/MODE1a=sRGB, MODE2=Adobe RGB, MODE3a=more saturated sRGB
     # --> should really be called ColorSpace or ColorMode, but that would conflict with other tags
@@ -1785,6 +1822,16 @@ my %binaryDataAttrs = (
                 ByteOrder => 'LittleEndian',
             },
         },
+        { # (D6 firmware version 1.00, ref 28)
+            Condition => '$$valPt =~ /^0246/',
+            Name => 'ShotInfoD6',
+            SubDirectory => {
+                TagTable => 'Image::ExifTool::Nikon::ShotInfo',
+                DecryptStart => 4,
+                DecryptLen => 0xa4, # only decrypt the version info & offset fields for now                            
+                ByteOrder => 'LittleEndian',
+            },
+        },
         { # (D610 firmware version 1.00)
             Condition => '$$valPt =~ /^0232/',
             Name => 'ShotInfoD610',
@@ -1834,6 +1881,7 @@ my %binaryDataAttrs = (
             7 => 'Unpacked 12 bits', #IB (padded to 16)
             8 => 'Small', #IB
             9 => 'Packed 12 bits', #IB (2 pixels in 3 bytes)
+            10 => 'Packed 14 bits', #28 (4 pixels in 7 bytes, eg. D6 uncompressed 14 bit)
         },
     },
     0x0094 => { Name => 'SaturationAdj',    Writable => 'int16s' },
@@ -2035,7 +2083,7 @@ my %binaryDataAttrs = (
             },
         },
         {
-            Condition => '$$valPt =~ /^0800/', # Z6/Z7
+            Condition => '$$valPt =~ /^080[01]/', # Z6/Z7
             Name => 'LensData0800',
             SubDirectory => {
                 TagTable => 'Image::ExifTool::Nikon::LensData0800',
@@ -3300,6 +3348,7 @@ my %binaryDataAttrs = (
                 15 => 'Dynamic Area (72 points)', #PH
                 16 => 'Group Area (HL)', #28
                 17 => 'Group Area (VL)', #28
+                18 => 'Dynamic Area (49 points)', #28
                 128 => 'Single', #PH (1J1,1J2,1J3,1J4,1S1,1S2,1V2,1V3)
                 129 => 'Auto (41 points)', #PH (1J1,1J2,1J3,1J4,1S1,1S2,1V1,1V2,1V3,AW1)
                 130 => 'Subject Tracking (41 points)', #PH (1J1,1J4,1J3)
@@ -3337,6 +3386,10 @@ my %binaryDataAttrs = (
                 197 => 'Auto', #PH (Z7)
                 198 => 'Auto (198)', #PH (Z7) (focus lock with AF-C maybe?)
                 199 => 'Auto (focus lock)', #PH (Z7, AF-S)
+                200 => 'Normal-area AF', #28 (D6)
+                201 => 'Wide-area AF', #28 (D6)
+                202 => 'Face-priority AF', #28 (D6)
+                203 => 'Subject-tracking AF', #28 (D6)
             },
         },
     ],
@@ -3355,12 +3408,14 @@ my %binaryDataAttrs = (
             6 => 'On (105-point)', #PH (1J4/1V3[128/130])
             7 => 'On (153-point)', #PH (D5/D500/D850)
             8 => 'On (81-point)', #38
+            9 => 'On (105-point)', #28 (D6)
         },
     },
     7 => [
         { #PH/JD
             Name => 'PrimaryAFPoint',
-            Condition => '$$self{PhaseDetectAF} < 2',
+            # PrimaryAFPoint may only be valid for PhaseDetect - certainly true on the D6, possibly other bodies? (ref 28)
+            Condition => '$$self{PhaseDetectAF} < 2 and $$self{AFInfo2Version} ne "0301"',
             Notes => q{
                 models with 51-point AF -- 5 rows (A-E) and 11 columns (1-11): D3, D3S, D3X,
                 D4, D4S, D300, D300S, D700, D800, D800e and D810
@@ -3495,7 +3550,7 @@ my %binaryDataAttrs = (
     8 => [
         { #JD/PH
             Name => 'AFPointsUsed',
-            Condition => '$$self{PhaseDetectAF} < 2',
+            Condition => '$$self{PhaseDetectAF} < 2 and $$self{AFInfo2Version} ne "0301"',
             Notes => q{
                 models with 51-point AF -- 5 rows: A1-9, B1-11, C1-11, D1-11, E1-9.  Center
                 point is C6
@@ -3614,6 +3669,8 @@ my %binaryDataAttrs = (
         },
         { #PH
             Name => 'AFPointsUsed',
+            # version 301 uses a separate field at offset 0x0a for this tag (ref 28)
+            Condition =>  '$$self{AFInfo2Version} ne "0301"',
             Format => 'undef[7]',
             ValueConv => 'join(" ", unpack("H2"x7, $val))',
             ValueConvInv => '$val=~tr/ //d; pack("H*",$val)',
@@ -3621,6 +3678,19 @@ my %binaryDataAttrs = (
             PrintConvInv => '$val=~s/Unknown \\((.*)\\)/$1/; $val',
         },
     ],
+    0x0a => { #28 (D6) in any of the 3 Group modes on the D6, the points specify the outer boundaries of the focus point area; otherwise the tag value is consistent with other Nikon bodies
+            Name => 'AFPointsUsed',
+        Condition => '$$self{AFInfo2Version} eq "0301"  and $$self{PhaseDetectAF} == 9',      
+        Notes => q{
+            models with 105-point AF -- 7 rows (A-G) and 15 columns (1-15). Center
+            point is D8
+        },
+        Format => 'undef[14]',
+        ValueConv => 'join(" ", unpack("H2"x14, $val))',
+        ValueConvInv => '$val=~tr/ //d; pack("H*",$val)',
+        PrintConv => sub { PrintAFPoints(shift, \%afPoints105); },
+        PrintConvInv => sub { PrintAFPointsInv(shift, \%afPoints105); },
+    },
     0x10 => { #PH (D90 and D5000)
         Name => 'AFImageWidth',
         Condition => '$$self{AFInfo2Version} eq "0100"',
@@ -3663,11 +3733,21 @@ my %binaryDataAttrs = (
         Format => 'int16u',
         RawConv => '$val ? $val : undef',
     },
-    0x1c => { #PH
-        Name => 'ContrastDetectAFInFocus',
-        Condition => '$$self{AFInfo2Version} eq "0100"',
-        PrintConv => { 0 => 'No', 1 => 'Yes' },
-    },
+    0x1c => [
+        { #PH
+            Name => 'ContrastDetectAFInFocus',
+            Condition => '$$self{AFInfo2Version} eq "0100"',
+            PrintConv => { 0 => 'No', 1 => 'Yes' },
+        },{ #PH (D500, see forum11190)
+            Name => 'AFPointsSelected',
+            Condition => '$$self{AFInfo2Version} eq "0101" and $$self{PhaseDetectAF} == 7',
+            Format => 'undef[20]',
+            ValueConv => 'join(" ", unpack("H2"x20, $val))',
+            ValueConvInv => '$val=~tr/ //d; pack("H*",$val)',
+            PrintConv => sub { PrintAFPoints(shift, \%afPoints153); },
+            PrintConvInv => sub { PrintAFPointsInv(shift, \%afPoints153); },
+        },
+    ],
     # 0x1d - always zero (with or without live view)
     0x2a => { #PH (Z7)
         Name => 'AFImageWidth',
@@ -3683,14 +3763,31 @@ my %binaryDataAttrs = (
     },
     0x2e => { #PH (Z7)
         Name => 'AFAreaXPosition',
-        Condition => '$$self{ContrastDetectAF} == 2 and $$self{AFInfo2Version} =~ /^03/',
-        Format => 'int16u',
-    },
-    0x30 => { #PH (Z7)
-        Name => 'AFAreaYPosition',
-        Condition => '$$self{ContrastDetectAF} == 2 and $$self{AFInfo2Version} =~ /^03/',
+        Condition => q{
+            $$self{ContrastDetectAF} == 2 and $$self{AFInfo2Version} =~ /^03/ or
+            $$self{ContrastDetectAF} == 1 and $$self{AFInfo2Version} =~ /^0301/
+        },
         Format => 'int16u',
     },
+    0x30 => [
+        { #PH (Z7)
+            Name => 'AFAreaYPosition',
+            Condition => q{
+                $$self{ContrastDetectAF} == 2 and $$self{AFInfo2Version} =~ /^03/ or
+                $$self{ContrastDetectAF} == 1 and $$self{AFInfo2Version} =~ /^0301/
+            },
+            Format => 'int16u',
+        },{ #PH (D500, see forum11190)
+            Name => 'AFPointsInFocus',
+            Condition => '$$self{AFInfo2Version} eq "0101" and $$self{PhaseDetectAF} == 7',
+            Notes => 'AF points in focus at the time time image was captured',
+            Format => 'undef[20]',
+            ValueConv => 'join(" ", unpack("H2"x20, $val))',
+            ValueConvInv => '$val=~tr/ //d; pack("H*",$val)',
+            PrintConv => sub { PrintAFPoints(shift, \%afPoints153); },
+            PrintConvInv => sub { PrintAFPointsInv(shift, \%afPoints153); },
+        },
+    ],
     0x32 => { #PH (Z7)
         Name => 'AFAreaWidth',
         Condition => '$$self{AFInfo2Version} =~ /^03/',
@@ -3703,6 +3800,19 @@ my %binaryDataAttrs = (
         Format => 'int16u',
         RawConv => '$val ? $val : undef',
     },
+    0x38 => { #28
+        Name => 'PrimaryAFPoint',
+        Condition => '$$self{PhaseDetectAF} == 9 and $$self{AFInfo2Version} =~ /^03/',
+        Notes => q{
+            Nikon models with 105-point AF -- 7 rows (A-G) and 15 columns (1-15): D6
+        },
+        PrintConvColumns => 5,
+        PrintConv => {
+            0 => '(none)',
+            %afPoints105,
+            1 => 'D8 (Center)',
+        },
+    },
     0x44 => [
         {
             Name => 'PrimaryAFPoint',
@@ -3802,6 +3912,7 @@ my %binaryDataAttrs = (
             # (don't know what the difference between 1 and 2 is)
             1 => 'On (1)',
             2 => 'On (2)',
+            3 => 'On (Zoom)', #28
         },
     },
     1 => {
@@ -3811,6 +3922,7 @@ my %binaryDataAttrs = (
         PrintConvInv => '$val eq "n/a" ? 255 : $val',
     },
     2 => {
+        # when AFFineTune = 3 (indicating a zoom lens), this Tag stores the tuning adjustment for the wide end of the zoom range (ref 28)
         Name => 'AFFineTuneAdj',
         Priority => 0, # so other value takes priority if it exists
         Notes => 'may only be valid for saved lenses',
@@ -3818,6 +3930,14 @@ my %binaryDataAttrs = (
         PrintConv => '$val > 0 ? "+$val" : $val',
         PrintConvInv => '$val',
     },
+    3 => {
+        Name => 'AFFineTuneAdjTele',
+        # should probably insert a Condition that restricts this to AFFineTune = 3 (ref 28)
+        Notes => 'only valid for zoom lenses (ie, AFTune=3)',
+        Format => 'int8s',
+        PrintConv => '$val > 0 ? "+$val" : $val',
+        PrintConvInv => '$val',
+    },
 );
 
 # Nikon NEF processing information (ref forum6281)
@@ -4538,6 +4658,12 @@ my %nikonFocalConversions = (
             13 => 'Nikkor Z 24-70mm f/2.8 S',
             14 => 'Nikkor Z 85mm f/1.8 S',
             15 => 'Nikkor Z 24mm f/1.8 S', #IB
+            16 => 'Nikkor Z 70-200mm f/2.8 VR S', #IB
+            17 => 'Nikkor Z 20mm f/1.8 S', #IB
+            18 => 'Nikkor Z 24-200mm f/4-6.3 VR', #IB
+            21 => 'Nikkor Z 50mm f/1.2 S', #IB
+            22 => 'Nikkor Z 24-50mm f/4-6.3', #IB
+            23 => 'Nikkor Z 14-24mm f/2.8 S', #IB
         },
     },
     0x36 => {
@@ -8873,7 +8999,7 @@ my %nikonFocalConversions = (
             },
         },
         {
-            Condition => '$$valPt =~ /^0800/', # Z6/Z7
+            Condition => '$$valPt =~ /^080[01]/', # Z6/Z7
             Name => 'LensData0800',
             SubDirectory => {
                 TagTable => 'Image::ExifTool::Nikon::LensData0800',