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 new lenses and camera models #3140

Merged
merged 3 commits into from
Feb 7, 2025
Merged

Add new lenses and camera models #3140

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
ebec8bf
Add Sony models
kmilos Jan 27, 2025
e4dff7b
Add new Canon RF lenses
kmilos Feb 1, 2025
fd82e47
Add new Nikon Z lenses
kmilos Feb 7, 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
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 @@ -1991,6 +1991,7 @@ constexpr TagDetails canonCsLensType[] = {{1, "Canon EF 50mm f/1.8"},
{61182, "Canon RF 70-200mm F2.8 L IS USM Z"},
{61182, "Canon RF 70-200mm F2.8 L IS USM Z + RF1.4x"},
{61182, "Canon RF 70-200mm F2.8 L IS USM Z + RF2x"},
{61182, "Canon RF 16-28mm F2.8 IS STM"},
{61182, "Canon RF 50mm F1.4 L VCM"},
{61182, "Canon RF 24mm F1.4 L VCM"},
{65535, N_("n/a")}};
Expand Down Expand Up @@ -2361,7 +2362,7 @@ constexpr TagDetails canonToningEffect[] = {
{0, N_("None")}, {1, N_("Sepia")}, {2, N_("Blue")}, {3, N_("Purple")}, {4, N_("Green")}};

//! RFLensType, tag 0x003D
// from https://github.com/exiftool/exiftool/blob/13.12/lib/Image/ExifTool/Canon.pm#L6942
// from https://github.com/exiftool/exiftool/blob/13.16/lib/Image/ExifTool/Canon.pm#L6961
constexpr TagDetails canonRFLensType[] = {{0, N_("n/a")},
{257, "Canon RF 50mm F1.2 L USM"},
{258, "Canon RF 24-105mm F4 L IS USM"},
Expand Down Expand Up @@ -2428,6 +2429,7 @@ constexpr TagDetails canonRFLensType[] = {{0, N_("n/a")},
{319, "Canon RF 70-200mm F2.8 L IS USM Z"},
{320, "Canon RF 70-200mm F2.8 L IS USM Z + RF1.4x"},
{321, "Canon RF 70-200mm F2.8 L IS USM Z + RF2x"},
{323, "Canon RF 16-28mm F2.8 IS STM"},
{325, "Canon RF 50mm F1.4 L VCM"},
{326, "Canon RF 24mm F1.4 L VCM"}};

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 @@ -3835,7 +3835,7 @@ std::ostream& Nikon3MakerNote::printLensId4ZMount(std::ostream& os, const Value&
return os << "(" << value << ")";
}

// cf. https://github.com/exiftool/exiftool/blob/12.97/lib/Image/ExifTool/Nikon.pm#L5539
// cf. https://github.com/exiftool/exiftool/blob/13.16/lib/Image/ExifTool/Nikon.pm#L5668
static constexpr struct lens {
uint16_t l;
const char* vendor;
Expand Down Expand Up @@ -3878,9 +3878,11 @@ std::ostream& Nikon3MakerNote::printLensId4ZMount(std::ostream& os, const Value&
{44, "Nikon", "Nikkor Z 70-180mm f/2.8"},
{45, "Nikon", "Nikkor Z 600mm f/6.3 VR S"},
{46, "Nikon", "Nikkor Z 135mm f/1.8 S Plena"},
{47, "Nikon", "Nikkor Z 35mm f/1.2 S"},
{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"},
{2305, "Laowa", "FFII 10mm F2.8 C&D Dreamer"},
{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/sonymn_int.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -439,6 +439,7 @@ constexpr TagDetails sonyModelId[] = {{0, N_("Multiple camera models")},
{396, "ILCE-7CR"},
{397, "ILCE-7CM2"},
{398, "ILX-LR1"},
{399, "ZV-E10M2"},
{400, "ILCE-1M2"}};

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