Skip to content

Commit 45018ef

Browse files
committed
Add Nikon LensData v0802 (backport #2287)
1 parent 26adf0c commit 45018ef

File tree

2 files changed

+9
-1
lines changed

2 files changed

+9
-1
lines changed

src/makernote_int.cpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1247,6 +1247,7 @@ namespace Exiv2 {
12471247
{ 0x0098, "0204", 0, 2, 4 },
12481248
{ 0x0098, "0800", 0, 3, 4 }, // for e.g. Z6/7
12491249
{ 0x0098, "0801", 0, 3, 4 }, // for e.g. Z6/7
1250+
{ 0x0098, "0802", 0, 3, 4 }, // for e.g. Z9
12501251
// NikonFl
12511252
{ 0x00a8, "0100", 0, 0, NA },
12521253
{ 0x00a8, "0101", 0, 0, NA },

src/nikonmn_int.cpp

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2929,7 +2929,7 @@ fmountlens[] = {
29292929
return os << "(" << value << ")";
29302930
}
29312931

2932-
// from https://github.com/exiftool/exiftool/blob/12.12/lib/Image/ExifTool/Nikon.pm#L4646
2932+
// from https://github.com/exiftool/exiftool/blob/12.44/lib/Image/ExifTool/Nikon.pm#L4969
29332933
static const struct ZMntLens {uint16_t lid; const char *manuf, *lensname;}
29342934
zmountlens[] = {
29352935
{1 , "Nikon", "Nikkor Z 24-70mm f/4 S"},
@@ -2948,6 +2948,13 @@ zmountlens[] = {
29482948
{21 , "Nikon", "Nikkor Z 50mm f/1.2 S"}, //IB
29492949
{22 , "Nikon", "Nikkor Z 24-50mm f/4-6.3"}, //IB
29502950
{23 , "Nikon", "Nikkor Z 14-24mm f/2.8 S"}, //IB
2951+
{24 , "Nikon", "Nikkor Z MC 105mm f/2.8 VR S"}, //IB
2952+
{27 , "Nikon", "Nikkor Z MC 50mm f/2.8"}, //IB
2953+
{28 , "Nikon", "Nikkor Z 100-400mm f/4.5-5.6 VR S"}, //28
2954+
{29 , "Nikon", "Nikkor Z 28mm f/2.8"}, //IB
2955+
{30 , "Nikon", "Nikkor Z 400mm f/2.8 TC VR S"}, //28
2956+
{31 , "Nikon", "Nikkor Z 24-120 f/4"}, //28
2957+
{32 , "Nikon", "Nikkor Z 800mm f/6.3 VR S"}, //28
29512958
{0 , "", ""} //end of array
29522959
};
29532960

0 commit comments

Comments
 (0)