Skip to content

Commit fe44c8c

Browse files
kmilosneheb
authored andcommitted
Add a few more IDs for cameras and lenses
(cherry picked from commit f20977c) # Conflicts: # src/canonmn_int.cpp
1 parent bec05da commit fe44c8c

File tree

3 files changed

+23
-2
lines changed

3 files changed

+23
-2
lines changed

src/canonmn_int.cpp

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -387,6 +387,8 @@ constexpr TagDetails canonModelId[] = {
387387
{0x80000480, "EOS R50"},
388388
{0x80000481, "EOS R6 Mark II"},
389389
{0x80000487, "EOS R8"},
390+
{0x80000491, "PowerShot V10"},
391+
{0x80000498, "EOS R100"},
390392
{0x80000520, "EOS D2000C"},
391393
{0x80000560, "EOS D6000C"},
392394
};
@@ -2062,6 +2064,8 @@ constexpr TagDetails canonCsLensType[] = {
20622064
{61182, "Canon RF 400mm F2.8L IS USM + RF1.4x"},
20632065
{61182, "Canon RF 400mm F2.8L IS USM + RF2x"},
20642066
{61182, "Canon RF 600mm F4L IS USM"},
2067+
{61182, "Canon RF 600mm F4L IS USM + RF1.4x"},
2068+
{61182, "Canon RF 600mm F4L IS USM + RF2x"},
20652069
{61182, "Canon RF 800mm F5.6L IS USM"},
20662070
{61182, "Canon RF 800mm F5.6L IS USM + RF1.4x"},
20672071
{61182, "Canon RF 800mm F5.6L IS USM + RF2x"},
@@ -2072,7 +2076,11 @@ constexpr TagDetails canonCsLensType[] = {
20722076
{61182, "Canon RF 135mm F1.8 L IS USM"},
20732077
{61182, "Canon RF 24-50mm F4.5-6.3 IS STM"},
20742078
{61182, "Canon RF-S 55-210mm F5-7.1 IS STM"},
2075-
{65535, "n/a"},
2079+
{61182, "Canon RF 100-300mm F2.8L IS USM"},
2080+
{61182, "Canon RF 100-300mm F2.8L IS USM + RF1.4x"},
2081+
{61182, "Canon RF 100-300mm F2.8L IS USM + RF2x"},
2082+
{61182, "Canon RF 28mm F2.8 STM"},
2083+
{65535, N_("n/a")},
20762084
};
20772085

20782086
//! FlashActivity, tag 0x001c
@@ -2490,7 +2498,7 @@ constexpr TagDetails canonToningEffect[] = {
24902498
};
24912499

24922500
//! RFLensType, tag 0x003D
2493-
// from https://github.com/exiftool/exiftool/blob/12.49/lib/Image/ExifTool/Canon.pm#L6791
2501+
// from https://github.com/exiftool/exiftool/blob/12.67/lib/Image/ExifTool/Canon.pm#L6833
24942502
constexpr TagDetails canonRFLensType[] = {
24952503
{0, N_("n/a")},
24962504
{257, "Canon RF 50mm F1.2L USM"},
@@ -2529,6 +2537,8 @@ constexpr TagDetails canonRFLensType[] = {
25292537
{290, "Canon RF 400mm F2.8L IS USM + RF1.4x"},
25302538
{291, "Canon RF 400mm F2.8L IS USM + RF2x"},
25312539
{292, "Canon RF 600mm F4L IS USM"},
2540+
{293, "Canon RF 600mm F4L IS USM + RF1.4x"},
2541+
{294, "Canon RF 600mm F4L IS USM + RF2x"},
25322542
{295, "Canon RF 800mm F5.6L IS USM"},
25332543
{296, "Canon RF 800mm F5.6L IS USM + RF1.4x"},
25342544
{297, "Canon RF 800mm F5.6L IS USM + RF2x"},
@@ -2539,6 +2549,10 @@ constexpr TagDetails canonRFLensType[] = {
25392549
{303, "Canon RF 135mm F1.8 L IS USM"},
25402550
{304, "Canon RF 24-50mm F4.5-6.3 IS STM"},
25412551
{305, "Canon RF-S 55-210mm F5-7.1 IS STM"},
2552+
{306, "Canon RF 100-300mm F2.8L IS USM"},
2553+
{307, "Canon RF 100-300mm F2.8L IS USM + RF1.4x"},
2554+
{308, "Canon RF 100-300mm F2.8L IS USM + RF2x"},
2555+
{313, "Canon RF 28mm F2.8 STM"},
25422556
};
25432557

25442558
// Canon File Info Tag

src/nikonmn_int.cpp

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3943,6 +3943,10 @@ std::ostream& Nikon3MakerNote::printLensId4ZMount(std::ostream& os, const Value&
39433943
{38, "Nikon", "Nikkor Z 85mm f/1.2 S"}, // 28
39443944
{39, "Nikon", "Nikkor Z 17-28mm f/2.8"}, // IB
39453945
{40, "Nikon", "Nikkor Z 26mm f/2.8"},
3946+
{41, "Nikon", "Nikkor Z DX 12-28mm f/3.5-5.6 PZ VR"},
3947+
{42, "Nikon", "Nikkor Z 180-600mm f/5.6-6.3 VR"},
3948+
{43, "Nikon", "Nikkor Z DX 24mm f/1.7"},
3949+
{44, "Nikon", "Nikkor Z 70-180mm f/2.8"},
39463950
};
39473951

39483952
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
@@ -664,6 +666,7 @@ constexpr TagDetails pentaxLensType[] = {
664666
{0x0402, "smc PENTAX-FA 80-320mm F4.5-5.6"},
665667
{0x0403, "smc PENTAX-FA 43mm F1.9 Limited"},
666668
{0x0406, "smc PENTAX-FA 35-80mm F4-5.6"},
669+
{0x0407, "Irix 45mm F/1.4"},
667670
{0x0408, "Irix 150mm F/2.8 Macro"},
668671
{0x0409, "Irix 11mm F/4"},
669672
{0x040a, "Irix 15mm F/2.4"},

0 commit comments

Comments
 (0)