From 8bf5fc94123078f9d3b4e8d500d347a645dd8530 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Milo=C5=A1=20Komar=C4=8Devi=C4=87?= Date: Fri, 22 Jul 2022 13:31:29 +0200 Subject: [PATCH] Add Nikon LensData v0802 (backport #2287) --- src/makernote_int.cpp | 1 + src/nikonmn_int.cpp | 9 ++++++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/src/makernote_int.cpp b/src/makernote_int.cpp index 5ef722e770..467ce2051f 100644 --- 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 index 18261e8f77..d5660eda17 100644 --- 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 };