exiftool-vendored.pl 12.49.0 → 12.50.0

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

@@ -49,6 +49,7 @@
 #              36) Hayo Baann (forum10207)
 #              37) Tom Lachecki, private communication
 #              38) https://github.com/exiftool/exiftool/pull/40 (and forum10893)
+#              39) Stefan Grube private communication (Z9)
 #              IB) Iliah Borg private communication (LibRaw)
 #              JD) Jens Duttke private communication
 #              NJ) Niels Kristian Bech Jensen private communication
@@ -63,7 +64,7 @@ use Image::ExifTool::Exif;
 use Image::ExifTool::GPS;
 use Image::ExifTool::XMP;
 
-$VERSION = '4.12';
+$VERSION = '4.13';
 
 sub LensIDConv($$$);
 sub ProcessNikonAVI($$$);
@@ -858,7 +859,7 @@ my %focusModeZ7 = (
 
 my %infoZSeries = (
     Condition => '$$self{Model} =~ /^NIKON Z (5|50|6|6_2|7|7_2|fc|9)\b/i',
-    Notes => 'Z Series cameras thru Decemeber 2021',
+    Notes => 'Z Series cameras thru December 2021',
 );
 my %iSOAutoHiLimitZ7 = (
     0 => 'ISO 64',
@@ -1127,8 +1128,6 @@ my %afPoints153 = (
 
 # AF point indices for models with 81 focus points, eg. Z6/Z7/Z50 (ref 38)
 # - 9 rows (A-I) with 9 columns (1-9), center is E5
-# NOTE: the AF points start 2 bytes into the data, so the map starts
-#       at 17 instead of 1
 #
 #        7   6   5   4   3   2   1   0
 # 00 : [H5][G5][F5][A5][B5][C5][D5][E5]
@@ -1143,23 +1142,23 @@ my %afPoints153 = (
 # 09 : [H1][G1][F1][A1][B1][C1][D1][E1]
 # 0a : [  ][  ][  ][  ][  ][  ][  ][I1]
 my %afPoints81 = (
-     17 => 'E5',  34 => 'I6',  51 => 'H7',  68 => 'G8',  85 => 'F9',
-     18 => 'D5',  35 => 'E4',  52 => 'I7',  69 => 'H8',  86 => 'G9',
-     19 => 'C5',  36 => 'D4',  53 => 'E3',  70 => 'I8',  87 => 'H9',
-     20 => 'B5',  37 => 'C4',  54 => 'D3',  71 => 'E2',  88 => 'I9',
-     21 => 'A5',  38 => 'B4',  55 => 'C3',  72 => 'D2',  89 => 'E1',
-     22 => 'F5',  39 => 'A4',  56 => 'B3',  73 => 'C2',  90 => 'D1',
-     23 => 'G5',  40 => 'F4',  57 => 'A3',  74 => 'B2',  91 => 'C1',
-     24 => 'H5',  41 => 'G4',  58 => 'F3',  75 => 'A2',  92 => 'B1',
-     25 => 'I5',  42 => 'H4',  59 => 'G3',  76 => 'F2',  93 => 'A1',
-     26 => 'E6',  43 => 'I4',  60 => 'H3',  77 => 'G2',  94 => 'F1',
-     27 => 'D6',  44 => 'E7',  61 => 'I3',  78 => 'H2',  95 => 'G1',
-     28 => 'C6',  45 => 'D7',  62 => 'E8',  79 => 'I2',  96 => 'H1',
-     29 => 'B6',  46 => 'C7',  63 => 'D8',  80 => 'E9',  97 => 'I1',
-     30 => 'A6',  47 => 'B7',  64 => 'C8',  81 => 'D9',
-     31 => 'F6',  48 => 'A7',  65 => 'B8',  82 => 'C9',
-     32 => 'G6',  49 => 'F7',  66 => 'A8',  83 => 'B9',
-     33 => 'H6',  50 => 'G7',  67 => 'F8',  84 => 'A9',
+      1 => 'E5',  18 => 'I6',  35 => 'H7',  52 => 'G8',  69 => 'F9',
+      2 => 'D5',  19 => 'E4',  36 => 'I7',  53 => 'H8',  70 => 'G9',
+      3 => 'C5',  20 => 'D4',  37 => 'E3',  54 => 'I8',  71 => 'H9',
+      4 => 'B5',  21 => 'C4',  38 => 'D3',  55 => 'E2',  72 => 'I9',
+      5 => 'A5',  22 => 'B4',  39 => 'C3',  56 => 'D2',  73 => 'E1',
+      6 => 'F5',  23 => 'A4',  40 => 'B3',  57 => 'C2',  74 => 'D1',
+      7 => 'G5',  24 => 'F4',  41 => 'A3',  58 => 'B2',  75 => 'C1',
+      8 => 'H5',  25 => 'G4',  42 => 'F3',  59 => 'A2',  76 => 'B1',
+      9 => 'I5',  26 => 'H4',  43 => 'G3',  60 => 'F2',  77 => 'A1',
+     10 => 'E6',  27 => 'I4',  44 => 'H3',  61 => 'G2',  78 => 'F1',
+     11 => 'D6',  28 => 'E7',  45 => 'I3',  62 => 'H2',  79 => 'G1',
+     12 => 'C6',  29 => 'D7',  46 => 'E8',  63 => 'I2',  80 => 'H1',
+     13 => 'B6',  30 => 'C7',  47 => 'D8',  64 => 'E9',  81 => 'I1',
+     14 => 'A6',  31 => 'B7',  48 => 'C8',  65 => 'D9',
+     15 => 'F6',  32 => 'A7',  49 => 'B8',  66 => 'C9',
+     16 => 'G6',  33 => 'F7',  50 => 'A8',  67 => 'B9',
+     17 => 'H6',  34 => 'G7',  51 => 'F8',  68 => 'A9',
 );
 
 my %cropHiSpeed = ( #IB
@@ -1600,10 +1599,14 @@ my %base64coord = (
              81 => 'Auto (Electronic Front Curtain)', #JanSkoda (Z6II)
         },
     },
-    0x0035 => { #32
+    0x0035 => [{ #32
         Name => 'HDRInfo',
+        Condition => '$count != 6',
         SubDirectory => { TagTable => 'Image::ExifTool::Nikon::HDRInfo' },
-    },
+    },{
+        Name => 'HDRInfo2',
+        SubDirectory => { TagTable => 'Image::ExifTool::Nikon::HDRInfo2' },
+    }],
     0x0037 => { #XavierJubier
         Name => 'MechanicalShutterCount',
         Writable => 'int32u',
@@ -2088,7 +2091,7 @@ my %base64coord = (
                 TagTable => 'Image::ExifTool::Nikon::ShotInfoZ9',
                 DecryptStart => 4,
                 # TODO: eventually set the length dynamically according to actual offsets!
-                DecryptLen => 0xec4b + 2105,  # decoded thru end of Offset26 
+                DecryptLen => 0xec4b + 2105,  # decoded thru end of Offset26
                 ByteOrder => 'LittleEndian',
             },
         },
@@ -2489,6 +2492,12 @@ my %base64coord = (
             TagTable => 'Image::ExifTool::Nikon::MultiExposure',
             ByteOrder => 'LittleEndian',
         },
+    },{
+        Name => 'MultiExposure2',
+        Condition => '$$valPt =~ /^010[23]/', # 0102 is NC (PH)
+        SubDirectory => {
+            TagTable => 'Image::ExifTool::Nikon::MultiExposure2',
+        },
     }],
     0x00b1 => { #14/PH/JD (D80)
         Name => 'HighISONoiseReduction',
@@ -2805,10 +2814,10 @@ my %base64coord = (
         Name => 'VRMode',
         PrintConv => {
             0 => 'Off',
-            1 => 'Sport',
-            3 => 'Normal',
+            1 => 'Normal', #39 (was 'Sport')
+            3 => 'Sport',  #39 (was 'Normal')
         },
-        %infoZSeries
+        %infoZSeries,
     },{
         Name => 'VRMode',
         PrintConv => {
@@ -2819,6 +2828,13 @@ my %base64coord = (
         },
     }],
     # 7 - values: 0, 1
+    8 => { #39
+        Name => 'VRType',
+        PrintConv => {
+            2 => 'In-body', # (IBIS)
+            3 => 'In-body + Lens', # (IBIS + VR)
+        },
+    },
 );
 
 # Face detection information - PH (S8100)
@@ -3351,8 +3367,10 @@ my %base64coord = (
             sprintf("%s%.2d:%.2d", $sign, $h, abs($val)-60*$h);
         },
         PrintConvInv => q{
-            $val =~ /([-+]?)(\d+):(\d+)/ or return undef;
-            return $1 . ($2 * 60 + $3);
+            $val =~ /Z$/ and return 0;
+            $val =~ /([-+])(\d{1,2}):?(\d{2})$/ and return $1 . ($2 * 60 + $3);
+            $val =~ /^(\d{2})(\d{2})$/ and return $1 * 60 + $2;
+            return undef;
         },
     },
     2 => {
@@ -3569,7 +3587,6 @@ my %base64coord = (
     GROUPS => { 0 => 'MakerNotes', 2 => 'Camera' },
     DATAMEMBER => [ 0, 4, 6 ],
     NOTES => "These tags are written by Nikon DSLR's which have the live view feature.",
-    # NOTE: Must set ByteOrder in SubDirectory if any multi-byte integer tags added
     0 => {
         Name => 'AFInfo2Version',
         Format => 'undef[4]',
@@ -3680,7 +3697,7 @@ my %base64coord = (
         { #PH/JD
             Name => 'PrimaryAFPoint',
             # 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"',
+            Condition => '$$self{PhaseDetectAF} < 2 and $$self{AFInfo2Version} !~ /^03/',
             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
@@ -3786,22 +3803,6 @@ my %base64coord = (
                 1 => 'E9 (Center)',
             },
         },
-        { #PH (Z7) (NC)
-            Name => 'PrimaryAFPoint',
-            Condition => '$$self{PhaseDetectAF} == 8 and $$self{AFInfo2Version} =~ /^03/',
-            Notes => q{
-                Nikon models with 493-point AF -- 17 rows (A-Q) and 29 columns (1-29), I15
-                at the center
-            },
-            PrintConv => {
-                0 => '(none)',
-                246 => 'I15 (Center)',
-                OTHER => sub {
-                    my ($val, $inv) = @_;
-                    return GetAFPointGrid($val, 29, $inv);
-                },
-            },
-        },
         {
             Name => 'PrimaryAFPoint',
             Condition => '$$self{AFInfo2Version} eq "0100"',
@@ -3815,7 +3816,7 @@ my %base64coord = (
     8 => [
         { #JD/PH
             Name => 'AFPointsUsed',
-            Condition => '$$self{PhaseDetectAF} < 2 and $$self{AFInfo2Version} ne "0301"',
+            Condition => '$$self{PhaseDetectAF} < 2 and $$self{AFInfo2Version} !~ /^03/',
             Notes => q{
                 models with 51-point AF -- 5 rows: A1-9, B1-11, C1-11, D1-11, E1-9.  Center
                 point is C6
@@ -3919,33 +3920,78 @@ my %base64coord = (
             PrintConv => sub { PrintAFPoints(shift, \%afPoints153); },
             PrintConvInv => sub { PrintAFPointsInv(shift, \%afPoints153); },
         },
-        { #38 (Z6/Z7/Z50)
-            Name => 'AFPointsUsed',
-            Condition => '$$self{PhaseDetectAF} == 8 and $$self{Model} =~ /^NIKON Z/',
-            Notes => q{
-                models with 81-selectable point AF -- 9 rows (A-I) and 9 columns (1-9) for
-                phase detect AF points. Center point is E5
-            },
-            Format => 'undef[13]',
-            ValueConv => 'join(" ", unpack("H2"x13, $val))',
-            ValueConvInv => '$val=~tr/ //d; pack("H*",$val)',
-            PrintConv => sub { PrintAFPoints(shift, \%afPoints81); },
-            PrintConvInv => sub { PrintAFPointsInv(shift, \%afPoints81); },
-        },
         { #PH
             Name => 'AFPointsUsed',
             # version 301 uses a separate field at offset 0x0a for this tag (ref 28)
-            Condition =>  '$$self{AFInfo2Version} ne "0301"',
+            Condition =>  '$$self{AFInfo2Version} !~ /^03/',
             Format => 'undef[7]',
             ValueConv => 'join(" ", unpack("H2"x7, $val))',
             ValueConvInv => '$val=~tr/ //d; pack("H*",$val)',
             PrintConv => '"Unknown ($val)"',
             PrintConvInv => '$val=~s/Unknown \\((.*)\\)/$1/; $val',
         },
+        { #PH
+            Name => 'PrimaryAFPoint',
+            Condition => '$$self{PhaseDetectAF} == 1 and $$self{AFInfo2Version} =~ /^03/',
+            Notes => 'newer models with 51-point AF',
+            PrintConvColumns => 5,
+            PrintConv => {
+                0 => '(none)',
+                %afPoints51,
+                1 => 'C6 (Center)', # (add " (Center)" to central point)
+            },
+        },
+        { #PH (Z7)
+            Name => 'PrimaryAFPoint',
+            Condition => '$$self{PhaseDetectAF} == 8 and $$self{AFInfo2Version} =~ /^03/',
+            PrintConv => {
+                0 => '(none)',
+                %afPoints81,
+                1 => 'E5 (Center)', # (add " (Center)" to central point)
+            },
+        },
+        # this was wrong, but keep the code as a comment in case it may be useful later
+        #{ #PH (Z7) (NC)
+        #    Name => 'PrimaryAFPoint',
+        #    Condition => '$$self{PhaseDetectAF} == 8 and $$self{AFInfo2Version} =~ /^03/',
+        #    Notes => q{
+        #        Nikon models with 493-point AF -- 17 rows (A-Q) and 29 columns (1-29), I15
+        #        at the center
+        #    },
+        #    PrintConv => {
+        #        0 => '(none)',
+        #        246 => 'I15 (Center)',
+        #        OTHER => sub {
+        #            my ($val, $inv) = @_;
+        #            return GetAFPointGrid($val, 29, $inv);
+        #        },
+        #    },
+        #},
     ],
-    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',
+    0x0a => [{ #PH (D780)
+        Name => 'AFPointsUsed',
+        Condition => '$$self{PhaseDetectAF} == 1 and $$self{AFInfo2Version} =~ /^03/',
+        Notes => 'newer models with 51-point AF',
+        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); },
+    },{ #38 (Z6/Z7/Z50)
+        Name => 'AFPointsUsed',
+        Condition => '$$self{PhaseDetectAF} == 8 and $$self{AFInfo2Version} =~ /^03/',
+        Notes => q{
+            models with 81-selectable point AF -- 9 rows (A-I) and 9 columns (1-9) for
+            phase detect AF points. Center point is E5
+        },
+        Format => 'undef[11]',
+        ValueConv => 'join(" ", unpack("H2"x11, $val))',
+        ValueConvInv => '$val=~tr/ //d; pack("H*",$val)',
+        PrintConv => sub { PrintAFPoints(shift, \%afPoints81); },
+        PrintConvInv => sub { PrintAFPointsInv(shift, \%afPoints81); },
+    },{ #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{PhaseDetectAF} == 9 and $$self{AFInfo2Version} =~ /^03/',
         Notes => q{
             models with 105-point AF -- 7 rows (A-G) and 15 columns (1-15). Center
             point is D8
@@ -3955,7 +4001,7 @@ my %base64coord = (
         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"',
@@ -5003,9 +5049,10 @@ my %nikonFocalConversions = (
             27 => 'Nikkor Z MC 50mm f/2.8', #IB
             28 => 'Nikkor Z 100-400mm f/4.5-5.6 VR S', #28
             29 => 'Nikkor Z 28mm f/2.8', #IB
-            30 => 'Nikkor Z 400mm f/2.8 TC VR S',   #28
-            31 => 'Nikkor Z 24-120 f/4',   #28     
-            32 => 'Nikkor Z 800mm f/6.3 VR S',  #28
+            30 => 'Nikkor Z 400mm f/2.8 TC VR S', #28
+            31 => 'Nikkor Z 24-120 f/4', #28
+            32 => 'Nikkor Z 800mm f/6.3 VR S', #28
+            36 => 'Nikkor Z 400mm f/4.5 VR S', #IB
         },
     },
     0x35 => { #28
@@ -5049,31 +5096,31 @@ my %nikonFocalConversions = (
     0x4c => { #28
         Name => 'FocusDistanceRangeWidth',     #reflects the number of discrete absolute lens positions that are mapped to the reported FocusDistance.  Will be 1 near CFD reflecting very narrow focus distance bands (i.e., quite accurate).  Near Infinity will be something like 32.  Note: 0 at infinity.
         Format => 'int8u',
-        Condition => '$$self{NewLensData} and $$self{LensMountType} and $$self{LensMountType} == 1',  
+        Condition => '$$self{NewLensData} and $$self{LensMountType} and $$self{LensMountType} == 1',
         RawConv => '$$self{FocusDistanceRangeWidth} = $val',
         Unknown => 1,
     },
     0x4e => { #28
-        Name => 'FocusDistance', 
+        Name => 'FocusDistance',
         Format => 'int16u',
-        Condition => '$$self{NewLensData} and $$self{LensMountType} and $$self{LensMountType} == 1',  
+        Condition => '$$self{NewLensData} and $$self{LensMountType} and $$self{LensMountType} == 1',
         RawConv => '$val = $val/256',  # 1st byte is the fractional component.  This byte was not previously considered in the legacy calculation (which only used the 2nd byte).  When 2nd byte < 80; distance is < 1 meter
         ValueConv => '0.01 * 10**($val/40)', # in m
         ValueConvInv => '$val>0 ? 40*log($val*100)/log(10) : 0',
         PrintConv => q{
-            (defined $$self{FocusDistanceRangeWidth} and not $$self{FocusDistanceRangeWidth}) ? "Inf" : $val < 1 ? $val < 0.35 ? sprintf("%.4f m", $val): sprintf("%.3f m", $val): sprintf("%.2f m", $val),    #distances less than 35mm are quite accurate with increasingly less precision past 1m       
+            (defined $$self{FocusDistanceRangeWidth} and not $$self{FocusDistanceRangeWidth}) ? "Inf" : $val < 1 ? $val < 0.35 ? sprintf("%.4f m", $val): sprintf("%.3f m", $val): sprintf("%.2f m", $val),    #distances less than 35mm are quite accurate with increasingly less precision past 1m
         },
     },
     0x56 => { #28
         Name => 'LensDriveEnd',     # byte contains: 1 at CFD/MOD; 2 at Infinity; 0 otherwise
-        Condition => '$$self{NewLensData} and $$self{LensMountType} and $$self{LensMountType} == 1',  
+        Condition => '$$self{NewLensData} and $$self{LensMountType} and $$self{LensMountType} == 1',
         Format => 'int8u',
         RawConv => 'unless (defined $$self{FocusDistanceRangeWidth} and not $$self{FocusDistanceRangeWidth}) { if ($val == 0 ) {$$self{LensDriveEnd} = "No"} else { $$self{LensDriveEnd} = "CFD"}; } else{ $$self{LensDriveEnd} = "Inf"}',
         Unknown => 1,
     },
     0x5a => { #28
         Name => 'LensPositionAbsolute',    # <=0 at infinity.  Typical value at CFD might be 58000.   Only valid for Z-mount lenses.
-        Condition => '$$self{NewLensData} and $$self{LensMountType} and $$self{LensMountType} == 1',      
+        Condition => '$$self{NewLensData} and $$self{LensMountType} and $$self{LensMountType} == 1',
         Format => 'int32s',
         Unknown => 1,
     },
@@ -5478,14 +5525,14 @@ my %nikonFocalConversions = (
     },
     0x27d => {
         Name => 'ShutterCount',
-        Condition => '$$self{FirmwareVersion} =~ /^1.01/',
+        Condition => '$$self{FirmwareVersion} =~ /^1\.01/',
         Notes => 'firmware 1.10',
         Format => 'int32u',
         Priority => 0,
     },
     0x27f => {
         Name => 'ShutterCount',
-        Condition => '$$self{FirmwareVersion} =~ /^2.0/',
+        Condition => '$$self{FirmwareVersion} =~ /^2\.0/',
         Notes => 'firmware 2.00, 2.01 and 2.02',
         Format => 'int32u',
         Priority => 0,
@@ -7379,7 +7426,7 @@ my %nikonFocalConversions = (
     # (moves around too much and doesn't fit cleanly in the offset table)
     #0x38be => {
     #    Name => 'Rotation',
-    #    Condition => '$$self{FirmwareVersion} =~ /^1.0/',
+    #    Condition => '$$self{FirmwareVersion} =~ /^1\.0/',
     #    Mask => 0x30,
     #    PrintConv => {
     #        0 => 'Horizontal',
@@ -7685,7 +7732,7 @@ my %nikonFocalConversions = (
     },
     0x189d => { #PH (NC)
         Name => 'CustomSettingsD4S',
-        Condition => '$$self{FirmwareVersion} =~ /^1.00/',
+        Condition => '$$self{FirmwareVersion} =~ /^1\.00/',
         Notes => 'firmware version 1.00',
         Format => 'undef[56]',
         SubDirectory => { TagTable => 'Image::ExifTool::NikonCustom::SettingsD4' },
@@ -7693,7 +7740,7 @@ my %nikonFocalConversions = (
     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.00/',
+        Condition => '$$self{FirmwareVersion} !~ /^1\.00/',
         Mask => 0xc0,
         PrintConv => {
             0 => 'Reset',
@@ -7794,7 +7841,7 @@ my %nikonFocalConversions = (
     },
     0x193d => {
         Name => 'CustomSettingsD4S',
-        Condition => '$$self{FirmwareVersion} !~ /^1.00/',
+        Condition => '$$self{FirmwareVersion} !~ /^1\.00/',
         Notes => 'firmware version 1.01',
         Format => 'undef[56]',
         SubDirectory => { TagTable => 'Image::ExifTool::NikonCustom::SettingsD4' },
@@ -8206,6 +8253,7 @@ my %nikonFocalConversions = (
     0xec4b => {
         Name => 'MenuSettingsZ9',
         Format => 'undef[1646]',
+        Condition => '$$self{FirmwareVersion} lt "03.00"',
         SubDirectory => {
             TagTable => 'Image::ExifTool::Nikon::MenuSettingsZ9',
         },
@@ -8799,9 +8847,9 @@ my %nikonFocalConversions = (
             16 => '+03:00 (Moscow, Nairobi)',
             17 => '+02:00 (Athens, Helsinki)',
             18 => '+01:00 (Madrid, Paris, Berlin)',
-            19 => '+00:00 (London)', 
-            20 => '-01:00 (Azores)', 
-            21 => '-02:00 (Fernando de Noronha)', 
+            19 => '+00:00 (London)',
+            20 => '-01:00 (Azores)',
+            21 => '-02:00 (Fernando de Noronha)',
             22 => '-03:00 (Buenos Aires, Sao Paulo)',
             23 => '-03:30 (Newfoundland)',
             24 => '-04:00 (Manaus, Caracas)',
@@ -10129,6 +10177,36 @@ my %nikonFocalConversions = (
     },
 );
 
+# Multi exposure2 / image overlay information (ref 39)
+%Image::ExifTool::Nikon::MultiExposure2 = (
+    %binaryDataAttrs,
+    FORMAT => 'int32u',
+    GROUPS => { 0 => 'MakerNotes', 2 => 'Camera' },
+    0 => {
+        Name => 'MultiExposureVersion',
+        Format => 'string[4]',
+        Writable => 0,
+    },
+    1 => {
+        Name => 'MultiExposureMode',
+        PrintConv => {
+            0 => 'Off',
+            1 => 'Multiple Exposure',
+            3 => 'HDR',
+        },
+    },
+    2 => 'MultiExposureShots',
+    3 => {
+        Name => 'MultiExposureOverlayMode',
+        PrintConv => {
+            0 => 'Add',
+            1 => 'Average',
+            2 => 'Light',
+            3 => 'Dark',
+        },
+    },
+);
+
 # HDR information (ref 32)
 %Image::ExifTool::Nikon::HDRInfo = (
     %binaryDataAttrs,
@@ -10137,12 +10215,13 @@ my %nikonFocalConversions = (
     0 => {
         Name => 'HDRInfoVersion',
         Format => 'string[4]',
+        Writable => 0,
     },
     4 => {
         Name => 'HDR',
         PrintConv => {
             0 => 'Off',
-            1 => 'On',
+            1 => 'On (normal)',
             48 => 'Auto', #PH (NC)
         },
     },
@@ -10180,6 +10259,35 @@ my %nikonFocalConversions = (
     },
 );
 
+# ref 39 (Z9)
+%Image::ExifTool::Nikon::HDRInfo2 = (
+    %binaryDataAttrs,
+    GROUPS => { 0 => 'MakerNotes', 2 => 'Image' },
+    0 => {
+        Name => 'HDRInfoVersion', # 0200
+        Format => 'string[4]',
+        Writable => 0,
+    },
+    4 => {
+        Name => 'HDR',
+        PrintConv => {
+            0 => 'Off',
+            1 => 'On (normal)',
+        },
+    },
+    5 => {
+        Name => 'HDRLevel',
+        PrintConv => {
+            0 => 'n/a',
+            1 => 'Normal',
+            2 => 'Low',
+            3 => 'High',
+            4 => 'High+',
+            5 => 'Auto',
+        },
+    },
+);
+
 # location information (ref PH)
 %Image::ExifTool::Nikon::LocationInfo = (
     %binaryDataAttrs,

package/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.78';
+$VERSION = '2.79';
 
 sub PrintLensInfo($$$);
 
@@ -433,6 +433,7 @@ my %olympusCameraTypes = (
     S0092 => 'E-M1MarkIII', #IB
     S0093 => 'E-P7', #IB
     S0095 => 'OM-1', #IB
+    S0101 => 'OM-5', #IB
     SR45 => 'D220',
     SR55 => 'D320L',
     SR83 => 'D340L',

package/bin/lib/Image/ExifTool/Pentax.pm

@@ -58,7 +58,7 @@ use Image::ExifTool::Exif;
 use Image::ExifTool::GPS;
 use Image::ExifTool::HP;
 
-$VERSION = '3.40';
+$VERSION = '3.41';
 
 sub CryptShutterCount($$);
 sub PrintFilter($$$);
@@ -365,10 +365,15 @@ sub DecodeAFPoints($$$$;$);
     '8 255.4' => 'Sigma 4.5mm F2.8 EX DC HSM Circular Fisheye', #PH
     '8 255.5' => 'Sigma 50-200mm F4-5.6 DC OS', #26
     '8 255.6' => 'Sigma 24-70mm F2.8 EX DG HSM', #29
+
+    '9 0' => '645 Manual Lens', #PH (NC)
+    '9 3' => 'HD PENTAX-FA 43mm F1.9 Limited', #IB
+    '9 24' => 'HD PENTAX-FA 77mm F1.8 Limited', #IB
+    '9 39' => 'HD PENTAX-FA 31mm F1.8 AL Limited', #IB
+    '9 247' => 'HD PENTAX-DA FISH-EYE 10-17mm F3.5-4.5 ED [IF]', #IB
 #
 # 645 lenses
 #
-    '9 0' => '645 Manual Lens', #PH (NC)
     '10 0' => '645 A Series Lens', #PH
     '11 1' => 'smc PENTAX-FA 645 75mm F2.8', #PH
     '11 2' => 'smc PENTAX-FA 645 45mm F2.8', #PH