File 90_changeset_r3004.diff of Package exiv2.30965
Index: trunk/src/canonmn.cpp
===================================================================
--- trunk/src/canonmn.cpp (revision 3003)
+++ trunk/src/canonmn.cpp (revision 3004)
@@ -438,12 +438,12 @@
{ 6, "Tokina AF193-2 19-35mm f/3.5-4.5" }, // 3
{ 6, "Sigma 28-80mm f/3.5-5.6 II Macro" }, // 4
{ 7, "Canon EF 100-300mm f/5.6L" },
- { 8, "Canon EF 100-300mm f/5.6" }, // 0
- { 8, "Sigma 70-300mm f/4-5.6 DG Macro" }, // 1
- { 8, "Tokina AT-X242AF 24-200mm f/3.5-5.6" }, // 2
- { 9, "Canon EF 70-210mm f/4" }, // 0
+ { 8, "Canon EF 100-300mm f/5.6 or Sigma or Tokina Lens" }, // 0
+ { 8, "Sigma 70-300mm f/4-5.6 [APO] DG Macro" }, // 1
+ { 8, "Tokina AT-X 242 AF 24-200mm f/3.5-5.6" }, // 2
+ { 9, "Canon EF 70-210mm f/4 or Sigma Lens" }, // 0
{ 9, "Sigma 55-200mm f/4-5.6 DC" }, // 1
- { 10, "Canon EF 50mm f/2.5 Macro" }, // 0
+ { 10, "Canon EF 50mm f/2.5 Macro or Sigma Lens" }, // 0
{ 10, "Sigma 50mm f/2.8 EX" }, // 1
{ 10, "Sigma 28mm f/1.8" }, // 2
{ 10, "Sigma 105mm f/2.8 Macro EX" }, // 3
@@ -457,38 +457,38 @@
{ 18, "Canon EF 28-70mm f/3.5-4.5" },
{ 20, "Canon EF 100-200mm f/4.5A" },
{ 21, "Canon EF 80-200mm f/2.8L" },
- { 22, "Canon EF 20-35mm f/2.8L" }, // 0
- { 22, "Tokina AT-X280AF PRO 28-80mm f/2.8 Aspherical" }, // 1
+ { 22, "Canon EF 20-35mm f/2.8L or Tokina Lens" }, // 0
+ { 22, "Tokina AT-X 280 AF PRO 28-80mm f/2.8 Aspherical" }, // 1
{ 23, "Canon EF 35-105mm f/3.5-4.5" },
{ 24, "Canon EF 35-80mm f/4-5.6 Power Zoom" },
{ 25, "Canon EF 35-80mm f/4-5.6 Power Zoom" },
- { 26, "Canon EF 100mm f/2.8 Macro or Cosina or Tamron Lens" }, // 0
+ { 26, "Canon EF 100mm f/2.8 Macro or Cosina or Tamron or Carl Zeiss Lens" }, // 0
{ 26, "Cosina 100mm f/3.5 Macro AF" }, // 1
{ 26, "Tamron SP AF 90mm f/2.8 Di Macro" }, // 2
{ 26, "Tamron SP AF 180mm f/3.5 Di Macro" }, // 3
{ 26, "Carl Zeiss Planar T* 50mm f/1.4" }, // 4
{ 27, "Canon EF 35-80mm f/4-5.6" },
- { 28, "Canon EF 80-200mm f/4.5-5.6" }, // 0
+ { 28, "Canon EF 80-200mm f/4.5-5.6 or Tamron Lens" }, // 0
{ 28, "Tamron SP AF 28-105mm f/2.8 LD Aspherical IF" }, // 1
{ 28, "Tamron SP AF 28-75mm f/2.8 XR Di LD Aspherical [IF] Macro" }, // 2
{ 28, "Tamron AF 70-300mm f/4.5-5.6 Di LD 1:2 Macro Zoom" }, // 3
{ 28, "Tamron AF Aspherical 28-200mm f/3.8-5.6" }, // 4
{ 29, "Canon EF 50mm f/1.8 MkII" },
{ 30, "Canon EF 35-105mm f/4.5-5.6" },
- { 31, "Canon EF 75-300mm f/4-5.6" }, // 0
+ { 31, "Canon EF 75-300mm f/4-5.6 or Tamron Lens" }, // 0
{ 31, "Tamron SP AF 300mm f/2.8 LD IF" }, // 1
- { 32, "Canon EF 24mm f/2.8" }, // 0
+ { 32, "Canon EF 24mm f/2.8 or Sigma Lens" }, // 0
{ 32, "Sigma 15mm f/2.8 EX Fisheye" }, // 1
- { 33, "Voigtlander or Zeiss Lens" }, // 0
+ { 33, "Voigtlander or Carl Zeiss Lens" }, // 0
{ 33, "Voigtlander Ultron 40mm f/2 SLII Aspherical" }, // 1
- { 33, "Zeiss Distagon 15mm T* f/2.8 ZE" }, // 2
- { 33, "Zeiss Distagon 18mm T* f/3.5 ZE" }, // 3
- { 33, "Zeiss Distagon 21mm T* f/2.8 ZE" }, // 4
- { 33, "Zeiss Distagon 28mm T* f/2 ZE" }, // 5
- { 33, "Zeiss Distagon 35mm T* f/2 ZE" }, // 6
+ { 33, "Carl Zeiss Distagon 15mm T* f/2.8 ZE" }, // 2
+ { 33, "Carl Zeiss Distagon 18mm T* f/3.5 ZE" }, // 3
+ { 33, "Carl Zeiss Distagon 21mm T* f/2.8 ZE" }, // 4
+ { 33, "Carl Zeiss Distagon 28mm T* f/2 ZE" }, // 5
+ { 33, "Carl Zeiss Distagon 35mm T* f/2 ZE" }, // 6
{ 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" }, // 0
+ { 37, "Canon EF 35-80mm f/4-5.6 or Tamron Lens" }, // 0
{ 37, "Tamron 70-200mm f/2.8 Di LD IF Macro" }, // 1
{ 37, "Tamron AF 28-300mm f/3.5-6.3 XR Di VC LD Aspherical [IF] Macro Model A20" }, // 2
{ 37, "Tamron SP AF 17-50mm f/2.8 XR Di II VC LD Aspherical [IF] " }, // 3
@@ -497,7 +497,7 @@
{ 39, "Canon EF 75-300mm f/4-5.6" },
{ 40, "Canon EF 28-80mm f/3.5-5.6" },
{ 41, "Canon EF 28-90mm f/4-5.6" },
- { 42, "Canon EF 28-200mm f/3.5-5.6" }, // 0
+ { 42, "Canon EF 28-200mm f/3.5-5.6 or Tamron Lens" }, // 0
{ 42, "Tamron AF 28-300mm f/3.5-6.3 XR Di VC LD Aspherical [IF] Macro Model A20" }, // 1
{ 43, "Canon EF 28-105mm f/4-5.6" },
{ 44, "Canon EF 90-300mm f/4.5-5.6" },
@@ -517,7 +517,7 @@
{ 127, "Canon TS-E 90mm f/2.8" },
{ 129, "Canon EF 300mm f/2.8L" },
{ 130, "Canon EF 50mm f/1.0L" },
- { 131, "Canon EF 28-80mm f/2.8-4L" }, // 0
+ { 131, "Canon EF 28-80mm f/2.8-4L or Sigma Lens" }, // 0
{ 131, "Sigma 8mm f/3.5 EX DG Circular Fisheye" }, // 1
{ 131, "Sigma 17-35mm f/2.8-4 EX DG Aspherical HSM" }, // 2
{ 131, "Sigma 17-70mm f/2.8-4.5 DC Macro" }, // 3
@@ -529,7 +529,7 @@
{ 134, "Canon EF 600mm f/4L IS" },
{ 135, "Canon EF 200mm f/1.8L" },
{ 136, "Canon EF 300mm f/2.8L" },
- { 137, "Canon EF 85mm f/1.2L" }, // 0
+ { 137, "Canon EF 85mm f/1.2L or Sigma or Tamron Lens" }, // 0
{ 137, "Sigma 18-50mm f/2.8-4.5 DC OS HSM" }, // 1
{ 137, "Sigma 50-200mm f/4-5.6 DC OS HSM" }, // 2
{ 137, "Sigma 18-250mm f/3.5-6.3 DC OS HSM" }, // 3
@@ -539,11 +539,12 @@
{ 137, "Sigma 17-50mm f/2.8 OS HSM" }, // 7
{ 137, "Sigma 18-200mm f/3.5-6.3 II DC OS HSM" }, // 8
{ 137, "Tamron AF 18-270mm f/3.5-6.3 Di II VC PZD" }, // 9
- { 137, "Sigma 12-24mm f/4.5-5.6 DG HSM II" }, // 10
+ { 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 12-24mm f/4.5-5.6 DG HSM II" }, // 15
{ 138, "Canon EF 28-80mm f/2.8-4L" },
{ 139, "Canon EF 400mm f/2.8L" },
{ 140, "Canon EF 500mm f/4.5L" },
@@ -556,31 +557,31 @@
{ 147, "Canon EF 35-135mm f/4-5.6 USM" },
{ 148, "Canon EF 28-80mm f/3.5-5.6 USM" },
{ 149, "Canon EF 100mm f/2 USM" },
- { 150, "Canon EF 14mm f/2.8L" }, // 0
+ { 150, "Canon EF 14mm f/2.8L or Sigma Lens" }, // 0
{ 150, "Sigma 20mm EX f/1.8" }, // 1
{ 150, "Sigma 30mm f/1.4 DC HSM" }, // 2
{ 150, "Sigma 24mm f/1.8 DG Macro EX" }, // 3
{ 151, "Canon EF 200mm f/2.8L" },
- { 152, "Canon EF 300mm f/4L IS" }, // 0
+ { 152, "Canon EF 300mm f/4L IS or Sigma Lens" }, // 0
{ 152, "Sigma 12-24mm f/4.5-5.6 EX DG ASPHERICAL HSM" }, // 1
{ 152, "Sigma 14mm f/2.8 EX Aspherical HSM" }, // 2
{ 152, "Sigma 10-20mm f/4-5.6" }, // 3
{ 152, "Sigma 100-300mm f/4" }, // 4
- { 153, "Canon EF 35-350mm f/3.5-5.6L" }, // 0
+ { 153, "Canon EF 35-350mm f/3.5-5.6L or Sigma og Tamron Lens" }, // 0
{ 153, "Sigma 50-500mm f/4-6.3 APO HSM EX" }, // 1
{ 153, "Tamron AF 28-300mm f/3.5-6.3 XR LD Aspherical [IF] Macro" }, // 2
{ 153, "Tamron AF 18-200mm f/3.5-6.3 XR Di II LD Aspherical [IF] Macro Model A14" }, // 3
{ 153, "Tamron 18-250mm f/3.5-6.3 Di II LD Aspherical [IF] Macro" }, // 4
{ 154, "Canon EF 20mm f/2.8 USM" },
{ 155, "Canon EF 85mm f/1.8 USM" },
- { 156, "Canon EF 28-105mm f/3.5-4.5 USM" }, // 0
+ { 156, "Canon EF 28-105mm f/3.5-4.5 USM or Tamron Lens" }, // 0
{ 156, "Tamron SP AF 70-300mm F4-5.6 Di VC USD" }, // 1
- { 160, "Canon EF 20-35mm f/3.5-4.5 USM" }, // 0
+ { 160, "Canon EF 20-35mm f/3.5-4.5 USM or Tamron or Tokina Lens" }, // 0
{ 160, "Tamron AF 19-35mm f/3.5-4.5" }, // 1
{ 160, "Tokina AT-X 124 AF 12-24mm f/4 DX" }, // 2
{ 160, "Tokina AT-X 107 AF DX Fish-eye 10-17mm f/3.5-4.5" }, // 3
{ 160, "Tokina AT-X 116 PRO DX AF 11-16mm f/2.8" }, // 4
- { 161, "Canon EF 28-70mm f/2.8L" }, // 0
+ { 161, "Canon EF 28-70mm f/2.8L or Sigma or Tamron Lens" }, // 0
{ 161, "Sigma 24-70mm EX f/2.8" }, // 1
{ 161, "Sigma 28-70mm f/2.8 EX" }, // 2
{ 161, "Tamron AF 17-50mm f/2.8 Di-II LD Aspherical" }, // 3
@@ -593,7 +594,7 @@
{ 166, "Canon EF 70-200mm f/2.8 L + 1.4x" },
{ 167, "Canon EF 70-200mm f/2.8 L + 2x" },
{ 168, "Canon EF 28mm f/1.8 USM" },
- { 169, "Canon EF 17-35mm f/2.8L" }, // 0
+ { 169, "Canon EF 17-35mm f/2.8L or Sigma Lens" }, // 0
{ 169, "Sigma 18-200mm f/3.5-6.3 DC OS" }, // 1
{ 169, "Sigma 15-30mm f/3.5-4.5 EX DG Aspherical" }, // 2
{ 169, "Sigma 18-50mm f/2.8 Macro" }, // 3
@@ -607,7 +608,7 @@
{ 173, "Canon EF 180mm Macro f/3.5L or Sigma Lens" }, // 0
{ 173, "Sigma 180mm EX HSM Macro f/3.5" }, // 1
{ 173, "Sigma APO Macro 150mm f/3.5 EX DG IF HSM" }, // 2
- { 174, "Canon EF 135mm f/2L" }, // 0
+ { 174, "Canon EF 135mm f/2L or Sigma Lens" }, // 0
{ 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
{ 175, "Canon EF 400mm f/2.8L" },
@@ -618,7 +619,7 @@
{ 180, "Canon EF 35mm f/1.4L" },
{ 181, "Canon EF 100-400mm f/4.5-5.6L IS + 1.4x" },
{ 182, "Canon EF 100-400mm f/4.5-5.6L IS + 2x" },
- { 183, "Canon EF 100-400mm f/4.5-5.6L IS" }, // 0
+ { 183, "Canon EF 100-400mm f/4.5-5.6L IS or Sigma Lens" }, // 0
{ 183, "Sigma 150mm f/2.8 EX DG OS HSM APO Macro" }, // 1
{ 184, "Canon EF 400mm f/2.8L + 2x" },
{ 185, "Canon EF 600mm f/4L IS" },
