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"
This commit is contained in:
Alexander Steffen
Christoph Hasse
parent
fa4ce38d77
commit
0d030eefdf
@ -1655,21 +1655,20 @@ namespace Exiv2 {
|
||||
{ 31, "Tamron SP AF 300mm f/2.8 LD IF" }, // 1
|
||||
{ 32, "Canon EF 24mm f/2.8" },
|
||||
{ 32, "Sigma 15mm f/2.8 EX Fisheye" }, // 1
|
||||
{ 33, "Voigtlander or Carl Zeiss Lens" },
|
||||
{ 33, "Voigtlander Ultron 40mm f/2 SLII Aspherical" }, // 1
|
||||
{ 33, "Voigtlander Color Skopar 20mm f/3.5 SLII Aspherical" }, // 2
|
||||
{ 33, "Voigtlander APO-Lanthar 90mm f/3.5 SLII Close Focus" }, // 3
|
||||
{ 33, "Carl Zeiss Distagon T* 15mm f/2.8 ZE" }, // 4
|
||||
{ 33, "Carl Zeiss Distagon T* 18mm f/3.5 ZE" }, // 5
|
||||
{ 33, "Carl Zeiss Distagon T* 21mm f/2.8 ZE" }, // 6
|
||||
{ 33, "Carl Zeiss Distagon T* 25mm f/2 ZE" }, // 7
|
||||
{ 33, "Carl Zeiss Distagon T* 28mm f/2 ZE" }, // 8
|
||||
{ 33, "Carl Zeiss Distagon T* 35mm f/2 ZE" }, // 9
|
||||
{ 33, "Carl Zeiss Distagon T* 35mm f/1.4 ZE" }, // 10
|
||||
{ 33, "Carl Zeiss Planar T* 50mm f/1.4 ZE" }, // 11
|
||||
{ 33, "Carl Zeiss Makro-Planar T* 50mm f/2 ZE" }, // 12
|
||||
{ 33, "Carl Zeiss Makro-Planar T* 100mm f/2 ZE" }, // 13
|
||||
{ 33, "Carl Zeiss Apo-Sonnar T* 135mm f/2 ZE" }, // 14
|
||||
{ 33, "Voigtlander Ultron 40mm f/2 SLII Aspherical" },
|
||||
{ 33, "Voigtlander Color Skopar 20mm f/3.5 SLII Aspherical" }, // 1
|
||||
{ 33, "Voigtlander APO-Lanthar 90mm f/3.5 SLII Close Focus" }, // 2
|
||||
{ 33, "Carl Zeiss Distagon T* 15mm f/2.8 ZE" }, // 3
|
||||
{ 33, "Carl Zeiss Distagon T* 18mm f/3.5 ZE" }, // 4
|
||||
{ 33, "Carl Zeiss Distagon T* 21mm f/2.8 ZE" }, // 5
|
||||
{ 33, "Carl Zeiss Distagon T* 25mm f/2 ZE" }, // 6
|
||||
{ 33, "Carl Zeiss Distagon T* 28mm f/2 ZE" }, // 7
|
||||
{ 33, "Carl Zeiss Distagon T* 35mm f/2 ZE" }, // 8
|
||||
{ 33, "Carl Zeiss Distagon T* 35mm f/1.4 ZE" }, // 9
|
||||
{ 33, "Carl Zeiss Planar T* 50mm f/1.4 ZE" }, // 10
|
||||
{ 33, "Carl Zeiss Makro-Planar T* 50mm f/2 ZE" }, // 11
|
||||
{ 33, "Carl Zeiss Makro-Planar T* 100mm f/2 ZE" }, // 12
|
||||
{ 33, "Carl Zeiss Apo-Sonnar T* 135mm f/2 ZE" }, // 13
|
||||
{ 35, "Canon EF 35-80mm f/4-5.6" },
|
||||
{ 36, "Canon EF 38-76mm f/4.5-5.6" },
|
||||
{ 37, "Canon EF 35-80mm f/4-5.6" },
|
||||
@ -1725,9 +1724,8 @@ namespace Exiv2 {
|
||||
{ 131, "Sigma 17-70mm f/2.8-4.5 DC Macro" }, // 3
|
||||
{ 131, "Sigma APO 50-150mm f/2.8 [II] EX DC HSM" }, // 4
|
||||
{ 131, "Sigma APO 120-300mm f/2.8 EX DG HSM" }, // 5
|
||||
{ 131, "Sigma 4.5mm f/2.8 EX DC HSM Circular Fisheye" }, // 6
|
||||
{ 131, "Sigma 70-200mm f/2.8 APO EX HSM" }, // 7
|
||||
{ 131, "Sigma 28-70mm f/2.8-4 DG" }, // 8
|
||||
{ 131, "Sigma 70-200mm f/2.8 APO EX HSM" }, // 6
|
||||
{ 131, "Sigma 28-70mm f/2.8-4 DG" }, // 7
|
||||
{ 132, "Canon EF 1200mm f/5.6L USM" },
|
||||
{ 134, "Canon EF 600mm f/4L IS USM" },
|
||||
{ 135, "Canon EF 200mm f/1.8L USM" },
|
||||
@ -1744,13 +1742,11 @@ namespace Exiv2 {
|
||||
{ 137, "Sigma 18-200mm f/3.5-6.3 DC OS HSM [II]" }, // 8
|
||||
{ 137, "Tamron AF 18-270mm f/3.5-6.3 Di II VC PZD" }, // 9
|
||||
{ 137, "Sigma 8-16mm f/4.5-5.6 DC HSM" }, // 10
|
||||
{ 137, "Tamron SP 17-50mm f/2.8 XR Di II VC" }, // 11
|
||||
{ 137, "Tamron SP 60mm f/2 Macro Di II" }, // 12
|
||||
{ 137, "Sigma 10-20mm f/3.5 EX DC HSM" }, // 13
|
||||
{ 137, "Tamron SP 24-70mm f/2.8 Di VC USD" }, // 14
|
||||
{ 137, "Sigma 18-35mm f/1.8 DC HSM | A" }, // 15
|
||||
{ 137, "Sigma 12-24mm f/4.5-5.6 DG HSM II" }, // 16
|
||||
{ 137, "Sigma 70-300mm f/4-5.6 DG OS" }, // 17
|
||||
{ 137, "Tamron SP 60mm f/2 Macro Di II" }, // 11
|
||||
{ 137, "Sigma 10-20mm f/3.5 EX DC HSM" }, // 12
|
||||
{ 137, "Sigma 18-35mm f/1.8 DC HSM | A" }, // 13
|
||||
{ 137, "Sigma 12-24mm f/4.5-5.6 DG HSM II" }, // 14
|
||||
{ 137, "Sigma 70-300mm f/4-5.6 DG OS" }, // 15
|
||||
{ 138, "Canon EF 28-80mm f/2.8-4L" },
|
||||
{ 139, "Canon EF 400mm f/2.8L USM" },
|
||||
{ 140, "Canon EF 500mm f/4.5L USM" },
|
||||
@ -1806,7 +1802,6 @@ namespace Exiv2 {
|
||||
{ 161, "Tamron 90mm f/2.8" }, // 5
|
||||
{ 161, "Tamron SP AF 17-35mm f/2.8-4 Di LD Aspherical IF" }, // 6
|
||||
{ 161, "Tamron SP AF 28-75mm f/2.8 XR Di LD Aspherical [IF] Macro" }, // 7
|
||||
{ 161, "Tokina AT-X 24-70mm f/2.8 PRO FX (IF)" }, // 8
|
||||
{ 162, "Canon EF 200mm f/2.8L USM" },
|
||||
{ 163, "Canon EF 300mm f/4L" },
|
||||
{ 164, "Canon EF 400mm f/5.6L" },
|
||||
@ -1833,12 +1828,11 @@ namespace Exiv2 {
|
||||
{ 172, "Sigma 150-600mm f/5-6.3 DG OS HSM | S" }, // 1
|
||||
{ 172, "Sigma 500mm f/4.5 APO EX DG HSM" }, // 2
|
||||
{ 173, "Canon EF 180mm Macro f/3.5L USM" },
|
||||
{ 173, "Sigma 180mm EX HSM Macro f/3.5" }, // 1
|
||||
{ 173, "Sigma APO Macro 150mm f/2.8 EX DG HSM" }, // 2
|
||||
{ 173, "Sigma 10mm f/2.8 EX DC Fisheye" }, // 3
|
||||
{ 173, "Sigma 15mm f/2.8 EX DG Diagonal Fisheye" }, // 4
|
||||
{ 173, "Venus Laowa 100mm F2.8 2X Ultra Macro APO" }, // 5
|
||||
{ 173, "Sigma 150-500mm f/5-6.3 APO DG OS HSM + 2x" }, // 6
|
||||
{ 173, "Sigma APO Macro 150mm f/2.8 EX DG HSM" }, // 1
|
||||
{ 173, "Sigma 10mm f/2.8 EX DC Fisheye" }, // 2
|
||||
{ 173, "Sigma 15mm f/2.8 EX DG Diagonal Fisheye" }, // 3
|
||||
{ 173, "Venus Laowa 100mm F2.8 2X Ultra Macro APO" }, // 4
|
||||
{ 173, "Sigma 150-500mm f/5-6.3 APO DG OS HSM + 2x" }, // 5
|
||||
{ 174, "Canon EF 135mm f/2L USM" },
|
||||
{ 174, "Sigma 70-200mm f/2.8 EX DG APO OS HSM" }, // 1
|
||||
{ 174, "Sigma 50-500mm f/4.5-6.3 APO DG OS HSM" }, // 2
|
||||
@ -1857,14 +1851,12 @@ namespace Exiv2 {
|
||||
{ 180, "Canon EF 35mm f/1.4L USM" },
|
||||
{ 180, "Sigma 50mm f/1.4 DG HSM | A" }, // 1
|
||||
{ 180, "Sigma 24mm f/1.4 DG HSM | A" }, // 2
|
||||
{ 180, "Zeiss Milvus 50mm f/1.4" }, // 3
|
||||
{ 180, "Zeiss Milvus 85mm f/1.4" }, // 4
|
||||
{ 180, "Zeiss Otus 28mm f/1.4 ZE" }, // 5
|
||||
{ 180, "Sigma 24mm f/1.5 FF High-Speed Prime | 017" }, // 6
|
||||
{ 180, "Sigma 50mm f/1.5 FF High-Speed Prime | 017" }, // 7
|
||||
{ 180, "Sigma 85mm f/1.5 FF High-Speed Prime | 017" }, // 8
|
||||
{ 180, "Tokina Opera 50mm f/1.4 FF" }, // 9
|
||||
{ 180, "Sigma 20mm f/1.4 DG HSM | A" }, // 10
|
||||
{ 180, "Zeiss Milvus 85mm f/1.4" }, // 3
|
||||
{ 180, "Zeiss Otus 28mm f/1.4 ZE" }, // 4
|
||||
{ 180, "Sigma 24mm f/1.5 FF High-Speed Prime | 017" }, // 5
|
||||
{ 180, "Sigma 50mm f/1.5 FF High-Speed Prime | 017" }, // 6
|
||||
{ 180, "Sigma 85mm f/1.5 FF High-Speed Prime | 017" }, // 7
|
||||
{ 180, "Sigma 20mm f/1.4 DG HSM | A" }, // 8
|
||||
{ 181, "Canon EF 100-400mm f/4.5-5.6L IS USM + 1.4x" },
|
||||
{ 181, "Sigma 150-600mm f/5-6.3 DG OS HSM | S + 1.4x" }, // 1
|
||||
{ 182, "Canon EF 100-400mm f/4.5-5.6L IS USM + 2x" },
|
||||
@ -1874,7 +1866,6 @@ namespace Exiv2 {
|
||||
{ 183, "Sigma 105mm f/2.8 EX DG OS HSM Macro" }, // 2
|
||||
{ 183, "Sigma 180mm f/2.8 EX DG OS HSM APO Macro" }, // 3
|
||||
{ 183, "Sigma 150-600mm f/5-6.3 DG OS HSM | C" }, // 4
|
||||
{ 183, "Sigma 150-600mm f/5-6.3 DG OS HSM | S" }, // 5
|
||||
{ 183, "Sigma 100-400mm f/5-6.3 DG OS HSM" }, // 6
|
||||
{ 183, "Sigma 180mm f/3.5 APO Macro EX DG IF HSM" }, // 7
|
||||
{ 184, "Canon EF 400mm f/2.8L USM + 2x" },
|
||||
|
||||
Loading…
Reference in New Issue
Block a user