Skip to content

Commit fb6e313

Browse files
webmeisterwebmeister
committed
Remove undetectable lenses
Lenses that have the exact same ID, focal length and aperture as some other lens that comes earlier in the list (and thus always wins): * 137, "Tamron SP 17-50mm f/2.8 XR Di II VC" * 137, "Tamron SP 24-70mm f/2.8 Di VC USD" * 161, "Sigma 28-70mm f/2.8 EX" * 173, "Sigma 180mm EX HSM Macro f/3.5" * 180, "Zeiss Milvus 50mm f/1.4" * 183, "Sigma 150-600mm f/5-6.3 DG OS HSM | S" * 254, "Tamron SP 90mm f/2.8 Di VC USD Macro 1:1 F004" * 254, "Tamron SP 90mm f/2.8 Di VC USD Macro 1:1 F017" Lenses that share their IDs with other lenses, but have no or an unsupported focal length: * 33, "Voigtlander or Carl Zeiss Lens" * 131, "Sigma 4.5mm f/2.8 EX DC HSM Circular Fisheye"
1 parent 29c1691 commit fb6e313

File tree

1 file changed

+28
-38
lines changed

1 file changed

+28
-38
lines changed

‎src/canonmn_int.cpp‎

Lines changed: 28 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -793,21 +793,20 @@ namespace Exiv2 {
793793
{ 31, "Tamron SP AF 300mm f/2.8 LD IF" }, // 1
794794
{ 32, "Canon EF 24mm f/2.8" }, // 0
795795
{ 32, "Sigma 15mm f/2.8 EX Fisheye" }, // 1
796-
{ 33, "Voigtlander or Carl Zeiss Lens" }, // 0
797-
{ 33, "Voigtlander Ultron 40mm f/2 SLII Aspherical" }, // 1
798-
{ 33, "Voigtlander Color Skopar 20mm f/3.5 SLII Aspherical" }, // 2
799-
{ 33, "Voigtlander APO-Lanthar 90mm f/3.5 SLII Close Focus" }, // 3
800-
{ 33, "Carl Zeiss Distagon 15mm T* f/2.8 ZE" }, // 4
801-
{ 33, "Carl Zeiss Distagon 18mm T* f/3.5 ZE" }, // 5
802-
{ 33, "Carl Zeiss Distagon 21mm T* f/2.8 ZE" }, // 6
803-
{ 33, "Carl Zeiss Distagon 25mm T* f/2 ZE" }, // 7
804-
{ 33, "Carl Zeiss Distagon 28mm T* f/2 ZE" }, // 8
805-
{ 33, "Carl Zeiss Distagon 35mm T* f/2 ZE" }, // 9
806-
{ 33, "Carl Zeiss Distagon 35mm T* f/1.4 ZE" }, // 10
807-
{ 33, "Carl Zeiss Planar 50mm T* f/1.4 ZE" }, // 11
808-
{ 33, "Carl Zeiss Makro-Planar T* 50mm f/2 ZE" }, // 12
809-
{ 33, "Carl Zeiss Makro-Planar T* 100mm f/2 ZE" }, // 13
810-
{ 33, "Carl Zeiss Apo-Sonnar T* 135mm f/2 ZE" }, // 14
796+
{ 33, "Voigtlander Ultron 40mm f/2 SLII Aspherical" }, // 0
797+
{ 33, "Voigtlander Color Skopar 20mm f/3.5 SLII Aspherical" }, // 1
798+
{ 33, "Voigtlander APO-Lanthar 90mm f/3.5 SLII Close Focus" }, // 2
799+
{ 33, "Carl Zeiss Distagon 15mm T* f/2.8 ZE" }, // 3
800+
{ 33, "Carl Zeiss Distagon 18mm T* f/3.5 ZE" }, // 4
801+
{ 33, "Carl Zeiss Distagon 21mm T* f/2.8 ZE" }, // 5
802+
{ 33, "Carl Zeiss Distagon 25mm T* f/2 ZE" }, // 6
803+
{ 33, "Carl Zeiss Distagon 28mm T* f/2 ZE" }, // 7
804+
{ 33, "Carl Zeiss Distagon 35mm T* f/2 ZE" }, // 8
805+
{ 33, "Carl Zeiss Distagon 35mm T* f/1.4 ZE" }, // 9
806+
{ 33, "Carl Zeiss Planar 50mm T* f/1.4 ZE" }, // 10
807+
{ 33, "Carl Zeiss Makro-Planar T* 50mm f/2 ZE" }, // 11
808+
{ 33, "Carl Zeiss Makro-Planar T* 100mm f/2 ZE" }, // 12
809+
{ 33, "Carl Zeiss Apo-Sonnar T* 135mm f/2 ZE" }, // 13
811810
{ 35, "Canon EF 35-80mm f/4-5.6" },
812811
{ 36, "Canon EF 38-76mm f/4.5-5.6" },
813812
{ 37, "Canon EF 35-80mm f/4-5.6" }, // 0
@@ -850,8 +849,7 @@ namespace Exiv2 {
850849
{ 131, "Sigma 17-70mm f/2.8-4.5 DC Macro" }, // 3
851850
{ 131, "Sigma APO 50-150mm f/2.8 EX DC HSM" }, // 4
852851
{ 131, "Sigma APO 120-300mm f/2.8 EX DG HSM" }, // 5
853-
{ 131, "Sigma 4.5mm f/2.8 EX DC HSM Circular Fisheye" }, // 6
854-
{ 131, "Sigma 70-200mm f/2.8 APO EX HSM" }, // 7
852+
{ 131, "Sigma 70-200mm f/2.8 APO EX HSM" }, // 6
855853
{ 132, "Canon EF 1200mm f/5.6L" },
856854
{ 134, "Canon EF 600mm f/4L IS" },
857855
{ 135, "Canon EF 200mm f/1.8L" },
@@ -868,12 +866,10 @@ namespace Exiv2 {
868866
{ 137, "Sigma 18-200mm f/3.5-6.3 DC OS HSM [II]" }, // 8
869867
{ 137, "Tamron AF 18-270mm f/3.5-6.3 Di II VC PZD" }, // 9
870868
{ 137, "Sigma 8-16mm f/4.5-5.6 DC HSM" }, // 10
871-
{ 137, "Tamron SP 17-50mm f/2.8 XR Di II VC" }, // 11
872-
{ 137, "Tamron SP 60mm f/2 Macro Di II" }, // 12
873-
{ 137, "Sigma 10-20mm f/3.5 EX DC HSM" }, // 13
874-
{ 137, "Tamron SP 24-70mm f/2.8 Di VC USD" }, // 14
875-
{ 137, "Sigma 18-35mm f/1.8 DC HSM | A" }, // 15
876-
{ 137, "Sigma 12-24mm f/4.5-5.6 DG HSM II" }, // 16
869+
{ 137, "Tamron SP 60mm f/2 Macro Di II" }, // 11
870+
{ 137, "Sigma 10-20mm f/3.5 EX DC HSM" }, // 12
871+
{ 137, "Sigma 18-35mm f/1.8 DC HSM | A" }, // 13
872+
{ 137, "Sigma 12-24mm f/4.5-5.6 DG HSM II" }, // 14
877873
{ 138, "Canon EF 28-80mm f/2.8-4L" },
878874
{ 139, "Canon EF 400mm f/2.8L" },
879875
{ 140, "Canon EF 500mm f/4.5L" },
@@ -920,12 +916,11 @@ namespace Exiv2 {
920916
{ 160, "Tokina AT-X 11-20 F2.8 PRO DX Aspherical 11-20mm f/2.8" }, // 5
921917
{ 161, "Canon EF 28-70mm f/2.8L" }, // 0
922918
{ 161, "Sigma 24-70mm EX f/2.8" }, // 1
923-
{ 161, "Sigma 28-70mm f/2.8 EX" }, // 2
924-
{ 161, "Sigma 24-60mm f/2.8 EX DG" }, // 3
925-
{ 161, "Tamron AF 17-50mm f/2.8 Di-II LD Aspherical" }, // 4
926-
{ 161, "Tamron 90mm f/2.8" }, // 5
927-
{ 161, "Tamron SP AF 17-35mm f/2.8-4 Di LD Aspherical IF" }, // 6
928-
{ 161, "Tamron SP AF 28-75mm f/2.8 XR Di LD Aspherical [IF] Macro" }, // 7
919+
{ 161, "Sigma 24-60mm f/2.8 EX DG" }, // 2
920+
{ 161, "Tamron AF 17-50mm f/2.8 Di-II LD Aspherical" }, // 3
921+
{ 161, "Tamron 90mm f/2.8" }, // 4
922+
{ 161, "Tamron SP AF 17-35mm f/2.8-4 Di LD Aspherical IF" }, // 5
923+
{ 161, "Tamron SP AF 28-75mm f/2.8 XR Di LD Aspherical [IF] Macro" }, // 6
929924
{ 162, "Canon EF 200mm f/2.8L" },
930925
{ 163, "Canon EF 300mm f/4L" },
931926
{ 164, "Canon EF 400mm f/5.6L" },
@@ -948,9 +943,8 @@ namespace Exiv2 {
948943
{ 172, "Sigma 150-600mm f/5-6.3 DG OS HSM | S" }, // 1
949944
{ 172, "Sigma 150-500mm f/5-6.3 APO DG OS HSM + 1.4x" }, // 2
950945
{ 173, "Canon EF 180mm Macro f/3.5L" }, // 0
951-
{ 173, "Sigma 180mm EX HSM Macro f/3.5" }, // 1
952-
{ 173, "Sigma APO Macro 150mm f/3.5 EX DG IF HSM" }, // 2
953-
{ 173, "Sigma 150-500mm f/5-6.3 APO DG OS HSM + 2x" }, // 3
946+
{ 173, "Sigma APO Macro 150mm f/3.5 EX DG IF HSM" }, // 1
947+
{ 173, "Sigma 150-500mm f/5-6.3 APO DG OS HSM + 2x" }, // 2
954948
{ 174, "Canon EF 135mm f/2L" }, // 0
955949
{ 174, "Sigma 70-200mm f/2.8 EX DG APO OS HSM" }, // 1
956950
{ 174, "Sigma 50-500mm f/4.5-6.3 APO DG OS HSM" }, // 2
@@ -966,9 +960,8 @@ namespace Exiv2 {
966960
{ 180, "Sigma 50mm f/1.4 DG HSM | A" }, // 1
967961
{ 180, "Sigma 24mm f/1.4 DG HSM | A" }, // 2
968962
{ 180, "Sigma 20mm f/1.4 DG HSM | A" }, // 3
969-
{ 180, "Zeiss Milvus 50mm f/1.4" }, // 4
970-
{ 180, "Zeiss Milvus 85mm f/1.4" }, // 5
971-
{ 180, "Zeiss Otus 28mm f/1.4 ZE" }, // 6
963+
{ 180, "Zeiss Milvus 85mm f/1.4" }, // 4
964+
{ 180, "Zeiss Otus 28mm f/1.4 ZE" }, // 5
972965
{ 181, "Canon EF 100-400mm f/4.5-5.6L IS + 1.4x" }, // 0
973966
{ 181, "Sigma 150-600mm f/5-6.3 DG OS HSM | S + 1.4x" }, // 1
974967
{ 182, "Canon EF 100-400mm f/4.5-5.6L IS + 2x" }, // 0
@@ -978,7 +971,6 @@ namespace Exiv2 {
978971
{ 183, "Sigma 105mm f/2.8 EX DG OS HSM Macro" }, // 2
979972
{ 183, "Sigma 180mm f/2.8 EX DG OS HSM APO Macro" }, // 3
980973
{ 183, "Sigma 150-600mm f/5-6.3 DG OS HSM | C" }, // 4
981-
{ 183, "Sigma 150-600mm f/5-6.3 DG OS HSM | S" }, // 5
982974
{ 184, "Canon EF 400mm f/2.8L + 2x" },
983975
{ 185, "Canon EF 600mm f/4L IS" },
984976
{ 186, "Canon EF 70-200mm f/4L" },
@@ -1049,8 +1041,6 @@ namespace Exiv2 {
10491041
{ 253, "Canon EF 70-200mm f/2.8L IS II USM + 2x" },
10501042
{ 254, "Canon EF 100mm f/2.8L Macro IS USM" }, // 0
10511043
{ 254, "Tamron SP 90mm f/2.8 Di VC USD Macro 1:1" }, // 1
1052-
//{ 254, "Tamron SP 90mm f/2.8 Di VC USD Macro 1:1 F004" }, // 1 older model
1053-
//{ 254, "Tamron SP 90mm f/2.8 Di VC USD Macro 1:1 F017" }, // 2 model released in 2016
10541044
{ 255, "Sigma 24-105mm f/4 DG OS HSM | A" }, // 0
10551045
{ 255, "Sigma 180mm f/2.8 EX DG OS HSM APO Macro" }, // 1
10561046
{ 368, "Sigma 18-35mm f/1.8 DC HSM | A" },

0 commit comments

Comments
 (0)