@@ -3337,25 +3337,32 @@ std::ostream& Nikon3MakerNote::printLensId4ZMount(std::ostream& os, const Value&
33373337 return os << " (" << value << " )" ;
33383338 }
33393339
3340- // from https://github.com/exiftool/exiftool/blob/12.12 /lib/Image/ExifTool/Nikon.pm#L4646
3340+ // from https://github.com/exiftool/exiftool/blob/12.44 /lib/Image/ExifTool/Nikon.pm#L4969
33413341 using ZMntLens = std::tuple<uint16_t , const char *, const char *>;
33423342 static constexpr auto zmountlens = std::array{
33433343 ZMntLens (1 , " Nikon" , " Nikkor Z 24-70mm f/4 S" ),
33443344 ZMntLens (2 , " Nikon" , " Nikkor Z 14-30mm f/4 S" ),
33453345 ZMntLens (4 , " Nikon" , " Nikkor Z 35mm f/1.8 S" ),
3346- ZMntLens (8 , " Nikon" , " Nikkor Z 58mm f/0.95 S Noct" ), // IB
3346+ ZMntLens (8 , " Nikon" , " Nikkor Z 58mm f/0.95 S Noct" ), // IB
33473347 ZMntLens (9 , " Nikon" , " Nikkor Z 50mm f/1.8 S" ),
33483348 ZMntLens (11 , " Nikon" , " Nikkor Z DX 16-50mm f/3.5-6.3 VR" ),
33493349 ZMntLens (12 , " Nikon" , " Nikkor Z DX 50-250mm f/4.5-6.3 VR" ),
33503350 ZMntLens (13 , " Nikon" , " Nikkor Z 24-70mm f/2.8 S" ),
33513351 ZMntLens (14 , " Nikon" , " Nikkor Z 85mm f/1.8 S" ),
3352- ZMntLens (15 , " Nikon" , " Nikkor Z 24mm f/1.8 S" ), // IB
3353- ZMntLens (16 , " Nikon" , " Nikkor Z 70-200mm f/2.8 VR S" ), // IB
3354- ZMntLens (17 , " Nikon" , " Nikkor Z 20mm f/1.8 S" ), // IB
3355- ZMntLens (18 , " Nikon" , " Nikkor Z 24-200mm f/4-6.3 VR" ), // IB
3356- ZMntLens (21 , " Nikon" , " Nikkor Z 50mm f/1.2 S" ), // IB
3357- ZMntLens (22 , " Nikon" , " Nikkor Z 24-50mm f/4-6.3" ), // IB
3358- ZMntLens (23 , " Nikon" , " Nikkor Z 14-24mm f/2.8 S" ), // IB
3352+ ZMntLens (15 , " Nikon" , " Nikkor Z 24mm f/1.8 S" ), // IB
3353+ ZMntLens (16 , " Nikon" , " Nikkor Z 70-200mm f/2.8 VR S" ), // IB
3354+ ZMntLens (17 , " Nikon" , " Nikkor Z 20mm f/1.8 S" ), // IB
3355+ ZMntLens (18 , " Nikon" , " Nikkor Z 24-200mm f/4-6.3 VR" ), // IB
3356+ ZMntLens (21 , " Nikon" , " Nikkor Z 50mm f/1.2 S" ), // IB
3357+ ZMntLens (22 , " Nikon" , " Nikkor Z 24-50mm f/4-6.3" ), // IB
3358+ ZMntLens (23 , " Nikon" , " Nikkor Z 14-24mm f/2.8 S" ), // IB
3359+ ZMntLens (24 , " Nikon" , " Nikkor Z MC 105mm f/2.8 VR S" ), // IB
3360+ ZMntLens (27 , " Nikon" , " Nikkor Z MC 50mm f/2.8" ), // IB
3361+ ZMntLens (28 , " Nikon" , " Nikkor Z 100-400mm f/4.5-5.6 VR S" ), // 28
3362+ ZMntLens (29 , " Nikon" , " Nikkor Z 28mm f/2.8" ), // IB
3363+ ZMntLens (30 , " Nikon" , " Nikkor Z 400mm f/2.8 TC VR S" ), // 28
3364+ ZMntLens (31 , " Nikon" , " Nikkor Z 24-120 f/4" ), // 28
3365+ ZMntLens (32 , " Nikon" , " Nikkor Z 800mm f/6.3 VR S" ), // 28
33593366 };
33603367
33613368 auto lid = static_cast <uint16_t >(value.toInt64 ());
0 commit comments