Skip to content

Commit c8eebda

Browse files
committed
Fix regression in Canon lens detection
Reintroduces lens IDs lost in 8859209. Fixes Exiv2#1420.
1 parent 866d213 commit c8eebda

File tree

1 file changed

+5
-0
lines changed

1 file changed

+5
-0
lines changed

src/canonmn_int.cpp

+5
Original file line numberDiff line numberDiff line change
@@ -1002,6 +1002,7 @@ namespace Exiv2 {
10021002
{ 172, "Canon EF 400mm f/5.6L USM" },
10031003
{ 172, "Sigma 150-600mm f/5-6.3 DG OS HSM | S" }, // 1
10041004
{ 172, "Sigma 500mm f/4.5 APO EX DG HSM" }, // 2
1005+
{ 172, "Sigma 150-500mm f/5-6.3 APO DG OS HSM + 1.4x" }, // 3
10051006
{ 173, "Canon EF 180mm Macro f/3.5L USM" },
10061007
{ 173, "Sigma 180mm EX HSM Macro f/3.5" }, // 1
10071008
{ 173, "Sigma APO Macro 150mm f/2.8 EX DG HSM" }, // 2
@@ -1083,6 +1084,7 @@ namespace Exiv2 {
10831084
{ 213, "Tamron 16-300mm f/3.5-6.3 Di II VC PZD Macro" }, // 2
10841085
{ 213, "Tamron SP 35mm f/1.8 Di VC USD" }, // 3
10851086
{ 213, "Tamron SP 45mm f/1.8 Di VC USD" }, // 4
1087+
{ 213, "Tamron SP 70-300mm f/4-5.6 Di VC USD" }, // 5
10861088
{ 214, "Canon EF-S 18-55mm f/3.5-5.6 USM" },
10871089
{ 215, "Canon EF 55-200mm f/4.5-5.6 II USM" },
10881090
{ 217, "Tamron AF 18-270mm f/3.5-6.3 Di II VC PZD" },
@@ -1176,6 +1178,9 @@ namespace Exiv2 {
11761178
{ 508, "Canon EF 11-24mm f/4L USM" },
11771179
{ 508, "Tamron 10-24mm f/3.5-4.5 Di II VC HLD" }, // 1
11781180
{ 624, "Sigma 70-200mm f/2.8 DG OS HSM | S" },
1181+
{ 624, "Sigma 14mm f/1.8 DG HSM | A" }, // 1
1182+
{ 624, "Sigma 150-600mm f/5-6.3 DG OS HSM | C" }, // 2
1183+
{ 624, "Sigma 150-600mm f/5-6.3 DG OS HSM | C + 1.4x" }, // 3
11791184
{ 747, "Canon EF 100-400mm f/4.5-5.6L IS II USM" },
11801185
{ 747, "Tamron SP 150-600mm f/5-6.3 Di VC USD G2" }, // 1
11811186
{ 748, "Canon EF 100-400mm f/4.5-5.6L IS II USM + 1.4x" },

0 commit comments

Comments
 (0)