Skip to content

Add new camera and lens model IDs #9339

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kmilos merged 4 commits into from
Jul 27, 2026
+10 −3
Merged

Add new camera and lens model IDs #9339

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
be65c1e
Add new Nikon Z lenses
kmilos May 6, 2026
844a1ef
Add new Sony cameras
kmilos May 28, 2026
6aeeb7c
Add new Canon RF lenses
kmilos May 28, 2026
51005e0
Merge branch 'main' into kmilos/ids
kevinbackhouse Jul 27, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion src/canonmn_int.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2032,6 +2032,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"},
Expand Down Expand Up @@ -2440,7 +2441,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"},
Expand Down Expand Up @@ -2514,6 +2515,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"},
Expand Down
4 changes: 3 additions & 1 deletion src/makernote_int.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1015,7 +1015,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);
Expand All @@ -1037,7 +1037,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;
Expand Down
3 changes: 2 additions & 1 deletion src/nikonmn_int.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1556,7 +1556,7 @@ constexpr TagInfo Nikon3MakerNote::tagInfoLd3_[] = {
};

//! LensID, tag index 48
// see https://github.com/exiftool/exiftool/blob/13.44/lib/Image/ExifTool/Nikon.pm#L5816
// see https://github.com/exiftool/exiftool/blob/13.58/lib/Image/ExifTool/Nikon.pm#L5819
constexpr TagDetails nikonZMountLensId[] = {
{0, N_("n/a")},
{1, "Nikon Nikkor Z 24-70mm f/4 S"},
Expand Down Expand Up @@ -1603,6 +1603,7 @@ constexpr TagDetails nikonZMountLensId[] = {
{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"},
Expand Down
2 changes: 2 additions & 0 deletions src/sonymn_int.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -551,6 +551,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
Expand Down
Loading