exiftool_vendored 9.71.0 → 9.78.0

data/bin/{Image-ExifTool-9.71 → Image-ExifTool-9.78}/lib/Image/ExifTool/LNK.pm

@@ -15,7 +15,7 @@ use strict;
 use vars qw($VERSION);
 use Image::ExifTool qw(:DataAccess :Utils);
 
-$VERSION = '1.06';
+$VERSION = '1.07';
 
 sub ProcessItemID($$$);
 sub ProcessLinkInfo($$$);
@@ -599,7 +599,7 @@ sub ProcessLNK($$)
         $raf->Read($buf2, $len - 0x4c) == $len - 0x4c or return 0;
         $buff .= $buf2;
     }
-    $et->SetFileType('Windows Shortcut');
+    $et->SetFileType();
     SetByteOrder('II');
 
     my $tagTablePtr = GetTagTable('Image::ExifTool::LNK::Main');

data/bin/{Image-ExifTool-9.71 → Image-ExifTool-9.78}/lib/Image/ExifTool/Lang/de.pm

@@ -4660,7 +4660,7 @@ $VERSION = '1.29';
    'Image::ExifTool::PNG::PhysicalPixel' => 'PNG physikalische Pixel',
    'Image::ExifTool::PNG::PrimaryChromaticities' => 'PNG primäre Chromatizität',
    'Image::ExifTool::PNG::StereoImage' => 'PNG Stereobild',
-   'Image::ExifTool::PNG::TextualData' => ' PNG Textdaten',
+   'Image::ExifTool::PNG::TextualData' => 'PNG Textdaten',
    'Image::ExifTool::PNG::VirtualPage' => 'PNG virtuelle Seite',
    'Image::ExifTool::PSP::Creator' => 'PSP Ersteller',
    'Image::ExifTool::Pentax::CameraInfo' => 'Pentax KameraInfo',
@@ -5920,7 +5920,7 @@ $VERSION = '1.29';
    'NumChannels' => 'Anzahl Kanäle',
    'NumColors' => 'Anzahl Farben',
    'NumFacePositions' => 'Gesichtspositionen',
-   'NumImportantColors' => ' Anzahl Hauptfarben',
+   'NumImportantColors' => 'Anzahl Hauptfarben',
    'NumberOfFocusPoints' => {
       Description => 'Anzahl AF-Punkte',
       PrintConv => {

data/bin/{Image-ExifTool-9.71 → Image-ExifTool-9.78}/lib/Image/ExifTool/Lang/fr.pm

@@ -11,7 +11,7 @@ package Image::ExifTool::Lang::fr;
 use strict;
 use vars qw($VERSION);
 
-$VERSION = '1.28';
+$VERSION = '1.29';
 
 %Image::ExifTool::Lang::fr::Translate = (
    'AEAperture' => 'Ouverture AE',
@@ -2870,7 +2870,6 @@ $VERSION = '1.28';
         'Multi-spot' => 'MultiSpot',
         'Other' => 'Autre',
         'Partial' => 'Partielle',
-        'Spot' => 'Grain',
         'Unknown' => 'Inconnu',
       },
     },

data/bin/{Image-ExifTool-9.71 → Image-ExifTool-9.78}/lib/Image/ExifTool/MakerNotes.pm

@@ -21,7 +21,7 @@ sub ProcessKodakPatch($$$);
 sub WriteUnknownOrPreview($$$);
 sub FixLeicaBase($$;$);
 
-$VERSION = '1.93';
+$VERSION = '1.94';
 
 my $debug;          # set to 1 to enable debugging code
 
@@ -863,7 +863,7 @@ my $debug;          # set to 1 to enable debugging code
         # (starts with "SONY DSC \0" or "SONY CAM \0")
         # (TF1 starts with "\0\0SONY PIC\0")
         # (Hasselblad models start with "VHAB     \0")
-        Condition => '$$valPt=~/^(SONY (DSC|CAM)|\0\0SONY PIC\0|VHAB     \0)/',
+        Condition => '$$valPt=~/^(SONY (DSC|CAM|MOBILE)|\0\0SONY PIC\0|VHAB     \0)/',
         SubDirectory => {
             TagTable => 'Image::ExifTool::Sony::Main',
             Start => '$valuePtr + 12',

data/bin/{Image-ExifTool-9.71 → Image-ExifTool-9.78}/lib/Image/ExifTool/Minolta.pm

@@ -52,7 +52,7 @@ use vars qw($VERSION %minoltaLensTypes %minoltaTeleconverters %minoltaColorMode
 use Image::ExifTool qw(:DataAccess :Utils);
 use Image::ExifTool::Exif;
 
-$VERSION = '2.16';
+$VERSION = '2.18';
 
 # Full list of product codes for Sony-compatible Minolta lenses
 # (ref http://www.kb.sony.com/selfservice/documentLink.do?externalId=C1000570)
@@ -334,9 +334,9 @@ my %metabonesID = (
     146 => 'Voigtlander Macro APO-Lanthar 125mm F2.5 SL', #JD
     194 => 'Tamron SP AF 17-50mm F2.8 XR Di II LD Aspherical [IF]', #23 (Model A16)
     203 => 'Tamron SP 70-200mm F2.8 Di USD', #25 (Model A009)
-    # ? => 'Tamron SP 24-70mm F2.8 Di USD', #25 (Model A007)
-    # ? => 'Tamron SP 150-600mm F5-6.3 Di USD', #25 (Model A011)
-    # ? => 'Tamron SP 90mm F2.8 Di Macro 1:1 USD', #25 (Model F004)
+    204 => 'Tamron SP 24-70mm F2.8 Di USD', #25 (Model A007)
+    214 => 'Tamron SP 150-600mm F5-6.3 Di USD', #25 (Model A011)
+    224 => 'Tamron SP 90mm F2.8 Di Macro 1:1 USD', #25 (Model F004)
     255 => 'Tamron Lens (255)',
     255.1 => 'Tamron SP AF 17-50mm F2.8 XR Di II LD Aspherical', # (Model A16)
     255.2 => 'Tamron AF 18-250mm F3.5-6.3 XR Di II LD', #JD (Model A18?)
@@ -505,27 +505,31 @@ my %metabonesID = (
    '65535.18' => 'Sony E PZ 18-200mm F3.5-6.3 OSS', #25 (SELP18200  - 32807)
    '65535.19' => 'Sony FE 55mm F1.8 ZA',            #25 (SEL55F18Z  - 32808)
    '65535.20' => 'Sony FE 70-200mm F4 G OSS',       #25 (SEL70200G  - 32810)
-   '65535.21' => 'Sony FE 28-70mm F3.5-5.6 OSS',    #25 (SEL2870    - 32813)
+   '65535.21' => 'Sony FE 16-35mm F4 ZA OSS',       #25 (SEL1635Z   - 32811)
+   '65535.22' => 'Sony FE 28-70mm F3.5-5.6 OSS',    #25 (SEL2870    - 32813)
+   '65535.23' => 'Sony FE PZ 28-135mm F4 G OSS',    #25 (SELP28135G - 32817)
 #
 # 3rd party E lenses
 #
-   '65535.22' => 'Sigma 19mm F2.8 [EX] DN', #25
-   '65535.23' => 'Sigma 30mm F2.8 [EX] DN', #25
-   '65535.24' => 'Sigma 60mm F2.8 DN', #25
-   '65535.25' => 'Tamron 18-200mm F3.5-6.3 Di III VC', #25 (Model B011)
-   '65535.26' => 'Zeiss Touit 12mm F2.8', #25
-   '65535.27' => 'Zeiss Touit 32mm F1.8', #25
-   '65535.28' => 'Zeiss Touit 50mm F2.8 Macro', #25
+   '65535.24' => 'Sigma 19mm F2.8 [EX] DN', #25
+   '65535.25' => 'Sigma 30mm F2.8 [EX] DN', #25
+   '65535.26' => 'Sigma 60mm F2.8 DN', #25
+   '65535.27' => 'Tamron 18-200mm F3.5-6.3 Di III VC', #25 (Model B011)
+   '65535.28' => 'Zeiss Loxia 35mm F2', #25
+   '65535.29' => 'Zeiss Loxia 50mm F2', #25
+   '65535.30' => 'Zeiss Touit 12mm F2.8', #25
+   '65535.31' => 'Zeiss Touit 32mm F1.8', #25
+   '65535.32' => 'Zeiss Touit 50mm F2.8 Macro', #25
 #
 # other lenses
 #
-   '65535.29' => 'Arax MC 35mm F2.8 Tilt+Shift', #JD
-   '65535.30' => 'Arax MC 80mm F2.8 Tilt+Shift', #JD
-   '65535.31' => 'Zenitar MF 16mm F2.8 Fisheye M42', #JD
-   '65535.32' => 'Samyang 500mm Mirror F8.0', #19
-   '65535.33' => 'Pentacon Auto 135mm F2.8', #19
-   '65535.34' => 'Pentacon Auto 29mm F2.8', #19
-   '65535.35' => 'Helios 44-2 58mm F2.0', #19
+   '65535.33' => 'Arax MC 35mm F2.8 Tilt+Shift', #JD
+   '65535.34' => 'Arax MC 80mm F2.8 Tilt+Shift', #JD
+   '65535.35' => 'Zenitar MF 16mm F2.8 Fisheye M42', #JD
+   '65535.36' => 'Samyang 500mm Mirror F8.0', #19
+   '65535.37' => 'Pentacon Auto 135mm F2.8', #19
+   '65535.38' => 'Pentacon Auto 29mm F2.8', #19
+   '65535.39' => 'Helios 44-2 58mm F2.0', #19
 );
 
 %minoltaTeleconverters = (

data/bin/{Image-ExifTool-9.71 → Image-ExifTool-9.78}/lib/Image/ExifTool/Nikon.pm

@@ -46,6 +46,8 @@
 #              31) Michael Relt private communication
 #              32) Stefan http://u88.n24.queensu.ca/exiftool/forum/index.php/topic,4494.0.html
 #              33) Iliah Borg private communication (LibRaw)
+#              34) Stewart Bennett private communication (D4S, D810)
+#              35) David Puschel private communication
 #              JD) Jens Duttke private communication
 #------------------------------------------------------------------------------
 
@@ -56,15 +58,18 @@ use vars qw($VERSION %nikonLensIDs %nikonTextEncoding);
 use Image::ExifTool qw(:DataAccess :Utils);
 use Image::ExifTool::Exif;
 
-$VERSION = '2.93';
+$VERSION = '2.96';
 
 sub LensIDConv($$$);
 sub ProcessNikonAVI($$$);
 sub ProcessNikonMOV($$$);
 sub FormatString($);
 sub ProcessNikonCaptureEditVersions($$$);
-sub PrintAFPoints($$;$);
-sub PrintAFPointsInv($$;$);
+sub PrintAFPoints($$);
+sub PrintAFPointsInv($$$);
+sub PrintAFPointsGrid($$);
+sub PrintAFPointsGridInv($$$);
+sub GetAFPointGrid($$;$);
 
 # nikon lens ID numbers (ref 8/11)
 %nikonLensIDs = (
@@ -267,10 +272,12 @@ sub PrintAFPointsInv($$;$);
     'A3 3C 29 44 30 30 A5 0E' => 'AF-S Nikkor 16-35mm f/4G ED VR',
     'A4 54 37 37 0C 0C A6 06' => 'AF-S Nikkor 24mm f/1.4G ED',
     'A5 40 3C 8E 2C 3C A7 0E' => 'AF-S Nikkor 28-300mm f/3.5-5.6G ED VR',
+    'A5 4C 44 44 14 14 C0 06' => 'AF-S Nikkor 35mm f/1.8G', #35
     'A6 48 8E 8E 24 24 A8 0E' => 'AF-S VR Nikkor 300mm f/2.8G IF-ED II',
     'A7 4B 62 62 2C 2C A9 0E' => 'AF-S DX Micro Nikkor 85mm f/3.5G ED VR',
     'A8 48 80 98 30 30 AA 0E' => 'AF-S VR Zoom-Nikkor 200-400mm f/4G IF-ED II', #http://u88.n24.queensu.ca/exiftool/forum/index.php/topic,3218.msg15495.html#msg15495
     'A9 54 80 80 18 18 AB 0E' => 'AF-S Nikkor 200mm f/2G ED VR II',
+    'A9 4C 31 31 14 14 C4 06' => 'AF-S Nikkor 20mm f/1.8G ED', #30
     'AA 3C 37 6E 30 30 AC 0E' => 'AF-S Nikkor 24-120mm f/4G ED VR',
     'AC 38 53 8E 34 3C AE 0E' => 'AF-S DX VR Nikkor 55-300mm 4.5-5.6G ED',
     'AD 3C 2D 8E 2C 3C AF 0E' => 'AF-S DX Nikkor 18-300mm 3.5-5.6G ED VR',
@@ -278,7 +285,7 @@ sub PrintAFPointsInv($$;$);
     'AF 54 44 44 0C 0C B1 06' => 'AF-S Nikkor 35mm f/1.4G',
     'B0 4C 50 50 14 14 B2 06' => 'AF-S Nikkor 50mm f/1.8G',
     'B1 48 48 48 24 24 B3 06' => 'AF-S DX Micro Nikkor 40mm f/2.8G', #27
-    'B2 48 5C 80 30 30 B4 0E' => 'AF-S Nikkor 70-200mm f/4G ED VR', #David Puschel
+    'B2 48 5C 80 30 30 B4 0E' => 'AF-S Nikkor 70-200mm f/4G ED VR', #35
     'B3 4C 62 62 14 14 B5 06' => 'AF-S Nikkor 85mm f/1.8G',
     'B4 40 37 62 2C 34 B6 0E' => 'AF-S VR Zoom-Nikkor 24-85mm f/3.5-4.5G IF-ED', #30
     'B5 4C 3C 3C 14 14 B7 06' => 'AF-S Nikkor 28mm f/1.8G', #30
@@ -558,6 +565,7 @@ sub PrintAFPointsInv($$;$);
     '00 54 50 50 18 18 00 00' => 'Carl Zeiss Makro-Planar T* 2/50 ZF.2',
     '00 54 62 62 0C 0C 00 00' => 'Carl Zeiss Planar T* 1.4/85 ZF.2',
     '00 54 68 68 18 18 00 00' => 'Carl Zeiss Makro-Planar T* 2/100 ZF.2',
+    '00 54 53 53 0C 0C 00 00' => 'Zeiss 55mm f/1.4 Otus Distagon T*', #33
 #
     '00 54 56 56 30 30 00 00' => 'Coastal Optical Systems 60mm 1:4 UV-VIS-IR Macro Apo',
 #
@@ -578,7 +586,9 @@ sub PrintAFPointsInv($$;$);
 #
     '00 00 48 48 53 53 00 01' => 'Loreo 40mm F11-22 3D Lens in a Cap 9005', #PH
     '00 47 10 10 24 24 00 00' => 'Fisheye Nikkor 8mm f/2.8 AiS',
+    '00 47 3C 3C 24 24 00 00' => 'Nikkor 28mm f/2.8 AiS', #35
     '00 54 44 44 0C 0C 00 00' => 'Nikkor 35mm f/1.4 AiS',
+    '00 57 50 50 14 14 00 00' => 'Nikkor 50mm f/1.8 AI', #35
     '00 48 50 50 18 18 00 00' => 'Nikkor H 50mm f/2',
     '00 48 68 68 24 24 00 00' => 'Series E 100mm f/2.8',
     '00 4C 6A 6A 20 20 00 00' => 'Nikkor 105mm f/2.5 AiS',
@@ -1293,11 +1303,10 @@ my %binaryDataAttrs = (
             SubDirectory => {
                 TagTable => 'Image::ExifTool::Nikon::ShotInfoD3S',
                 DecryptStart => 4,
-                DecryptLen => 0x2e6,
+                DecryptLen => 0x2e9,
                 ByteOrder => 'BigEndian',
             },
         },
-        # 0223 - D4
         { #JD (D300, firmware 0.25 and 1.00)
             # D3 and D300 use the same version number, but the length is different
             Condition => '$$valPt =~ /^0210/ and $count == 5291',
@@ -1337,8 +1346,6 @@ my %binaryDataAttrs = (
             Name => 'ShotInfoD700',
             SubDirectory => {
                 TagTable => 'Image::ExifTool::Nikon::ShotInfoD700',
-                ProcessProc => \&Image::ExifTool::Nikon::ProcessNikonEncrypted,
-                WriteProc => \&Image::ExifTool::Nikon::ProcessNikonEncrypted,
                 DecryptStart => 4,
                 DecryptLen => 0x358,
                 ByteOrder => 'BigEndian',
@@ -1349,8 +1356,6 @@ my %binaryDataAttrs = (
             Name => 'ShotInfoD800',
             SubDirectory => {
                 TagTable => 'Image::ExifTool::Nikon::ShotInfoD800',
-                ProcessProc => \&Image::ExifTool::Nikon::ProcessNikonEncrypted,
-                WriteProc => \&Image::ExifTool::Nikon::ProcessNikonEncrypted,
                 DecryptStart => 4,
                 DecryptLen => 0x720,
                 ByteOrder => 'BigEndian',
@@ -1394,13 +1399,31 @@ my %binaryDataAttrs = (
             Name => 'ShotInfoD7000',
             SubDirectory => {
                 TagTable => 'Image::ExifTool::Nikon::ShotInfoD7000',
-                ProcessProc => \&Image::ExifTool::Nikon::ProcessNikonEncrypted,
-                WriteProc => \&Image::ExifTool::Nikon::ProcessNikonEncrypted,
                 DecryptStart => 4,
                 DecryptLen => 0x448,
                 ByteOrder => 'BigEndian',
             },
         },
+        { # (D4 firmware version 1.00g)
+            Condition => '$$valPt =~ /^0223/',
+            Name => 'ShotInfoD4',
+            SubDirectory => {
+                TagTable => 'Image::ExifTool::Nikon::ShotInfoD4',
+                DecryptStart => 4,
+                DecryptLen => 0x789,
+                ByteOrder => 'BigEndian',
+            },
+        },
+        { # (D4S firmware version 1.00d and 1.01a)
+            Condition => '$$valPt =~ /^0231/',
+            Name => 'ShotInfoD4S',
+            SubDirectory => {
+                TagTable => 'Image::ExifTool::Nikon::ShotInfoD4S',
+                DecryptStart => 4,
+                DecryptLen => 0x3517,
+                ByteOrder => 'LittleEndian',
+            },
+        },
         # 0227 - D7100
         {
             Condition => '$$valPt =~ /^02/',
@@ -1781,7 +1804,8 @@ my %binaryDataAttrs = (
         # unfortunately, some newer models write this as little-endian
         # (and CaptureNX can change the byte order of the maker notes,
         #  but leaves this structure unchanged)
-        Condition => '$$self{Model} =~ /^NIKON (D5200|D7100)$/',
+        # - it will be an ongoing pain to keep this list of models up-to-date
+        Condition => '$$self{Model} =~ /^NIKON (D4S|D750|D810|D3300|D5200|D5300|D7100)$/',
         SubDirectory => {
             TagTable => 'Image::ExifTool::Nikon::FileInfo',
             ByteOrder => 'LittleEndian',
@@ -2500,10 +2524,12 @@ my %binaryDataAttrs = (
                 10 => 'Single Area (wide)', #PH
                 11 => 'Dynamic Area (wide)', #PH
                 12 => 'Dynamic Area (wide, 3D-tracking)', #PH
-                128 => 'Single (135 points)', #PH (1J1)
-                129 => 'Auto (41 points)', #PH (1J1)
-                130 => 'Subject Tracking (41 points)', #PH (1J1)
-                131 => 'Face Priority (41 points)', #PH (1J1)
+                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)
+                131 => 'Face Priority (41 points)', #PH (1J1,1J3,1S1,1V2,AW1)
+                # 134 - seen for 1V1[PhaseDetectAF=0] (PH)
+                # 135 - seen for 1J2[PhaseDetectAF=4] (PH)
             },
         },
         { #PH (D3/D90/D5000)
@@ -2518,6 +2544,10 @@ my %binaryDataAttrs = (
                 2 => 'Contrast-detect (wide area)', # (D90/D5000)
                 3 => 'Contrast-detect (face priority)', # (ViewNX)
                 4 => 'Contrast-detect (subject tracking)', # (ViewNX)
+                128 => 'Single', #PH (1V3)
+                129 => 'Auto (41 points)', #PH (NC)
+                130 => 'Subject Tracking (41 points)', #PH (NC)
+                131 => 'Face Priority (41 points)', #PH (NC)
             },
         },
     ],
@@ -2526,12 +2556,14 @@ my %binaryDataAttrs = (
         Notes => 'PrimaryAFPoint and AFPointsUsed below are only valid when this is On',
         RawConv => '$$self{PhaseDetectAF} = $val',
         PrintConv => {
+            # [observed AFAreaMode values in square brackets for each PhaseDetectAF value]
             0 => 'Off',
             1 => 'On (51-point)', #PH
             2 => 'On (11-point)', #PH
             3 => 'On (39-point)', #29 (D7000)
-            4 => 'On (hybrid)', #PH (1J1)
-            5 => 'On (105-point)', #PH (1J4)
+            4 => 'On (73-point)', #PH (1J1[128/129],1J2[128/129/135],1J3/1S1/1V2[128/129/131],1V1[129],AW1[129/131])
+            5 => 'On (5)', #PH (1S2[128/129], 1J4/1V3[129])
+            6 => 'On (105-point)', #PH (1J4/1V3[128/130])
         },
     },
     7 => [
@@ -2580,7 +2612,7 @@ my %binaryDataAttrs = (
         { #PH
             Name => 'PrimaryAFPoint',
             Condition => '$$self{PhaseDetectAF} == 4',
-            Notes => 'models with 135-point AF: Nikon 1 models',
+            Notes => 'Nikon 1 models with older 135-point AF and 73-point phase-detect AF',
             PrintConvColumns => 5,
             PrintConv => {
                 0 => '(none)',
@@ -2588,6 +2620,44 @@ my %binaryDataAttrs = (
                 1 => 'E8 (Center)', # (add " (Center)" to central point)
             },
         },
+        { #PH (NC)
+            Name => 'PrimaryAFPoint',
+            Condition => '$$self{PhaseDetectAF} == 5',
+            Notes => q{
+                Nikon 1 models with newer 135-point AF and 73-point phase-detect AF -- 9
+                rows (B-J) and 15 columns (1-15), inside a grid of 11 rows by 15 columns. 
+                The points are numbered sequentially, with F8 at the center
+            },
+            PrintConv => {
+                0 => '(none)',
+                82 => 'F8 (Center)',
+                OTHER => sub {
+                    my ($val, $inv) = @_;
+                    return GetAFPointGrid($val, 15, $inv);
+                },
+            },
+        },
+        { #PH
+            Name => 'PrimaryAFPoint',
+            Condition => '$$self{PhaseDetectAF} == 6',
+            Notes => q{
+                Nikon 1 models with 171-point AF and 105-point phase-detect AF -- 9 rows
+                (B-J) and 19 columns (2-20), inside a grid of 11 rows by 21 columns.  The
+                points are numbered sequentially, with F11 at the center
+            },
+            PrintConv => {
+                0 => '(none)',
+                #22 => 'B2 (Top-left)',
+                #40 => 'B20 (Top-right)',
+                115 => 'F11 (Center)',
+                #190 => 'J2 (Bottom-left)',
+                #208 => 'J20 (Bottom-right)',
+                OTHER => sub {
+                    my ($val, $inv) = @_;
+                    return GetAFPointGrid($val, 21, $inv);
+                },
+            },
+        },
         {
             Name => 'PrimaryAFPoint',
             Notes => 'future models?...',
@@ -2606,8 +2676,10 @@ my %binaryDataAttrs = (
                 point is C6
             },
             Format => 'undef[7]',
+            ValueConv => 'join(" ", unpack("H2"x7, $val))',
+            ValueConvInv => '$val=~tr/ //d; pack("H*",$val)',
             PrintConv => sub { PrintAFPoints(shift, \%afPoints51); },
-            PrintConvInv => sub { PrintAFPointsInv(shift, \%afPoints51); },
+            PrintConvInv => sub { PrintAFPointsInv(shift, \%afPoints51, 7); },
         },
         { #10
             Name => 'AFPointsUsed',
@@ -2644,26 +2716,58 @@ my %binaryDataAttrs = (
                 point is C6
             },
             Format => 'undef[7]',
+            ValueConv => 'join(" ", unpack("H2"x7, $val))',
+            ValueConvInv => '$val=~tr/ //d; pack("H*",$val)',
             PrintConv => sub { PrintAFPoints(shift, \%afPoints39); },
-            PrintConvInv => sub { PrintAFPointsInv(shift, \%afPoints39); },
+            PrintConvInv => sub { PrintAFPointsInv(shift, \%afPoints39, 7); },
         },
-        { #PH (1J1, AFInfo2Version = "0200")
+        { #PH (1AW1,1J1,1J2,1J3,1S1,1V1,1V2)
             Name => 'AFPointsUsed',
             Condition => '$$self{PhaseDetectAF} == 4',
             Notes => q{
-                models with 135-point AF -- 9 rows (A-I) and 15 columns (1-15).  Center
-                point is E8.  The odd-numbered columns, columns 2 and 14, and the remaining
-                corner points are not used for 41-point AF mode
+                older models with 135-point AF -- 9 rows (A-I) and 15 columns (1-15). 
+                Center point is E8.  The odd-numbered columns, columns 2 and 14, and the
+                remaining corner points are not used for 41-point AF mode
             },
             Format => 'undef[17]',
-            PrintConv => sub { PrintAFPoints(shift, \%afPoints135, 17); },
+            ValueConv => 'join(" ", unpack("H2"x17, $val))',
+            ValueConvInv => '$val=~tr/ //d; pack("H*",$val)',
+            PrintConv => sub { PrintAFPoints(shift, \%afPoints135); },
             PrintConvInv => sub { PrintAFPointsInv(shift, \%afPoints135, 17); },
         },
+        { #PH (1S2)
+            Name => 'AFPointsUsed',
+            Condition => '$$self{PhaseDetectAF} == 5',
+            Notes => q{
+                newer models with 135-point AF -- 9 rows (B-J) and 15 colums (1-15).  Center
+                point is F8
+            },
+            Format => 'undef[21]',
+            ValueConv => 'join(" ", unpack("H2"x21, $val))',
+            ValueConvInv => '$val=~tr/ //d; pack("H*",$val)',
+            PrintConv => sub { PrintAFPointsGrid(shift, 15); },
+            PrintConvInv => sub { PrintAFPointsGridInv(shift, 15, 21); },
+        },
+        { #PH (1J4,1V3)
+            Name => 'AFPointsUsed',
+            Condition => '$$self{PhaseDetectAF} == 6',
+            Notes => q{
+                models with 171-point AF -- 9 rows (B-J) and 19 columns (2-20).  Center
+                point is F10
+            },
+            Format => 'undef[29]',
+            ValueConv => 'join(" ", unpack("H2"x29, $val))',
+            ValueConvInv => '$val=~tr/ //d; pack("H*",$val)',
+            PrintConv => sub { PrintAFPointsGrid(shift, 21); },
+            PrintConvInv => sub { PrintAFPointsGridInv(shift, 21, 29); },
+        },
         {
             Name => 'AFPointsUsed',
             Format => 'undef[7]',
-            PrintConv => '$_=unpack("H*",$val); "Unknown (".join(" ", /(..)/g).")"',
-            PrintConvInv => '$val=~s/Unknown \\((.*)\\)/$1/;$val=~tr/ //d;pack("H*",$val)',
+            ValueConv => 'join(" ", unpack("H2"x7, $val))',
+            ValueConvInv => '$val=~tr/ //d; pack("H*",$val)',
+            PrintConv => '"Unknown ($val)"',
+            PrintConvInv => '$val=~s/Unknown \\((.*)\\)/$1/; $val',
         },
     ],
     0x10 => { #PH (D90 and D5000)
@@ -2749,20 +2853,19 @@ my %binaryDataAttrs = (
 %Image::ExifTool::Nikon::FileInfo = (
     %binaryDataAttrs,
     GROUPS => { 0 => 'MakerNotes', 2 => 'Image' },
+    FORMAT => 'int16u',
     0 => {
         Name => 'FileInfoVersion',
         Format => 'undef[4]',
         Writable => 0,
     },
-    6 => {
+    3 => {
         Name => 'DirectoryNumber',
-        Format => 'int16u',
         PrintConv => 'sprintf("%.3d", $val)',
         PrintConvInv => '$val',
     },
-    8 => {
+    4 => {
         Name => 'FileNumber',
-        Format => 'int16u',
         PrintConv => 'sprintf("%.4d", $val)',
         PrintConvInv => '$val',
     },
@@ -2771,7 +2874,7 @@ my %binaryDataAttrs = (
 # ref PH
 %Image::ExifTool::Nikon::BarometerInfo = (
     %binaryDataAttrs,
-    GROUPS => { 0 => 'MakerNotes', 2 => 'Image' },
+    GROUPS => { 0 => 'MakerNotes', 2 => 'Location' },
     0 => {
         Name => 'BarometerInfoVersion',
         Format => 'undef[4]',
@@ -3734,12 +3837,12 @@ my %nikonFocalConversions = (
     },
     0x2ce => { #(NC)
         Name => 'CustomSettingsD3S',
-        Format => 'undef[24]',
+        Format => 'undef[27]',
         SubDirectory => {
             TagTable => 'Image::ExifTool::NikonCustom::SettingsD3',
         },
     },
-    # note: DecryptLen currently set to 0x2e6
+    # note: DecryptLen currently set to 0x2e9
 );
 
 # shot information for the D300 firmware 1.00 (encrypted) - ref JD
@@ -4363,6 +4466,122 @@ my %nikonFocalConversions = (
     # note: DecryptLen currently set to 0x720
 );
 
+# shot information for the D4 firmware 1.00g (ref PH)
+%Image::ExifTool::Nikon::ShotInfoD4 = (
+    PROCESS_PROC => \&Image::ExifTool::Nikon::ProcessNikonEncrypted,
+    WRITE_PROC => \&Image::ExifTool::Nikon::ProcessNikonEncrypted,
+    CHECK_PROC => \&Image::ExifTool::CheckBinaryData,
+    VARS => { ID_LABEL => 'Index' },
+    DATAMEMBER => [ 4 ],
+    IS_SUBDIR => [ 0x0751 ],
+    WRITABLE => 1,
+    FIRST_ENTRY => 0,
+    GROUPS => { 0 => 'MakerNotes', 2 => 'Camera' },
+    NOTES => q{
+        These tags are extracted from encrypted data in images from the D4.
+    },
+    0x00 => {
+        Name => 'ShotInfoVersion',
+        Format => 'string[4]',
+        Writable => 0,
+    },
+    0x04 => {
+        Name => 'FirmwareVersion',
+        DataMember => 'FirmwareVersion',
+        Format => 'string[5]',
+        Writable => 0,
+        RawConv => '$$self{FirmwareVersion} = $val',
+    },
+    0x0751 => { #PH (NC)
+        Name => 'CustomSettingsD4',
+        # (seems to work for 1.00g and 1.02b)
+        Format => 'undef[56]',
+        SubDirectory => { TagTable => 'Image::ExifTool::NikonCustom::SettingsD4' },
+    },
+    # note: DecryptLen currently set to 0x789
+);
+
+# shot information for the D4S firmware 1.01a (ref 28, encrypted)
+%Image::ExifTool::Nikon::ShotInfoD4S = (
+    PROCESS_PROC => \&Image::ExifTool::Nikon::ProcessNikonEncrypted,
+    WRITE_PROC => \&Image::ExifTool::Nikon::ProcessNikonEncrypted,
+    CHECK_PROC => \&Image::ExifTool::CheckBinaryData,
+    VARS => { ID_LABEL => 'Index' },
+    DATAMEMBER => [ 4 ],
+    IS_SUBDIR => [ 0x189d, 0x193d ],
+    WRITABLE => 1,
+    FIRST_ENTRY => 0,
+    GROUPS => { 0 => 'MakerNotes', 2 => 'Camera' },
+    NOTES => q{
+        These tags are extracted from encrypted data in images from the D4S.
+    },
+    0x00 => {
+        Name => 'ShotInfoVersion',
+        Format => 'string[4]',
+        Writable => 0,
+    },
+    0x04 => {
+        Name => 'FirmwareVersion',
+        DataMember => 'FirmwareVersion',
+        Format => 'string[5]',
+        Writable => 0,
+        RawConv => '$$self{FirmwareVersion} = $val',
+    },
+    0x189d => { #PH (NC)
+        Name => 'CustomSettingsD4S',
+        Condition => '$$self{FirmwareVersion} =~ /^1.00/',
+        Notes => 'firmware version 1.00',
+        Format => 'undef[56]',
+        SubDirectory => { TagTable => 'Image::ExifTool::NikonCustom::SettingsD4' },
+    },
+    0x18c2 => { # CSf1-c (no idea why it is so far away from the rest of the settings)
+        Name => 'MultiSelectorLiveViewMode',
+        Groups => { 1 => 'NikonCustom' },
+        Condition => '$$self{FirmwareVersion} =~ /^1.01/',
+        Mask => 0xc0,
+        PrintConv => {
+            0x00 => 'Reset',
+            0x40 => 'Zoom',
+            0xc0 => 'None',
+        },
+    },
+    0x193d => {
+        Name => 'CustomSettingsD4S',
+        Condition => '$$self{FirmwareVersion} =~ /^1.01/',
+        Notes => 'firmware version 1.01',
+        Format => 'undef[56]',
+        SubDirectory => { TagTable => 'Image::ExifTool::NikonCustom::SettingsD4' },
+    },
+    0x350b => {
+        Name => 'RollAngle',
+        Format => 'fixed32u',
+        Notes => 'degrees of clockwise camera rotation',
+        ValueConv => '$val < 180 ? -$val : 360 - $val',
+        ValueConvInv => '$val <= 0 ? -$val : 360 - $val',
+        PrintConv => 'sprintf("%.1f", $val)',
+        PrintConvInv => '$val',
+    },
+    0x350f => {
+        Name => 'PitchAngle',
+        Format => 'fixed32u',
+        Notes => 'degrees of upward camera tilt',
+        ValueConv => '$val <= 180 ? $val : $val - 360',
+        ValueConvInv => '$val >= 0 ? $val : $val + 360',
+        PrintConv => 'sprintf("%.1f", $val)',
+        PrintConvInv => '$val',
+    },
+    0x3513 => {
+        Name => 'YawAngle',
+        Format => 'fixed32u',
+        Notes => 'the camera pitch angle when shooting in portrait orientation',
+        ValueConv => '$val <= 180 ? $val : $val - 360',
+        ValueConvInv => '$val >= 0 ? $val : $val + 360',
+        PrintConv => 'sprintf("%.1f", $val)',
+        PrintConvInv => '$val',
+    },
+    # note: DecryptLen currently set to 0x3517
+);
+
 # Flash information (ref JD)
 %Image::ExifTool::Nikon::FlashInfo0100 = (
     %binaryDataAttrs,
@@ -5383,7 +5602,7 @@ my %nikonFocalConversions = (
         Groups => { 2 => 'Video' },
     },
     # 0x24 - int16u: 1, 2
-    # 0x31 - int16u: 1, 2
+    # 0x31 - int16u: 0, 1, 2
     0x32 => { #(guess)
         Name => 'AudioChannels',
         Groups => { 2 => 'Audio' },
@@ -5399,9 +5618,18 @@ my %nikonFocalConversions = (
     # 0x1001 - int16s: 0
     # 0x1011 - int32u: 0
     # 0x1012 - int32u: 0
+    # 0x1021 - int32u[32]: all zeros
 #
 # 0x110**** tags correspond to 0x**** tags in Exif::Main
 #
+    0x110829a => { #34
+        Name => 'ExposureTime',
+        PrintConv => 'Image::ExifTool::Exif::PrintExposureTime($val)',
+    },
+    0x110829d => { #34
+        Name => 'FNumber',
+        PrintConv => 'Image::ExifTool::Exif::PrintFNumber($val)',
+    },
     0x1108822 => {
         Name => 'ExposureProgram',
         PrintConv => {
@@ -5434,6 +5662,10 @@ my %nikonFocalConversions = (
             255 => 'Other',
         },
     },
+    0x110920a => { #34
+        Name => 'FocalLength',
+        PrintConv => 'sprintf("%.1f mm",$val)',
+    },
     0x110a434 => 'LensModel',
 #
 # 0x120**** tags correspond to 0x**** tags in GPS::Main
@@ -5532,7 +5764,19 @@ my %nikonFocalConversions = (
         PrintConv => '$_=$val;s/^(\d{2})/$1\./;s/^0//;$_',
     },
     0x2000005 => 'WhiteBalance',
+    0x2000007 => { Name => 'FocusMode',    Writable => 'string' }, #34
     0x200000b => 'WhiteBalanceFineTune',
+    0x200001b => {
+        Name => 'CropHiSpeed',
+        Writable => 'int16u',
+        Count => 7,
+        PrintConv => q{
+            my @a = split ' ', $val;
+            return "Unknown ($val)" unless @a == 7;
+            $a[0] = $a[0] ? "On" : "Off";
+            return "$a[0] ($a[1]x$a[2] cropped to $a[3]x$a[4] at pixel $a[5],$a[6])";
+        }
+    },
     0x200001e => {
         Name => 'ColorSpace',
         PrintConv => {
@@ -5540,6 +5784,10 @@ my %nikonFocalConversions = (
             2 => 'Adobe RGB',
         },
     },
+    0x200001f => {
+        Name => 'VRInfo',
+        SubDirectory => { TagTable => 'Image::ExifTool::Nikon::VRInfo' },
+    },
     0x2000023 => {
         Name => 'PictureControlData',
         Flags => [ 'Binary', 'Protected' ],
@@ -5549,6 +5797,13 @@ my %nikonFocalConversions = (
         Name => 'WorldTime',
         SubDirectory => { TagTable => 'Image::ExifTool::Nikon::WorldTime' },
     },
+    0x2000025 => { #34
+        Name => 'ISOInfo',
+        SubDirectory => {
+            TagTable => 'Image::ExifTool::Nikon::ISOInfo',
+            ByteOrder => 'BigEndian',
+        },
+    },
     0x200002c => {
         Name => 'UnknownInfo',
         SubDirectory => { TagTable => 'Image::ExifTool::Nikon::UnknownInfo' },
@@ -5581,7 +5836,37 @@ my %nikonFocalConversions = (
         # short focal, long focal, aperture at short focal, aperture at long focal
         PrintConv => \&Image::ExifTool::Exif::PrintLensInfo,
     },
+    0x2000087 => {
+        Name => 'FlashMode',
+        Writable => 'int8u',
+        PrintConv => {
+            0 => 'Did Not Fire',
+            1 => 'Fired, Manual', #14
+            3 => 'Not Ready', #28
+            7 => 'Fired, External', #14
+            8 => 'Fired, Commander Mode',
+            9 => 'Fired, TTL Mode',
+        },
+    },
+    # 0x20000a8 - Flash Info (seen 0107 - not yet decoded, PH)
     0x20000ab => { Name => 'VariProgram', Writable => 'string' }, #2 (scene mode for DSLR's - PH)
+    0x20000b1 => { #34
+        Name => 'HighISONoiseReduction',
+        Writable => 'int16u',
+        PrintConv => {
+            0 => 'Off',
+            1 => 'Minimal', # for high ISO (>800) when setting is "Off"
+            2 => 'Low',     # Low,Normal,High take effect for ISO > 400
+            3 => 'Medium Low',
+            4 => 'Normal',
+            5 => 'Medium High',
+            6 => 'High',
+        },
+    },
+    0x20000b7 => {
+        Name => 'AFInfo2',
+        SubDirectory => { TagTable => 'Image::ExifTool::Nikon::AFInfo2' },
+    },
 );
 
 # Nikon composite tags
@@ -5654,22 +5939,22 @@ sub ProcessNikonAVI($$$)
 
 #------------------------------------------------------------------------------
 # Print conversion for Nikon AF points
-# Inputs: 0) value to convert (undef[7]),
+# Inputs: 0) value to convert (as a string of hex bytes),
 #         1) lookup for AF point bit number (starting at 1)
-#         2) size of data
-sub PrintAFPoints($$;$)
+sub PrintAFPoints($$)
 {
-    my ($val, $afPoints, $size) = @_;
-    $size or $size = 7;
-    return 'Unknown' unless length $val == $size;
-    my ($i, @points);
-    my @dat = unpack('C*', $val);
-    my $num = scalar(keys %$afPoints);
-    my ($byte, $mask) = (0, 0x01);
-    # loop through all AF points to find active ones
-    for ($i=1; $i<=$num; ++$i) {
-        push @points, $$afPoints{$i} if $dat[$byte] & $mask;
-        ($mask <<= 1) > 0x80 and $mask = 0x01, ++$byte;
+    my ($val, $afPoints) = @_;
+    my ($i, $j, @points);
+    $val =~ tr/ //d;    # remove spaces from hex string
+    my @dat = unpack 'C*', pack 'H*', $val; # convert to array of bytes
+    # loop through all bytes to find active AF points
+    for ($i=0; $i<=@dat; ++$i) {
+        next unless $dat[$i];
+        for ($j=0; $j<8; ++$j) {
+            next unless $dat[$i] & (1 << $j);
+            my $point = $$afPoints{$i*8 + $j + 1};
+            push @points, $point if defined $point;
+        }
     }
     return '(none)' unless @points;
     # sort the points and return as comma-separated string
@@ -5683,11 +5968,10 @@ sub PrintAFPoints($$;$)
 #------------------------------------------------------------------------------
 # Inverse print conversion for AF points
 # Inputs: 0) AF point string, 1) AF point lookup, 2) size of data
-# Returns: undef[7] AF point data
-sub PrintAFPointsInv($$;$)
+# Returns: AF point data as a string of hex bytes
+sub PrintAFPointsInv($$$)
 {
     my ($val, $afPoints, $size) = @_;
-    $size or $size = 7;
     my @points = ($val =~ /[A-Za-z]\d+/g);
     my @dat = (0) x $size;
     if (@points) {
@@ -5699,7 +5983,66 @@ sub PrintAFPointsInv($$;$)
             $dat[$byte] |= (1 << (($bitNum - 1) % 8));
         }
     }
-    return pack('C*', @dat);
+    return join(" ", unpack("H2"x$size, pack('C*', @dat)));
+}
+
+#------------------------------------------------------------------------------
+# Get AF point name for grid-type AF
+# Inputs: 0) AF point number, 1) number of columns, 2) true for inverse conversion
+# Returns: AF point name, or undef
+sub GetAFPointGrid($$;$)
+{
+    my ($val, $ncol, $inv) = @_;
+    if ($inv) {
+        return undef unless $val =~ /^([A-J])(\d+)$/i;
+        return (ord(uc($1))-65) * $ncol + $2 - 1;
+    } else {
+        my $row = int(($val + 0.5) / $ncol);
+        my $col = $val - $ncol * $row + 1;
+        return chr(65+$row) . $col;
+    }
+}
+
+#------------------------------------------------------------------------------
+# Print conversion for grid-type AF points
+# Inputs: 0) value to convert (as a string of hex bytes),
+#         1) number of columns in grid
+sub PrintAFPointsGrid($$)
+{
+    my ($val, $ncol) = @_;
+    my ($i, $j, @points);
+    $val =~ tr/ //d;    # remove spaces from hex string
+    my @dat = unpack 'C*', pack 'H*', $val; # convert to array of bytes
+    # loop through all bytes to find active AF points
+    for ($i=0; $i<@dat; ++$i) {
+        next unless $dat[$i];
+        for ($j=0; $j<8; ++$j) {
+            next unless $dat[$i] & (1 << $j);
+            my $point = GetAFPointGrid($i*8 + $j, $ncol);
+            push @points, $point if defined $point;
+        }
+    }
+    return '(none)' unless @points;
+    return join ',', @points;   # return as comma-separated string
+}
+
+#------------------------------------------------------------------------------
+# Inverse print conversion for AF points
+# Inputs: 0) AF point string, 1) number of columns, 2) size of data
+# Returns: AF point data as a string of hex bytes
+sub PrintAFPointsGridInv($$$)
+{
+    my ($val, $ncol, $size) = @_;
+    my @points = ($val =~ /[A-Za-z]\d+/g);
+    my @dat = (0) x $size;
+    foreach (@points) {
+        my $n = GetAFPointGrid($_, $ncol, 1);
+        next unless defined $n;
+        my $byte = int($n / 8);
+        next if $byte > $size;
+        $dat[$byte] |= (1 << ($n - $byte * 8));
+    }
+    return join(" ", unpack("H2"x$size, pack('C*', @dat)));
 }
 
 #------------------------------------------------------------------------------