Skip to content

Commit 6a49e47

Browse files
webmeisterwebmeister
committed
Clean up Canon lens list
Fixes some small inconsistencies, so that all lenses use the same format, that is also shared with other lens databases such as lensfun: * Always prefix aperture with f/ * Never add .0 to aperture * Always add mm to focal length * Always use | A for Sigma Art lenses
1 parent f5e3712 commit 6a49e47

File tree

2 files changed

+15
-16
lines changed

2 files changed

+15
-16
lines changed

‎src/canonmn_int.cpp‎

Lines changed: 14 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -813,7 +813,7 @@ namespace Exiv2 {
813813
{ 37, "Canon EF 35-80mm f/4-5.6" }, // 0
814814
{ 37, "Tamron 70-200mm f/2.8 Di LD IF Macro" }, // 1
815815
{ 37, "Tamron AF 28-300mm f/3.5-6.3 XR Di VC LD Aspherical [IF] Macro Model A20" }, // 2
816-
{ 37, "Tamron SP AF 17-50mm f/2.8 XR Di II VC LD Aspherical [IF] " }, // 3
816+
{ 37, "Tamron SP AF 17-50mm f/2.8 XR Di II VC LD Aspherical [IF]" }, // 3
817817
{ 37, "Tamron AF 18-270mm f/3.5-6.3 Di II VC LD Aspherical [IF] Macro" }, // 4
818818
{ 38, "Canon EF 80-200mm f/4.5-5.6" },
819819
{ 39, "Canon EF 75-300mm f/4-5.6" },
@@ -837,7 +837,7 @@ namespace Exiv2 {
837837
{ 60, "Irix 11mm f/4" },
838838
{ 82, "Canon TS-E 135mm f/4L Macro" },
839839
{ 94, "Canon TS-E 17mm f/4L" },
840-
{ 95, "Canon TS-E 24.0mm f/3.5 L II" },
840+
{ 95, "Canon TS-E 24mm f/3.5L II" },
841841
{ 124, "Canon MP-E 65mm f/2.8 1-5x Macro Photo" },
842842
{ 125, "Canon TS-E 24mm f/3.5L" },
843843
{ 126, "Canon TS-E 45mm f/2.8" },
@@ -850,7 +850,7 @@ namespace Exiv2 {
850850
{ 131, "Sigma 17-70mm f/2.8-4.5 DC Macro" }, // 3
851851
{ 131, "Sigma APO 50-150mm f/2.8 EX DC HSM" }, // 4
852852
{ 131, "Sigma APO 120-300mm f/2.8 EX DG HSM" }, // 5
853-
{ 131, "Sigma 4.5mm F2.8 EX DC HSM Circular Fisheye" }, // 6
853+
{ 131, "Sigma 4.5mm f/2.8 EX DC HSM Circular Fisheye" }, // 6
854854
{ 131, "Sigma 70-200mm f/2.8 APO EX HSM" }, // 7
855855
{ 132, "Canon EF 1200mm f/5.6L" },
856856
{ 134, "Canon EF 600mm f/4L IS" },
@@ -881,11 +881,10 @@ namespace Exiv2 {
881881
{ 142, "Canon EF 300mm f/2.8L IS" },
882882
{ 143, "Canon EF 500mm f/4L IS" }, // 0
883883
{ 143, "Sigma 17-70mm f/2.8-4 DC Macro OS HSM" }, // 1
884-
{ 143, "Sigma 24-105mm F4 DG OS HSM [Art 013]" }, // 2
884+
{ 143, "Sigma 24-105mm f/4 DG OS HSM | A" }, // 2
885885
{ 144, "Canon EF 35-135mm f/4-5.6 USM" },
886886
{ 145, "Canon EF 100-300mm f/4.5-5.6 USM" },
887887
{ 146, "Canon EF 70-210mm f/3.5-4.5 USM" },
888-
889888
{ 147, "Canon EF 35-135mm f/4-5.6 USM" },
890889
{ 148, "Canon EF 28-80mm f/3.5-5.6 USM" },
891890
{ 149, "Canon EF 100mm f/2 USM" },
@@ -930,9 +929,9 @@ namespace Exiv2 {
930929
{ 162, "Canon EF 200mm f/2.8L" },
931930
{ 163, "Canon EF 300mm f/4L" },
932931
{ 164, "Canon EF 400mm f/5.6L" },
933-
{ 165, "Canon EF 70-200mm f/2.8 L" },
934-
{ 166, "Canon EF 70-200mm f/2.8 L + 1.4x" },
935-
{ 167, "Canon EF 70-200mm f/2.8 L + 2x" },
932+
{ 165, "Canon EF 70-200mm f/2.8L" },
933+
{ 166, "Canon EF 70-200mm f/2.8L + 1.4x" },
934+
{ 167, "Canon EF 70-200mm f/2.8L + 2x" },
936935
{ 168, "Canon EF 28mm f/1.8 USM" }, // 0
937936
{ 168, "Sigma 50-100mm f/1.8 DC HSM | A" }, // 1
938937
{ 169, "Canon EF 17-35mm f/2.8L" }, // 0
@@ -1007,7 +1006,7 @@ namespace Exiv2 {
10071006
{ 211, "Canon EF 28-200mm f/3.5-5.6 USM" },
10081007
{ 212, "Canon EF 28-105mm f/4-5.6 USM" },
10091008
{ 213, "Canon EF 90-300mm f/4.5-5.6 USM" }, // 0
1010-
{ 213, "Tamron SP 150-600mm F/5-6.3 Di VC USD" }, // 1
1009+
{ 213, "Tamron SP 150-600mm f/5-6.3 Di VC USD" }, // 1
10111010
{ 213, "Tamron 16-300mm f/3.5-6.3 Di II VC PZD Macro" }, // 2
10121011
{ 213, "Tamron SP 35mm f/1.8 Di VC USD" }, // 3
10131012
{ 213, "Tamron SP 45mm f/1.8 Di VC USD" }, // 4
@@ -1025,7 +1024,7 @@ namespace Exiv2 {
10251024
{ 231, "Canon EF 17-40mm f/4L" },
10261025
{ 232, "Canon EF 70-300mm f/4.5-5.6 DO IS USM" },
10271026
{ 233, "Canon EF 28-300mm f/3.5-5.6L IS" },
1028-
{ 234, "Canon EF-S 17-85mm f4-5.6 IS USM" }, // 0
1027+
{ 234, "Canon EF-S 17-85mm f/4-5.6 IS USM" }, // 0
10291028
{ 234, "Tokina AT-X 12-28 PRO DX 12-28mm f/4" }, // 1
10301029
{ 235, "Canon EF-S 10-22mm f/3.5-4.5 USM" },
10311030
{ 236, "Canon EF-S 60mm f/2.8 Macro USM" },
@@ -1043,7 +1042,7 @@ namespace Exiv2 {
10431042
{ 248, "Canon EF 200mm f/2L IS" }, // 0
10441043
{ 248, "Sigma 24-35mm f/2 DG HSM | A" }, // 1
10451044
{ 249, "Canon EF 800mm f/5.6L IS" },
1046-
{ 250, "Canon EF 24 f/1.4L II" }, // 0
1045+
{ 250, "Canon EF 24mm f/1.4L II" }, // 0
10471046
{ 250, "Sigma 20mm f/1.4 DG HSM | A" }, // 1
10481047
{ 251, "Canon EF 70-200mm f/2.8L IS II USM" },
10491048
{ 252, "Canon EF 70-200mm f/2.8L IS II USM + 1.4x" },
@@ -1063,7 +1062,7 @@ namespace Exiv2 {
10631062
{ 492, "Canon EF 400mm f/2.8L IS II USM" },
10641063
{ 493, "Canon EF 500mm f/4L IS II USM" }, // 0
10651064
{ 493, "Canon EF 24-105mm f/4L IS USM" }, // 1
1066-
{ 494, "Canon EF 600mm f/4.0L IS II USM" },
1065+
{ 494, "Canon EF 600mm f/4L IS II USM" },
10671066
{ 495, "Canon EF 24-70mm f/2.8L II USM" },
10681067
{ 496, "Canon EF 200-400mm f/4L IS USM" },
10691068
{ 499, "Canon EF 200-400mm f/4L IS USM + 1.4x" },
@@ -1078,14 +1077,14 @@ namespace Exiv2 {
10781077
{ 624, "Sigma 150-600mm f/5-6.3 DG OS HSM | C" }, // 1
10791078
{ 624, "Sigma 150-600mm f/5-6.3 DG OS HSM | C + 1.4x" }, // 2
10801079
{ 747, "Canon EF 100-400mm f/4.5-5.6L IS II USM" }, // 0
1081-
{ 747, "Tamron SP 150-600mm F5-6.3 Di VC USD G2" }, // 1
1080+
{ 747, "Tamron SP 150-600mm f/5-6.3 Di VC USD G2" }, // 1
10821081
{ 748, "Canon EF 100-400mm f/4.5-5.6L IS II USM + 1.4x" },
10831082
{ 750, "Canon EF 35mm f/1.4L II USM" },
10841083
{ 751, "Canon EF 16-35mm f/2.8L III USM" },
10851084
{ 752, "Canon EF 24-105mm f/4L IS II USM" },
10861085
{ 4142,"Canon EF-S 18-135mm f/3.5-5.6 IS STM" },
10871086
{ 4143,"Canon EF-M 18-55mm f/3.5-5.6 IS STM" }, // 0
1088-
{ 4143,"Tamron 18-200mm F/3.5-6.3 Di III VC" }, // 1
1087+
{ 4143,"Tamron 18-200mm f/3.5-6.3 Di III VC" }, // 1
10891088
{ 4144,"Canon EF 40mm f/2.8 STM" },
10901089
{ 4145,"Canon EF-M 22mm f/2 STM" },
10911090
{ 4146,"Canon EF-S 18-55mm f/3.5-5.6 IS STM" },
@@ -1098,7 +1097,7 @@ namespace Exiv2 {
10981097
{ 4154,"Canon EF-S 24mm f/2.8 STM" },
10991098
{ 4155,"Canon EF-M 28mm f/3.5 Macro IS STM" },
11001099
{ 4156,"Canon EF 50mm f/1.8 STM" },
1101-
{ 4157,"Canon EF-M 18-150mm 1:3.5-6.3 IS STM" },
1100+
{ 4157,"Canon EF-M 18-150mm f/3.5-6.3 IS STM" },
11021101
{ 4158,"Canon EF-S 18-55mm f/4-5.6 IS STM" },
11031102
{ 4160,"Canon EF-S 35mm f/2.8 Macro IS STM" },
11041103
{36910,"Canon EF 70-300mm f/4-5.6 IS II USM" },

‎tests/bugfixes/github/test_issue_45.py‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ class Sigma24_105mmRecognization(metaclass=system_tests.CaseMeta):
99

1010
filename = "$data_path/exiv2-g45.exv"
1111
commands = ["$exiv2 -pa --grep lens/i " + filename]
12-
stdout = ["""Exif.CanonCs.LensType Short 1 Sigma 24-105mm F4 DG OS HSM [Art 013]
12+
stdout = ["""Exif.CanonCs.LensType Short 1 Sigma 24-105mm f/4 DG OS HSM | A
1313
Exif.CanonCs.Lens Short 3 24.0 - 105.0 mm
1414
Exif.CanonCf.LensAFStopButton Short 1 0
1515
Exif.Canon.LensModel Ascii 74 24-105mm F4 DG OS HSM | Art 013

0 commit comments

Comments
 (0)