Skip to content
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

Add some more cameras and lenses #3104

Merged
merged 4 commits into from
Jan 5, 2025
Merged

Add some more cameras and lenses #3104

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
c5a0706
Add new Nikon Z lenses
kmilos Oct 17, 2024
2773c12
Add new Canon RF lenses
kmilos Oct 22, 2024
e75c9f7
Add Sony models
kmilos Nov 29, 2024
5e18c37
Add HD PENTAX DA* 16-50mm F2.8 ED PLM AW
kmilos Jan 5, 2025
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
26 changes: 19 additions & 7 deletions src/canonmn_int.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2096,7 +2096,7 @@ constexpr TagDetails canonCsLensType[] = {
{61182, "Canon RF 1200mm F8L IS USM + RF2x"},
{61182, "Canon RF 5.2mm F2.8L Dual Fisheye 3D VR"},
{61182, "Canon RF 15-30mm F4.5-6.3 IS STM"},
{61182, "Canon RF 135mm F1.8 L IS USM"},
{61182, "Canon RF 135mm F1.8L IS USM"},
{61182, "Canon RF 24-50mm F4.5-6.3 IS STM"},
{61182, "Canon RF-S 55-210mm F5-7.1 IS STM"},
{61182, "Canon RF 100-300mm F2.8L IS USM"},
Expand All @@ -2105,10 +2105,16 @@ constexpr TagDetails canonCsLensType[] = {
{61182, "Canon RF 200-800mm F6.3-9 IS USM"},
{61182, "Canon RF 200-800mm F6.3-9 IS USM + RF1.4x"},
{61182, "Canon RF 200-800mm F6.3-9 IS USM + RF2x"},
{61182, "Canon RF 10-20mm F4 L IS STM"},
{61182, "Canon RF 10-20mm F4L IS STM"},
{61182, "Canon RF 28mm F2.8 STM"},
{61182, "Canon RF 24-105mm F2.8 L IS USM Z"},
{61182, "Canon RF 24-105mm F2.8L IS USM Z"},
{61182, "Canon RF-S 10-18mm F4.5-6.3 IS STM"},
{61182, "Canon RF 35mm F1.4L VCM"},
{61182, "Canon RF-S 3.9mm F3.5 STM Dual Fisheye"},
{61182, "Canon RF 28-70mm F2.8 IS STM"},
{61182, "Canon RF 70-200mm F2.8L IS USM Z"},
{61182, "Canon RF 50mm F1.4L VCM"},
{61182, "Canon RF 24mm F1.4L VCM"},
{65535, N_("n/a")},
};

Expand Down Expand Up @@ -2527,7 +2533,7 @@ constexpr TagDetails canonToningEffect[] = {
};

//! RFLensType, tag 0x003D
// from https://github.com/exiftool/exiftool/blob/12.72/lib/Image/ExifTool/Canon.pm#L6897
// from https://github.com/exiftool/exiftool/blob/13.04/lib/Image/ExifTool/Canon.pm#L6940
constexpr TagDetails canonRFLensType[] = {
{0, N_("n/a")},
{257, "Canon RF 50mm F1.2L USM"},
Expand Down Expand Up @@ -2576,7 +2582,7 @@ constexpr TagDetails canonRFLensType[] = {
{300, "Canon RF 1200mm F8L IS USM + RF2x"},
{301, "Canon RF 5.2mm F2.8L Dual Fisheye 3D VR"},
{302, "Canon RF 15-30mm F4.5-6.3 IS STM"},
{303, "Canon RF 135mm F1.8 L IS USM"},
{303, "Canon RF 135mm F1.8L IS USM"},
{304, "Canon RF 24-50mm F4.5-6.3 IS STM"},
{305, "Canon RF-S 55-210mm F5-7.1 IS STM"},
{306, "Canon RF 100-300mm F2.8L IS USM"},
Expand All @@ -2585,10 +2591,16 @@ constexpr TagDetails canonRFLensType[] = {
{309, "Canon RF 200-800mm F6.3-9 IS USM"},
{310, "Canon RF 200-800mm F6.3-9 IS USM + RF1.4x"},
{311, "Canon RF 200-800mm F6.3-9 IS USM + RF2x"},
{312, "Canon RF 10-20mm F4 L IS STM"},
{312, "Canon RF 10-20mm F4L IS STM"},
{313, "Canon RF 28mm F2.8 STM"},
{314, "Canon RF 24-105mm F2.8 L IS USM Z"},
{314, "Canon RF 24-105mm F2.8L IS USM Z"},
{315, "Canon RF-S 10-18mm F4.5-6.3 IS STM"},
{316, "Canon RF 35mm F1.4L VCM"},
{317, "Canon RF-S 3.9mm F3.5 STM Dual Fisheye"},
{318, "Canon RF 28-70mm F2.8 IS STM"},
{319, "Canon RF 70-200mm F2.8L IS USM Z"},
{325, "Canon RF 50mm F1.4L VCM"},
{326, "Canon RF 24mm F1.4L VCM"},
};

// Canon File Info Tag
Expand Down
4 changes: 3 additions & 1 deletion src/nikonmn_int.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3971,7 +3971,7 @@ std::ostream& Nikon3MakerNote::printLensId4ZMount(std::ostream& os, const Value&
return os << "(" << value << ")";
}

// cf. https://github.com/exiftool/exiftool/blob/12.83/lib/Image/ExifTool/Nikon.pm#L5473
// cf. https://github.com/exiftool/exiftool/blob/12.97/lib/Image/ExifTool/Nikon.pm#L5539
static constexpr struct lens {
uint16_t l;
const char* vendor;
Expand Down Expand Up @@ -4015,6 +4015,8 @@ std::ostream& Nikon3MakerNote::printLensId4ZMount(std::ostream& os, const Value&
{45, "Nikon", "Nikkor Z 600mm f/6.3 VR S"},
{46, "Nikon", "Nikkor Z 135mm f/1.8 S Plena"},
{48, "Nikon", "Nikkor Z 28-400mm f/4-8 VR"},
{51, "Nikon", "Nikkor Z 35mm f/1.4"},
{52, "Nikon", "Nikkor Z 50mm f/1.4"},
{53251, "Sigma", "56mm F1.4 DC DN | C"},
{57346, "Tamron", "35-150mm F/2-2.8 Di III VXD"},
};
Expand Down
1 change: 1 addition & 0 deletions src/pentaxmn_int.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -824,6 +824,7 @@ constexpr TagDetails pentaxLensType[] = {
{0x0841, "HD PENTAX-D FA 70-210mm F4 ED SDM WR"},
{0x0842, "HD PENTAX-D FA* 85mm F1.4 SDM AW"},
{0x0843, "HD PENTAX-D FA 21mm F2.4 ED Limited DC WR"},
{0x08c3, "HD PENTAX DA* 16-50mm F2.8 ED PLM AW"},
{0x08c4, "HD PENTAX-DA* 11-18mm F2.8 ED DC AW"},
{0x08c5, "HD PENTAX-DA 55-300mm F4.5-6.3 ED PLM WR RE"},
{0x08c6, "smc PENTAX-DA L 18-50mm F4-5.6 DC WR RE"},
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 @@ -518,6 +518,8 @@ constexpr TagDetails sonyModelId[] = {
{395, "ZV-1M2"},
{396, "ILCE-7CR"},
{397, "ILCE-7CM2"},
{398, "ILX-LR1"},
{400, "ILCE-1M2"},
};

//! Lookup table to translate Sony creative style (main group) values to readable labels
Expand Down
Loading