From c6cb6117251793d71529a241515eb2bc34b32d0f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Milo=C5=A1=20Komar=C4=8Devi=C4=87?= <4973094+kmilos@users.noreply.github.com> Date: Wed, 6 May 2026 13:18:49 +0200 Subject: [PATCH 1/3] Add new Nikon Z lenses (cherry picked from commit 8c7eaff26857c9c0738c24dec4b472e61cac595e) --- src/nikonmn_int.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/nikonmn_int.cpp b/src/nikonmn_int.cpp index fce8182621..12eeb6b38e 100644 --- a/src/nikonmn_int.cpp +++ b/src/nikonmn_int.cpp @@ -3838,7 +3838,7 @@ std::ostream& Nikon3MakerNote::printLensId4ZMount(std::ostream& os, const Value& return os << "(" << value << ")"; } - // cf. https://github.com/exiftool/exiftool/blob/13.44/lib/Image/ExifTool/Nikon.pm#L5816 + // cf. https://github.com/exiftool/exiftool/blob/13.58/lib/Image/ExifTool/Nikon.pm#L5819 static constexpr struct lens { uint16_t l; const char* vendor; @@ -3888,6 +3888,7 @@ std::ostream& Nikon3MakerNote::printLensId4ZMount(std::ostream& os, const Value& {51, "Nikon", "Nikkor Z 35mm f/1.4"}, {52, "Nikon", "Nikkor Z 50mm f/1.4"}, {53, "Nikon", "Nikkor Z DX 16-50mm f/2.8 VR"}, + {54, "Nikon", "Nikkor Z 70-200mm f/2.8 VR S II"}, {55, "Nikon", "Nikkor Z DX MC 35mm f/1.7"}, {57, "Nikon", "Nikkor Z 24-105mm f/4-7.1"}, {2305, "Laowa", "FFII 10mm F2.8 C&D Dreamer"}, From 1a6546b0c6edc43b0f82eb93fa79b1a7f334cf38 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Milo=C5=A1=20Komar=C4=8Devi=C4=87?= Date: Thu, 28 May 2026 10:27:26 +0200 Subject: [PATCH 2/3] Add new Sony cameras (cherry picked from commit 4dd7fdbcdf3966aec33129796372802055f60db4) --- src/makernote_int.cpp | 4 +++- src/sonymn_int.cpp | 2 ++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/makernote_int.cpp b/src/makernote_int.cpp index 353533685b..166b07a7c1 100644 --- a/src/makernote_int.cpp +++ b/src/makernote_int.cpp @@ -1019,7 +1019,7 @@ int sonyMisc2bSelector(uint16_t /*tag*/, const byte* /*pData*/, size_t /*size*/, } int sonyMisc3cSelector(uint16_t /*tag*/, const byte* /*pData*/, size_t /*size*/, TiffComponent* pRoot) { // For condition, see Exiftool (Tag 9400c): - // https://github.com/exiftool/exiftool/blob/5a8b6b6ead12b39e3f32f978a4efd0233facbb01/lib/Image/ExifTool/Sony.pm#L1807 + // https://github.com/exiftool/exiftool/blob/2200871d9cef988051d2a99d67df3bda6cbb30a8/lib/Image/ExifTool/Sony.pm#L1826 // Get the value from the image format that is being used auto value = getExifValue(pRoot, 0x9400, Exiv2::IfdId::sony1Id); @@ -1041,7 +1041,9 @@ int sonyMisc3cSelector(uint16_t /*tag*/, const byte* /*pData*/, size_t /*size*/, case 49: // 0x31 for ILCE-1/7M4/7SM3, ILME-FX3 case 50: // 0x32 for ILCE-7RM5, ILME-FX30 case 51: // 0x33 for ILCE-6700/7CM2/7CR/9M3, ZV-E1 + case 52: // 0x34 for DSC-RX10M5 case 65: // 0x41 for ILCE-7M5 + case 67: // 0x43 for ILCE-7RM6 return 0; default: break; diff --git a/src/sonymn_int.cpp b/src/sonymn_int.cpp index 27628dcf1d..32c7d7daea 100644 --- a/src/sonymn_int.cpp +++ b/src/sonymn_int.cpp @@ -474,6 +474,8 @@ constexpr TagDetails sonyModelId[] = { {406, "ILME-FX2"}, {407, "ILCE-7M5"}, {408, "ZV-1A"}, + {410, "ILCE-7RM6"}, + {411, "DSC-RX10M5"}, }; //! Lookup table to translate Sony creative style (main group) values to readable labels From e169bef73f6f87e6fc0e51231cc0ded48f23ff60 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Milo=C5=A1=20Komar=C4=8Devi=C4=87?= Date: Thu, 28 May 2026 10:31:33 +0200 Subject: [PATCH 3/3] Add new Canon RF lenses (cherry picked from commit 662ff4b44061afd2529ee36bdc1c2c7751081f1c) --- src/canonmn_int.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/canonmn_int.cpp b/src/canonmn_int.cpp index b556e27351..d426cfc1aa 100644 --- a/src/canonmn_int.cpp +++ b/src/canonmn_int.cpp @@ -2009,6 +2009,7 @@ constexpr TagDetails canonCsLensType[] = { {61182, "Canon RF 24mm F1.4 L VCM"}, {61182, "Canon RF 20mm F1.4 L VCM"}, {61182, "Canon RF 85mm F1.4 L VCM"}, + {61182, "Canon RF 20-50mm F4 L IS USM PZ"}, {61182, "Canon RF 45mm F1.2 STM"}, {61182, "Canon RF 7-14mm F2.8-3.5 L Fisheye STM"}, {61182, "Canon RF 14mm F1.4 L VCM"}, @@ -2388,7 +2389,7 @@ constexpr TagDetails canonShutterMode[] = { }; //! RFLensType, tag 0x003D -// from https://github.com/exiftool/exiftool/blob/13.50/lib/Image/ExifTool/Canon.pm#L7009 +// from https://github.com/exiftool/exiftool/blob/13.59/lib/Image/ExifTool/Canon.pm#L7060 constexpr TagDetails canonRFLensType[] = { {0, N_("n/a")}, {257, "Canon RF 50mm F1.2 L USM"}, @@ -2462,6 +2463,7 @@ constexpr TagDetails canonRFLensType[] = { {326, "Canon RF 24mm F1.4 L VCM"}, {327, "Canon RF 20mm F1.4 L VCM"}, {328, "Canon RF 85mm F1.4 L VCM"}, + {329, "Canon RF 20-50mm F4 L IS USM PZ"}, {330, "Canon RF 45mm F1.2 STM"}, {331, "Canon RF 7-14mm F2.8-3.5 L Fisheye STM"}, {332, "Canon RF 14mm F1.4 L VCM"},