Skip to content

Commit f20977c

Browse files
kmilosneheb
authored andcommitted
Add a few more IDs for cameras and lenses
1 parent b163483 commit f20977c

File tree

3 files changed

+24
-3
lines changed

3 files changed

+24
-3
lines changed

src/canonmn_int.cpp

Lines changed: 17 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -383,6 +383,8 @@ constexpr TagDetails canonModelId[] = {{0x00000412, "EOS M50 / Kiss M"},
383383
{0x80000480, "EOS R50"},
384384
{0x80000481, "EOS R6 Mark II"},
385385
{0x80000487, "EOS R8"},
386+
{0x80000491, "PowerShot V10"},
387+
{0x80000498, "EOS R100"},
386388
{0x80000520, "EOS D2000C"},
387389
{0x80000560, "EOS D6000C"}};
388390

@@ -1946,6 +1948,8 @@ constexpr TagDetails canonCsLensType[] = {{1, "Canon EF 50mm f/1.8"},
19461948
{61182, "Canon RF 400mm F2.8L IS USM + RF1.4x"},
19471949
{61182, "Canon RF 400mm F2.8L IS USM + RF2x"},
19481950
{61182, "Canon RF 600mm F4L IS USM"},
1951+
{61182, "Canon RF 600mm F4L IS USM + RF1.4x"},
1952+
{61182, "Canon RF 600mm F4L IS USM + RF2x"},
19491953
{61182, "Canon RF 800mm F5.6L IS USM"},
19501954
{61182, "Canon RF 800mm F5.6L IS USM + RF1.4x"},
19511955
{61182, "Canon RF 800mm F5.6L IS USM + RF2x"},
@@ -1956,7 +1960,11 @@ constexpr TagDetails canonCsLensType[] = {{1, "Canon EF 50mm f/1.8"},
19561960
{61182, "Canon RF 135mm F1.8 L IS USM"},
19571961
{61182, "Canon RF 24-50mm F4.5-6.3 IS STM"},
19581962
{61182, "Canon RF-S 55-210mm F5-7.1 IS STM"},
1959-
{65535, "n/a"}};
1963+
{61182, "Canon RF 100-300mm F2.8L IS USM"},
1964+
{61182, "Canon RF 100-300mm F2.8L IS USM + RF1.4x"},
1965+
{61182, "Canon RF 100-300mm F2.8L IS USM + RF2x"},
1966+
{61182, "Canon RF 28mm F2.8 STM"},
1967+
{65535, N_("n/a")}};
19601968

19611969
//! FlashActivity, tag 0x001c
19621970
constexpr TagDetails canonCsFlashActivity[] = {{0, N_("Did not fire")}, {1, N_("Fired")}};
@@ -2324,7 +2332,7 @@ constexpr TagDetails canonToningEffect[] = {
23242332
{0, N_("None")}, {1, N_("Sepia")}, {2, N_("Blue")}, {3, N_("Purple")}, {4, N_("Green")}};
23252333

23262334
//! RFLensType, tag 0x003D
2327-
// from https://github.com/exiftool/exiftool/blob/12.49/lib/Image/ExifTool/Canon.pm#L6791
2335+
// from https://github.com/exiftool/exiftool/blob/12.67/lib/Image/ExifTool/Canon.pm#L6833
23282336
constexpr TagDetails canonRFLensType[] = {{0, N_("n/a")},
23292337
{257, "Canon RF 50mm F1.2L USM"},
23302338
{258, "Canon RF 24-105mm F4L IS USM"},
@@ -2362,6 +2370,8 @@ constexpr TagDetails canonRFLensType[] = {{0, N_("n/a")},
23622370
{290, "Canon RF 400mm F2.8L IS USM + RF1.4x"},
23632371
{291, "Canon RF 400mm F2.8L IS USM + RF2x"},
23642372
{292, "Canon RF 600mm F4L IS USM"},
2373+
{293, "Canon RF 600mm F4L IS USM + RF1.4x"},
2374+
{294, "Canon RF 600mm F4L IS USM + RF2x"},
23652375
{295, "Canon RF 800mm F5.6L IS USM"},
23662376
{296, "Canon RF 800mm F5.6L IS USM + RF1.4x"},
23672377
{297, "Canon RF 800mm F5.6L IS USM + RF2x"},
@@ -2371,7 +2381,11 @@ constexpr TagDetails canonRFLensType[] = {{0, N_("n/a")},
23712381
{302, "Canon RF 15-30mm F4.5-6.3 IS STM"},
23722382
{303, "Canon RF 135mm F1.8 L IS USM"},
23732383
{304, "Canon RF 24-50mm F4.5-6.3 IS STM"},
2374-
{305, "Canon RF-S 55-210mm F5-7.1 IS STM"}};
2384+
{305, "Canon RF-S 55-210mm F5-7.1 IS STM"},
2385+
{306, "Canon RF 100-300mm F2.8L IS USM"},
2386+
{307, "Canon RF 100-300mm F2.8L IS USM + RF1.4x"},
2387+
{308, "Canon RF 100-300mm F2.8L IS USM + RF2x"},
2388+
{313, "Canon RF 28mm F2.8 STM"}};
23752389

23762390
// Canon File Info Tag
23772391
constexpr TagInfo CanonMakerNote::tagInfoFi_[] = {

src/nikonmn_int.cpp

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3849,6 +3849,10 @@ std::ostream& Nikon3MakerNote::printLensId4ZMount(std::ostream& os, const Value&
38493849
{38, "Nikon", "Nikkor Z 85mm f/1.2 S"}, // 28
38503850
{39, "Nikon", "Nikkor Z 17-28mm f/2.8"}, // IB
38513851
{40, "Nikon", "Nikkor Z 26mm f/2.8"},
3852+
{41, "Nikon", "Nikkor Z DX 12-28mm f/3.5-5.6 PZ VR"},
3853+
{42, "Nikon", "Nikkor Z 180-600mm f/5.6-6.3 VR"},
3854+
{43, "Nikon", "Nikkor Z DX 24mm f/1.7"},
3855+
{44, "Nikon", "Nikkor Z 70-180mm f/2.8"},
38523856
};
38533857

38543858
auto lid = static_cast<uint16_t>(value.toInt64());

src/pentaxmn_int.cpp

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -165,6 +165,8 @@ constexpr TagDetails pentaxModel[] = {
165165
{0x13240, "K-1 Mark II"},
166166
{0x13254, "K-3 Mark III"},
167167
{0x13290, "WG-70"},
168+
{0x1329a, "GR IIIx"},
169+
{0x132d6, "K-3 Mark III Monochrome"},
168170
};
169171

170172
//! Quality, tag 0x0008
@@ -663,6 +665,7 @@ constexpr TagDetails pentaxLensType[] = {
663665
{0x0402, "smc PENTAX-FA 80-320mm F4.5-5.6"},
664666
{0x0403, "smc PENTAX-FA 43mm F1.9 Limited"},
665667
{0x0406, "smc PENTAX-FA 35-80mm F4-5.6"},
668+
{0x0407, "Irix 45mm F/1.4"},
666669
{0x0408, "Irix 150mm F/2.8 Macro"},
667670
{0x0409, "Irix 11mm F/4"},
668671
{0x040a, "Irix 15mm F/2.4"},

0 commit comments

Comments
 (0)