Add Nikon LensData v0802 (backport Exiv2#2287)

antermin · Mar 16, 2023 · 20a3302 · 20a3302
1 parent 1506915
commit 20a3302
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/src/makernote_int.cpp b/src/makernote_int.cpp
@@ -1247,6 +1247,7 @@ namespace Exiv2 {
         { 0x0098, "0204",    0, 2,   4 },
         { 0x0098, "0800",    0, 3,   4 }, // for e.g. Z6/7
         { 0x0098, "0801",    0, 3,   4 }, // for e.g. Z6/7
+        { 0x0098, "0802",    0, 3,   4 }, // for e.g. Z9
         // NikonFl
         { 0x00a8, "0100",    0, 0,  NA },
         { 0x00a8, "0101",    0, 0,  NA },

diff --git a/src/nikonmn_int.cpp b/src/nikonmn_int.cpp
@@ -2929,7 +2929,7 @@ fmountlens[] = {
             return os << "(" << value << ")";
         }
 
-// from https://github.com/exiftool/exiftool/blob/12.12/lib/Image/ExifTool/Nikon.pm#L4646
+// from https://github.com/exiftool/exiftool/blob/12.44/lib/Image/ExifTool/Nikon.pm#L4969
 static const struct ZMntLens {uint16_t lid; const char *manuf, *lensname;}
 zmountlens[] = {
              {1 , "Nikon", "Nikkor Z 24-70mm f/4 S"},
@@ -2948,6 +2948,13 @@ zmountlens[] = {
             {21 , "Nikon", "Nikkor Z 50mm f/1.2 S"}, //IB
             {22 , "Nikon", "Nikkor Z 24-50mm f/4-6.3"}, //IB
             {23 , "Nikon", "Nikkor Z 14-24mm f/2.8 S"}, //IB
+            {24 , "Nikon", "Nikkor Z MC 105mm f/2.8 VR S"}, //IB
+            {27 , "Nikon", "Nikkor Z MC 50mm f/2.8"}, //IB
+            {28 , "Nikon", "Nikkor Z 100-400mm f/4.5-5.6 VR S"}, //28
+            {29 , "Nikon", "Nikkor Z 28mm f/2.8"}, //IB
+            {30 , "Nikon", "Nikkor Z 400mm f/2.8 TC VR S"}, //28
+            {31 , "Nikon", "Nikkor Z 24-120 f/4"}, //28
+            {32 , "Nikon", "Nikkor Z 800mm f/6.3 VR S"}, //28
             {0 , "", ""} //end of array
 };