liz/rawTherapee
liz/rawTherapee
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update rtexif using ExifTool 11.84, closes #5618

Browse Source
This commit is contained in:
Morgan Hardwood 2020-01-26 11:24:18 +01:00
parent 227c2fbba7
commit 24684e5cb3
5 changed files with 186 additions and 233 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

120
rtexif/canonattribs.cc
View File

@ -557,7 +557,8 @@ public:
{
choices = {
{1, "Canon EF 50mm f/1.8"},
{2, "Canon EF 28mm f/2.8"},
{2, "Canon EF 28mm f/2.8 or Sigma Lens"},
{2, "Sigma 24mm f/2.8 Super Wide II"},
{3, "Canon EF 135mm f/2.8 Soft"},
{4, "Canon EF 35-105mm f/3.5-4.5 or Sigma Lens"},
{4, "Sigma UC Zoom 35-135mm f/4-5.6"},
@ -598,6 +599,8 @@ public:
{26, "Tamron SP AF 90mm f/2.8 Di Macro"},
{26, "Tamron SP AF 180mm f/3.5 Di Macro"},
{26, "Carl Zeiss Planar T* 50mm f/1.4"},
{26, "Voigtlander APO Lanthar 125mm F2.5 SL Macro"},
{26, "Carl Zeiss Planar T 85mm f/1.4 ZE"},
{27, "Canon EF 35-80mm f/4-5.6"},
{28, "Canon EF 80-200mm f/4.5-5.6 or Tamron Lens"},
{28, "Tamron SP AF 28-105mm f/2.8 LD Aspherical IF"},
@ -629,7 +632,7 @@ public:
{36, "Canon EF 38-76mm f/4.5-5.6"},
{37, "Canon EF 35-80mm f/4-5.6 or Tamron Lens"},
{37, "Tamron 70-200mm f/2.8 Di LD IF Macro"},
{37, "Tamron AF 28-300mm f/3.5-6.3 XR Di VC LD Aspherical [IF] Macro Model A20"},
{37, "Tamron AF 28-300mm f/3.5-6.3 XR Di VC LD Aspherical [IF] Macro (A20)"},
{37, "Tamron SP AF 17-50mm f/2.8 XR Di II VC LD Aspherical [IF]"},
{37, "Tamron AF 18-270mm f/3.5-6.3 Di II VC LD Aspherical [IF] Macro"},
{38, "Canon EF 80-200mm f/4.5-5.6"},
@ -637,13 +640,14 @@ public:
{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 or Tamron Lens"},
{42, "Tamron AF 28-300mm f/3.5-6.3 XR Di VC LD Aspherical [IF] Macro Model A20"},
{42, "Tamron AF 28-300mm f/3.5-6.3 XR Di VC LD Aspherical [IF] Macro (A20)"},
{43, "Canon EF 28-105mm f/4-5.6"},
{44, "Canon EF 90-300mm f/4.5-5.6"},
{45, "Canon EF-S 18-55mm f/3.5-5.6 [II]"},
{46, "Canon EF 28-90mm f/4-5.6"},
{47, "Zeiss Milvus 35mm f/2 or 50mm f/2"},
{47, "Zeiss Milvus 50mm f/2 Makro"},
{47, "Zeiss Milvus 135mm f/2 ZE"},
{48, "Canon EF-S 18-55mm f/3.5-5.6 IS"},
{49, "Canon EF-S 55-250mm f/4-5.6 IS"},
{50, "Canon EF-S 18-200mm f/3.5-5.6 IS"},
@ -660,10 +664,17 @@ public:
{103, "Samyang AF 14mm f/2.8 EF or Rokinon Lens"},
{103, "Rokinon SP 14mm f/2.4"},
{103, "Rokinon AF 14mm f/2.8 EF"},
{106, "Rokinon SP / Samyang XP 35mm f/1.2"},
{112, "Sigma 28mm f/1.5 FF High-speed Prime or other Sigma Lens"},
{112, "Sigma 40mm f/1.5 FF High-speed Prime"},
{112, "Sigma 105mm f/1.5 FF High-speed Prime"},
{117, "Tamron 35-150mm f/2.8-4.0 Di VC OSD (A043) or other Tamron Lens"},
{117, "Tamron SP 35mm f/1.4 Di USD (F045)"},
{124, "Canon MP-E 65mm f/2.8 1-5x Macro Photo"},
{125, "Canon TS-E 24mm f/3.5L"},
{126, "Canon TS-E 45mm f/2.8"},
{127, "Canon TS-E 90mm f/2.8"},
{127, "Canon TS-E 90mm f/2.8 or Tamron Lens"},
{127, "Tamron 18-200mm f/3.5-6.3 Di II VC (B018)"},
{129, "Canon EF 300mm f/2.8L USM"},
{130, "Canon EF 50mm f/1.0L USM"},
{131, "Canon EF 28-80mm f/2.8-4L USM or Sigma Lens"},
@ -674,10 +685,12 @@ public:
{131, "Sigma APO 120-300mm f/2.8 EX DG HSM"},
{131, "Sigma 4.5mm f/2.8 EX DC HSM Circular Fisheye"},
{131, "Sigma 70-200mm f/2.8 APO EX HSM"},
{131, "Sigma 28-70mm f/2.8-4 DG"},
{132, "Canon EF 1200mm f/5.6L USM"},
{134, "Canon EF 600mm f/4L IS USM"},
{135, "Canon EF 200mm f/1.8L USM"},
{136, "Canon EF 300mm f/2.8L USM"},
{136, "Tamron SP 15-30mm f/2.8 Di VC USD (A012)"},
{137, "Canon EF 85mm f/1.2L USM or Sigma or Tamron Lens"},
{137, "Sigma 18-50mm f/2.8-4.5 DC OS HSM"},
{137, "Sigma 50-200mm f/4-5.6 DC OS HSM"},
@ -687,14 +700,15 @@ public:
{137, "Sigma 17-70mm f/2.8-4 DC Macro OS HSM | C"},
{137, "Sigma 17-50mm f/2.8 OS HSM"},
{137, "Sigma 18-200mm f/3.5-6.3 DC OS HSM [II]"},
{137, "Tamron AF 18-270mm f/3.5-6.3 Di II VC PZD"},
{137, "Tamron AF 18-270mm f/3.5-6.3 Di II VC PZD (B008)"},
{137, "Sigma 8-16mm f/4.5-5.6 DC HSM"},
{137, "Tamron SP 17-50mm f/2.8 XR Di II VC"},
{137, "Tamron SP 60mm f/2 Macro Di II"},
{137, "Tamron SP 17-50mm f/2.8 XR Di II VC (B005)"},
{137, "Tamron SP 60mm f/2 Macro Di II (G005)"},
{137, "Sigma 10-20mm f/3.5 EX DC HSM"},
{137, "Tamron SP 24-70mm f/2.8 Di VC USD"},
{137, "Sigma 18-35mm f/1.8 DC HSM"},
{137, "Sigma 12-24mm f/4.5-5.6 DG HSM II"},
{137, "Sigma 70-300mm f/4-5.6 DG OS"},
{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"},
@ -713,23 +727,28 @@ public:
{150, "Sigma 30mm f/1.4 DC HSM"},
{150, "Sigma 24mm f/1.8 DG Macro EX"},
{150, "Sigma 28mm f/1.8 DG Macro EX"},
{150, "Sigma 18-35mm f/1.8 DC HSM | A"},
{151, "Canon EF 200mm f/2.8L USM"},
{152, "Canon EF 300mm f/4L IS USM or Sigma Lens"},
{152, "Sigma 12-24mm f/4.5-5.6 EX DG ASPHERICAL HSM"},
{152, "Sigma 14mm f/2.8 EX Aspherical HSM"},
{152, "Sigma 10-20mm f/4-5.6"},
{152, "Sigma 100-300mm f/4"},
{152, "Sigma 300-800mm f/5.6 APO EX DG HSM"},
{153, "Canon EF 35-350mm f/3.5-5.6L USM or Sigma or Tamron Lens"},
{153, "Sigma 50-500mm f/4-6.3 APO HSM EX"},
{153, "Tamron AF 28-300mm f/3.5-6.3 XR LD Aspherical [IF] Macro"},
{153, "Tamron AF 18-200mm f/3.5-6.3 XR Di II LD Aspherical [IF] Macro Model A14"},
{153, "Tamron AF 18-200mm f/3.5-6.3 XR Di II LD Aspherical [IF] Macro (A14)"},
{153, "Tamron 18-250mm f/3.5-6.3 Di II LD Aspherical [IF] Macro"},
{154, "Canon EF 20mm f/2.8 USM or Zeiss Lens"},
{154, "Zeiss Milvus 21mm f/2.8"},
{155, "Canon EF 85mm f/1.8 USM"},
{154, "Zeiss Milvus 15mm f/2.8 ZE"},
{154, "Zeiss Milvus 18mm f/2.8 ZE"},
{155, "Canon EF 85mm f/1.8 USM or Sigma Lens"},
{155, "Sigma 14mm f/1.8 DG HSM | A"},
{156, "Canon EF 28-105mm f/3.5-4.5 USM or Tamron Lens"},
{156, "Tamron SP 70-300mm f/4-5.6 Di VC USD"},
{156, "Tamron SP AF 28-105mm f/2.8 LD Aspherical IF"},
{156, "Tamron SP 70-300mm f/4-5.6 Di VC USD (A005)"},
{156, "Tamron SP AF 28-105mm f/2.8 LD Aspherical IF (176D)"},
{160, "Canon EF 20-35mm f/3.5-4.5 USM or Tamron or Tokina Lens"},
{160, "Tamron AF 19-35mm f/3.5-4.5"},
{160, "Tokina AT-X 124 AF Pro DX 12-24mm f/4"},
@ -742,7 +761,7 @@ public:
{161, "Sigma 24-60mm f/2.8 EX DG"},
{161, "Tamron AF 17-50mm f/2.8 Di-II LD Aspherical"},
{161, "Tamron 90mm f/2.8"},
{161, "Tamron SP AF 17-35mm f/2.8-4 Di LD Aspherical IF"},
{161, "Tamron SP AF 17-35mm f/2.8-4 Di LD Aspherical IF (A05)"},
{161, "Tamron SP AF 28-75mm f/2.8 XR Di LD Aspherical [IF] Macro"},
{161, "Tokina AT-X 24-70mm f/2.8 PRO FX (IF)"},
{162, "Canon EF 200mm f/2.8L USM"},
@ -762,18 +781,30 @@ public:
{169, "Sigma 30mm f/1.4 EX DC HSM"},
{169, "Sigma 35mm f/1.4 DG HSM"},
{169, "Sigma 35mm f/1.5 FF High-Speed Prime | 017"},
{170, "Canon EF 200mm f/2.8L II USM"},
{169, "Sigma 70mm f/2.8 Macro EX DG"},
{170, "Canon EF 200mm f/2.8L II USM or Sigma Lens"},
{170, "Sigma 300mm f/2.8 APO EX DG HSM"},
{170, "Sigma 800mm f/5.6 APO EX DG HSM"},
{171, "Canon EF 300mm f/4L USM"},
{172, "Canon EF 400mm f/5.6L USM or Sigma Lens"},
{172, "Sigma 150-600mm f/5-6.3 DG OS HSM | S"},
{172, "Sigma 500mm f/4.5 APO EX DG HSM"},
{173, "Canon EF 180mm Macro f/3.5L USM or Sigma Lens"},
{173, "Sigma 180mm EX HSM Macro f/3.5"},
{173, "Sigma APO Macro 150mm f/2.8 EX DG HSM"},
{173, "Sigma 10mm f/2.8 EX DC Fisheye"},
{173, "Sigma 15mm f/2.8 EX DG Diagonal Fisheye"},
{173, "Venus Laowa 100mm F2.8 2X Ultra Macro APO"},
{174, "Canon EF 135mm f/2L USM or Other Lens"},
{174, "Sigma 70-200mm f/2.8 EX DG APO OS HSM"},
{174, "Sigma 50-500mm f/4.5-6.3 APO DG OS HSM"},
{174, "Sigma 150-500mm f/5-6.3 APO DG OS HSM"},
{174, "Zeiss Milvus 100mm f/2 Makro"},
{174, "Sigma APO 50-150mm f/2.8 EX DC OS HSM"},
{174, "Sigma APO 120-300mm f/2.8 EX DG OS HSM"},
{174, "Sigma 120-300mm f/2.8 DG OS HSM S013"},
{174, "Sigma 120-400mm f/4.5-5.6 APO DG OS HSM"},
{174, "Sigma 200-500mm f/2.8 APO EX DG"},
{175, "Canon EF 400mm f/2.8L USM"},
{176, "Canon EF 24-85mm f/3.5-4.5 USM"},
{177, "Canon EF 300mm f/4L IS USM"},
@ -788,6 +819,8 @@ public:
{180, "Sigma 24mm f/1.5 FF High-Speed Prime | 017"},
{180, "Sigma 50mm f/1.5 FF High-Speed Prime | 017"},
{180, "Sigma 85mm f/1.5 FF High-Speed Prime | 017"},
{180, "Tokina Opera 50mm f/1.4 FF"},
{180, "Sigma 20mm f/1.4 DG HSM | A"},
{181, "Canon EF 100-400mm f/4.5-5.6L IS USM + 1.4x or Sigma Lens"},
{181, "Sigma 150-600mm f/5-6.3 DG OS HSM | S + 1.4x"},
{182, "Canon EF 100-400mm f/4.5-5.6L IS USM + 2x or Sigma Lens"},
@ -815,10 +848,13 @@ public:
{196, "Canon EF 75-300mm f/4-5.6 USM"},
{197, "Canon EF 75-300mm f/4-5.6 IS USM or Sigma Lens"},
{197, "Sigma 18-300mm f/3.5-6.3 DC Macro OS HS"},
{198, "Canon EF 50mm f/1.4 USM or Zeiss Lens"},
{198, "Canon EF 50mm f/1.4 USM or Other Lens"},
{198, "Zeiss Otus 55mm f/1.4 ZE"},
{198, "Zeiss Otus 85mm f/1.4 ZE"},
{198, "Zeiss Milvus 25mm f/1.4"},
{198, "Zeiss Otus 100mm f/1.4"},
{198, "Zeiss Milvus 35mm f/1.4 ZE"},
{198, "Yongnuo YN 35mm f/2"},
{199, "Canon EF 28-80mm f/3.5-5.6 USM"},
{200, "Canon EF 75-300mm f/4-5.6 USM"},
{201, "Canon EF 28-80mm f/3.5-5.6 USM"},
@ -829,13 +865,14 @@ public:
{211, "Canon EF 28-200mm f/3.5-5.6 USM"},
{212, "Canon EF 28-105mm f/4-5.6 USM"},
{213, "Canon EF 90-300mm f/4.5-5.6 USM or Tamron Lens"},
{213, "Tamron SP 150-600mm f/5-6.3 Di VC USD"},
{213, "Tamron 16-300mm f/3.5-6.3 Di II VC PZD Macro"},
{213, "Tamron SP 35mm f/1.8 Di VC USD"},
{213, "Tamron SP 45mm f/1.8 Di VC USD"},
{213, "Tamron SP 150-600mm f/5-6.3 Di VC USD (A011)"},
{213, "Tamron 16-300mm f/3.5-6.3 Di II VC PZD Macro (B016)"},
{213, "Tamron SP 35mm f/1.8 Di VC USD (F012)"},
{213, "Tamron SP 45mm f/1.8 Di VC USD (F013)"},
{214, "Canon EF-S 18-55mm f/3.5-5.6 USM"},
{215, "Canon EF 55-200mm f/4.5-5.6 II USM"},
{217, "Tamron AF 18-270mm f/3.5-6.3 Di II VC PZD"},
{220, "Yongnuo YN 50mm f/1.8"},
{224, "Canon EF 70-200mm f/2.8L IS USM"},
{225, "Canon EF 70-200mm f/2.8L IS USM + 1.4x"},
{226, "Canon EF 70-200mm f/2.8L IS USM + 2x"},
@ -843,7 +880,8 @@ public:
{228, "Canon EF 28-105mm f/3.5-4.5 USM"},
{229, "Canon EF 16-35mm f/2.8L USM"},
{230, "Canon EF 24-70mm f/2.8L USM"},
{231, "Canon EF 17-40mm f/4L USM"},
{231, "Canon EF 17-40mm f/4L USM or Sigma Lens"},
{231, "Sigma 12-24mm f/4 DG HSM A016"},
{232, "Canon EF 70-300mm f/4.5-5.6 DO IS USM"},
{233, "Canon EF 28-300mm f/3.5-5.6L IS USM"},
{234, "Canon EF-S 17-85mm f/4-5.6 IS USM or Tokina Lens"},
@ -867,13 +905,19 @@ public:
{248, "Sigma 24-35mm f/2 DG HSM | A"},
{248, "Sigma 135mm f/2 FF High-Speed Prime | 017"},
{248, "Sigma 24-35mm f/2.2 FF Zoom | 017"},
{248, "Sigma 135mm f/1.8 DG HSM A017"},
{249, "Canon EF 800mm f/5.6L IS USM"},
{250, "Canon EF 24mm f/1.4L II USM or Sigma Lens"},
{250, "Sigma 20mm f/1.4 DG HSM | A"},
{250, "Sigma 20mm f/1.5 FF High-Speed Prime | 017"},
{250, "Tokina Opera 16-28mm f/2.8 FF"},
{250, "Sigma 85mm f/1.4 DG HSM A016"},
{251, "Canon EF 70-200mm f/2.8L IS II USM"},
{251, "Canon EF 70-200mm f/2.8L IS III USM"},
{252, "Canon EF 70-200mm f/2.8L IS II USM + 1.4x"},
{252, "Canon EF 70-200mm f/2.8L IS III USM + 1.4x"},
{253, "Canon EF 70-200mm f/2.8L IS II USM + 2x"},
{253, "Canon EF 70-200mm f/2.8L IS III USM + 2x"},
{254, "Canon EF 100mm f/2.8L Macro IS USM"},
{255, "Sigma 24-105mm f/4 DG OS HSM | A or Other Sigma Lens"},
{255, "Sigma 180mm f/2.8 EX DG OS HSM APO Macro"},
@ -882,6 +926,12 @@ public:
{368, "Sigma 50mm f/1.4 DG HSM | A"},
{368, "Sigma 40mm f/1.4 DG HSM | A"},
{368, "Sigma 60-600mm f/4.5-6.3 DG OS HSM | S"},
{368, "Sigma 28mm f/1.4 DG HSM | A"},
{368, "Sigma 150-600mm f/5-6.3 DG OS HSM | S"},
{368, "Sigma 85mm f/1.4 DG HSM | A"},
{368, "Sigma 105mm f/1.4 DG HSM"},
{368, "Sigma 14-24mm f/2.8 DG HSM"},
{368, "Sigma 70mm f/2.8 DG Macro"},
{488, "Canon EF-S 15-85mm f/3.5-5.6 IS USM"},
{489, "Canon EF 70-300mm f/4-5.6L IS USM"},
{490, "Canon EF 8-15mm f/4L Fisheye USM"},
@ -897,7 +947,7 @@ public:
{493, "Canon EF 24-105mm f/4L IS USM"},
{494, "Canon EF 600mm f/4L IS II USM"},
{495, "Canon EF 24-70mm f/2.8L II USM or Sigma Lens"},
{495, "Sigma 24-70mm F2.8 DG OS HSM | A"},
{495, "Sigma 24-70mm f/2.8 DG OS HSM | A"},
{496, "Canon EF 200-400mm f/4L IS USM"},
{499, "Canon EF 200-400mm f/4L IS USM + 1.4x"},
{502, "Canon EF 28mm f/2.8 IS USM or Tamron Lens"},
@ -908,14 +958,16 @@ public:
{506, "Canon EF 400mm f/4 DO IS II USM"},
{507, "Canon EF 16-35mm f/4L IS USM"},
{508, "Canon EF 11-24mm f/4L USM or Tamron Lens"},
{508, "Tamron 10-24mm f/3.5-4.5 Di II VC HLD"},
{508, "Tamron 10-24mm f/3.5-4.5 Di II VC HLD (B023)"},
{624, "Sigma 70-200mm f/2.8 DG OS HSM | S"},
{747, "Canon EF 100-400mm f/4.5-5.6L IS II USM or Tamron Lens"},
{747, "Tamron SP 150-600mm f/5-6.3 Di VC USD G2"},
{748, "Canon EF 100-400mm f/4.5-5.6L IS II USM + 1.4x or Tamron Lens"},
{748, "Tamron 100-400mm f/4.5-6.3 Di VC USD A035E + 1.4x"},
{748, "Tamron 70-210mm f/4 Di VC USD (A034) + 2x"},
{749, "Tamron 100-400mm f/4.5-6.3 Di VC USD A035E + 2x"},
{750, "Canon EF 35mm f/1.4L II USM"},
{750, "Canon EF 35mm f/1.4L II USM or Tamron Lens"},
{750, "Tamron SP 85mm f/1.8 Di VC USD (F016)"},
{751, "Canon EF 16-35mm f/2.8L III USM"},
{752, "Canon EF 24-105mm f/4L IS II USM"},
{753, "Canon EF 85mm f/1.4L IS USM"},
@ -938,16 +990,21 @@ public:
{4154, "Canon EF-S 24mm f/2.8 STM"},
{4155, "Canon EF-M 28mm f/3.5 Macro IS STM"},
{4156, "Canon EF 50mm f/1.8 STM"},
{4157, "Canon EF-M 18-150mm 1:3.5-6.3 IS STM"},
{4157, "Canon EF-M 18-150mm f/3.5-6.3 IS STM"},
{4158, "Canon EF-S 18-55mm f/4-5.6 IS STM"},
{4159, "Canon EF-M 32mm f/1.4 STM"},
{4160, "Canon EF-S 35mm f/2.8 Macro IS STM"},
{4208, "Sigma 56mm f/1.4 DC DN | C"},
{36910, "Canon EF 70-300mm f/4-5.6 IS II USM"},
{36912, "Canon EF-S 18-135mm f/3.5-5.6 IS USM"},
{61182, "Canon RF 35mm F1.8 Macro IS STM or other Canon RF Lens"},
{61182, "Canon RF 50mm F1.2 L USM"},
{61182, "Canon RF 24-105mm F4 L IS USM"},
{61182, "Canon RF 28-70mm F2 L USM"},
{61182, "Canon RF 85mm F1.2L USM"},
{61182, "Canon RF 24-240mm F4-6.3 IS USM"},
{61182, "Canon RF 24-70mm F2.8 L IS USM"},
{61182, "Canon RF 15-35mm F2.8 L IS USM"},
{61491, "Canon CN-E 14mm T3.1 L F"},
{61492, "Canon CN-E 24mm T1.5 L F"},
{61494, "Canon CN-E 85mm T1.3 L F"},
@ -1514,7 +1571,11 @@ public:
{
choices[1042] = "EOS M50 / Kiss M";
choices[2049] = "PowerShot SX740 HS";
choices[2052] = "PowerShot G5 X Mark II";
choices[2053] = "PowerShot SX70 HS";
choices[2056] = "PowerShot G7 X Mark III";
choices[2065] = "EOS M6 Mark II";
choices[2066] = "EOS M200";
choices[16842752] = "PowerShot A30";
choices[17039360] = "PowerShot S300 / Digital IXUS 300 / IXY Digital 300";
choices[17170432] = "PowerShot A20";
@ -1679,6 +1740,7 @@ public:
choices[52822016] = "PowerShot A3400 IS";
choices[52887552] = "PowerShot A2400 IS";
choices[52953088] = "PowerShot A2300";
choices[53608448] = "PowerShot S100V";
choices[53673984] = "PowerShot G15";
choices[53739520] = "PowerShot SX50 HS";
choices[53805056] = "PowerShot SX160 IS";
@ -1737,7 +1799,7 @@ public:
choices[67239936] = "PowerShot SX420 IS";
choices[67305472] = "PowerShot ELPH 190 IS / IXUS 180 / IXY 190";
choices[67371008] = "PowerShot G1";
choices[67371009] = "IXY 180";
choices[67371009] = "PowerShot ELPH 180 IS / IXUS 175 / IXY 180";
choices[67436544] = "PowerShot SX720 HS";
choices[67502080] = "PowerShot SX620 HS";
choices[67567616] = "EOS M6";
@ -1821,7 +1883,7 @@ public:
choices[2147484453] = "EOS 70D";
choices[2147484454] = "EOS Rebel T5i / 700D / Kiss X7i";
choices[2147484455] = "EOS Rebel T5 / 1200D / Kiss X70 / Hi";
choices[2147484456] = "EOS-1D X MARK II";
choices[2147484456] = "EOS-1D X Mark II";
choices[2147484465] = "EOS M";
choices[2147484486] = "EOS Rebel SL1 / 100D / Kiss X7";
choices[2147484487] = "EOS Rebel T6s / 760D / 8000D";
@ -1837,8 +1899,14 @@ public:
choices[2147484680] = "EOS 77D / 9000D";
choices[2147484695] = "EOS Rebel SL2 / 200D / Kiss X9";
choices[2147484706] = "EOS Rebel T100 / 4000D / 3000D";
choices[2147484708] = "EOR R";
choices[2147484708] = "EOS R";
choices[2147484712] = "EOS-1D X Mark III";
choices[2147484722] = "EOS Rebel T7 / 2000D / 1500D / Kiss X90";
choices[2147484723] = "EOS RP";
choices[2147484726] = "EOS SL3 / 250D / Kiss X10";
choices[2147484727] = "EOS 90D";
choices[2147484960] = "EOS D2000C";
choices[2147485024] = "EOS D6000C";
}
};
CAModelIDInterpreter caModelIDInterpreter;

15
rtexif/nikonattribs.cc
View File

@ -627,6 +627,7 @@ const std::map<std::string, std::string> NALensDataInterpreter::lenses = {
{"02 48 65 65 24 24 02 00", "Sigma Macro 90mm f/2.8"},
{"03 43 5C 81 35 35 02 00", "Soligor AF C/D Zoom UMCS 70-210mm 1:4.5"},
{"03 48 5C 81 30 30 02 00", "AF Zoom-Nikkor 70-210mm f/4"},
{"03 54 68 68 0C 0C 00 00", "Zeiss Otus 1.4/100"},
{"04 48 3C 3C 24 24 03 00", "AF Nikkor 28mm f/2.8"},
{"05 54 50 50 0C 0C 04 00", "AF Nikkor 50mm f/1.4"},
{"06 3F 68 68 2C 2C 06 00", "Cosina AF 100mm f/3.5 Macro"},
@ -906,12 +907,14 @@ const std::map<std::string, std::string> NALensDataInterpreter::lenses = {
{"7F 48 2B 5C 24 34 1C 06", "Sigma 17-70mm f/2.8-4.5 DC Macro Asp. IF"},
{"7F 48 2D 50 24 24 1C 06", "Sigma 18-50mm f/2.8 EX DC Macro"},
{"80 48 1A 1A 24 24 85 06", "AF DX Fisheye-Nikkor 10.5mm f/2.8G ED"},
{"80 48 1C 29 24 24 7A 06", "Tokina atx-i 11-16mm f/2.8 CF"},
{"81 34 76 A6 38 40 4B 0E", "Sigma 150-600mm f/5-6.3 DG OS HSM | S"},
{"81 54 80 80 18 18 86 0E", "AF-S VR Nikkor 200mm f/2G IF-ED"},
{"82 34 76 A6 38 40 4B 0E", "Sigma 150-600mm f/5-6.3 DG OS HSM | C"},
{"82 48 8E 8E 24 24 87 0E", "AF-S VR Nikkor 300mm f/2.8G IF-ED"},
{"83 00 B0 B0 5A 5A 88 04", "FSA-L2, EDG 65, 800mm f/13 G"},
{"88 54 50 50 0C 0C 4B 06", "Sigma 50mm f/1.4 DG HSM | A"},
{"89 30 2D 80 2C 40 4B 0E", "Sigma 18-200mm f/3.5-6.3 DC Macro OS HS | C"},
{"89 3C 53 80 30 3C 8B 06", "AF-S DX Zoom-Nikkor 55-200mm f/4-5.6G ED"},
{"8A 3C 37 6A 30 30 4B 0E", "Sigma 24-105mm f/4 DG OS HSM"},
{"8A 54 6A 6A 24 24 8C 0E", "AF-S VR Micro-Nikkor 105mm f/2.8G IF-ED"},
@ -955,6 +958,7 @@ const std::map<std::string, std::string> NALensDataInterpreter::lenses = {
{"9E 38 11 29 34 3C 4B 06", "Sigma 8-16mm f/4.5-5.6 DC HSM"},
{"9E 40 2D 6A 2C 3C A0 0E", "AF-S DX VR Zoom-Nikkor 18-105mm f/3.5-5.6G ED"},
{"9F 37 50 A0 34 40 4B 0E", "Sigma 50-500mm f/4.5-6.3 DG OS HSM"},
{"9F 48 48 48 24 24 A1 06", "Yongnuo YN40mm f/2.8N"},
{"9F 58 44 44 14 14 A1 06", "AF-S DX Nikkor 35mm f/1.8G"},
{"A0 40 2D 53 2C 3C CA 0E", "AF-P DX Nikkor 18-55mm f/3.5-5.6G VR"},
{"A0 40 2D 53 2C 3C CA 8E", "AF-P DX Nikkor 18-55mm f/3.5-5.6G"},
@ -1007,6 +1011,7 @@ const std::map<std::string, std::string> NALensDataInterpreter::lenses = {
{"AA 48 88 A4 3C 3C D5 4E", "AF-S Nikkor 180-400mm f/4E TC1.4 FL ED VR + 1.4x TC"},
{"AB 3C A0 A0 30 30 C6 4E", "AF-S Nikkor 500mm f/4E FL ED VR"},
{"AB 44 5C 8E 34 3C D6 0E", "AF-P Nikkor 70-300mm f/4.5-5.6E ED VR"},
{"AB 44 5C 8E 34 3C D6 4E", "AF-P Nikkor 70-300mm f/4.5-5.6E ED VR"},
{"AB 44 5C 8E 34 3C D6 CE", "AF-P Nikkor 70-300mm f/4.5-5.6E ED VR"},
{"AC 38 53 8E 34 3C AE 0E", "AF-S DX Nikkor 55-300mm f/4.5-5.6G ED VR"},
{"AC 3C A6 A6 30 30 C7 4E", "AF-S Nikkor 600mm f/4E FL ED VR"},
@ -1038,6 +1043,8 @@ const std::map<std::string, std::string> NALensDataInterpreter::lenses = {
{"C1 48 24 37 24 24 4B 46", "Sigma 14-24mm f/2.8 DG HSM | A"},
{"C2 4C 24 24 14 14 4B 06", "Sigma 14mm f/1.8 DG HSM | A"},
{"C3 34 68 98 38 40 4B 4E", "Sigma 100-400mm f/5-6.3 DG OS HSM | C"},
{"C8 54 44 44 0D 0D DF 46", "Tamron SP 35mm f/1.4 Di USD (F045)"},
{"C8 54 62 62 0C 0C 4B 06", "Sigma 85mm f/1.4 DG HSM | A"},
{"C8 54 62 62 0C 0C 4B 46", "Sigma 85mm f/1.4 DG HSM | A"},
{"C9 48 37 5C 24 24 4B 4E", "Sigma 24-70mm f/2.8 DG OS HSM | A"},
{"CA 48 27 3E 24 24 DF 4E", "Tamron SP 15-30mm f/2.8 Di VC USD G2 (A041)"},
@ -1051,21 +1058,22 @@ const std::map<std::string, std::string> NALensDataInterpreter::lenses = {
{"DC 48 19 19 24 24 4B 06", "Sigma 10mm f/2.8 EX DC HSM Fisheye"},
{"DE 54 50 50 0C 0C 4B 06", "Sigma 50mm f/1.4 EX DG HSM"},
{"E0 3C 5C 8E 30 3C 4B 06", "Sigma 70-300mm f/4-5.6 APO DG Macro HSM"},
{"E0 40 2D 98 2C 41 DF 4E", "Tamron AF 18-400mm f/3.5-6.3 Di II VC HLD (B028)"},
{"E0 40 2D 98 2C 41 DF 4E", "Tamron 18-400mm f/3.5-6.3 Di II VC HLD (B028)"},
{"E1 40 19 36 2C 35 DF 4E", "Tamron 10-24mm f/3.5-4.5 Di II VC HLD (B023)"},
{"E1 58 37 37 14 14 1C 02", "Sigma 24mm f/1.8 EX DG Aspherical Macro"},
{"E2 47 5C 80 24 24 DF 4E", "Tamron SP 70-200mm f/2.8 Di VC USD G2 (A025)"},
{"E3 40 76 A6 38 40 DF 4E", "Tamron SP 150-600mm f/5-6.3 Di VC USD G2"},
{"E3 54 50 50 24 24 35 02", "Sigma Macro 50mm f/2.8 EX DG"},
{"E4 54 64 64 24 24 DF 0E", "Tamron SP 90mm f/2.8 Di VC USD Macro 1:1 (F017)"},
{"E5 4C 62 62 14 14 C9 4E", "Tamron SP 85mm f/1.8 Di VC USD (F016)"},
{"E5 54 6A 6A 24 24 35 02", "Sigma Macro 105mm f/2.8 EX DG"},
{"E6 40 2D 80 2C 40 DF 0E", "Tamron AF 18-200mm f/3.5-6.3 Di II VC (B018)"},
{"E6 40 2D 80 2C 40 DF 0E", "Tamron 18-200mm f/3.5-6.3 Di II VC (B018)"},
{"E6 41 3C 8E 2C 40 1C 02", "Sigma 28-300mm f/3.5-6.3 DG Macro"},
{"E7 4C 4C 4C 14 14 DF 0E", "Tamron SP 45mm f/1.8 Di VC USD (F013)"},
{"E8 4C 44 44 14 14 DF 0E", "Tamron SP 35mm f/1.8 Di VC USD (F012)"},
{"E9 48 27 3E 24 24 DF 0E", "Tamron SP 15-30mm f/2.8 Di VC USD (A012)"},
{"E9 54 37 5C 24 24 1C 02", "Sigma 24-70mm f/2.8 EX DG Macro"},
{"EA 40 29 8E 2C 40 DF 0E", "Tamron AF 16-300mm f/3.5-6.3 Di II VC PZD (B016)"},
{"EA 40 29 8E 2C 40 DF 0E", "Tamron 16-300mm f/3.5-6.3 Di II VC PZD (B016)"},
{"EA 48 27 27 24 24 1C 02", "Sigma 15mm f/2.8 EX Diagonal Fisheye"},
{"EB 40 76 A6 38 40 DF 0E", "Tamron SP AF 150-600mm f/5-6.3 VC USD (A011)"},
{"ED 40 2D 80 2C 40 4B 0E", "Sigma 18-200mm f/3.5-6.3 DC OS HSM"},
@ -1076,6 +1084,7 @@ const std::map<std::string, std::string> NALensDataInterpreter::lenses = {
{"F1 47 5C 8E 30 3C DF 0E", "Tamron SP 70-300mm f/4-5.6 Di VC USD (A005)"},
{"F3 48 68 8E 30 30 4B 02", "Sigma APO 100-300mm f/4 EX IF HSM"},
{"F3 54 2B 50 24 24 84 0E", "Tamron SP AF 17-50mm f/2.8 XR Di II VC LD Aspherical (IF) (B005)"},
{"F4 4C 7C 7C 2C 2C 4B 02", "Sigma APO Macro 180mm f/3.5 EX DG HSM"},
{"F4 54 56 56 18 18 84 06", "Tamron SP AF 60mm f/2.0 Di II Macro 1:1 (G005)"},
{"F5 40 2C 8A 2C 40 40 0E", "Tamron AF 18-270mm f/3.5-6.3 Di II VC LD Aspherical (IF) Macro (B003)"},
{"F5 48 76 76 24 24 4B 06", "Sigma APO Macro 150mm f/2.8 EX DG HSM"},

8
rtexif/olympusattribs.cc
View File

@ -130,6 +130,7 @@ public:
lenses["00 30 10"] = "Olympus M.Zuiko Digital ED 45mm f/1.2 Pro";
lenses["00 31 00"] = "Olympus Zuiko Digital ED 12-60mm f/2.8-4.0 SWD";
lenses["00 32 00"] = "Olympus Zuiko Digital ED 14-35mm f/2.0 SWD";
lenses["00 32 10"] = "Olympus M.Zuiko Digital ED 12-200mm f/3.5-6.3";
lenses["00 33 00"] = "Olympus Zuiko Digital 25mm f/2.8";
lenses["00 34 00"] = "Olympus Zuiko Digital ED 9-18mm f/4.0-5.6";
lenses["00 35 00"] = "Olympus Zuiko Digital 14-54mm f/2.8-3.5 II";
@ -190,6 +191,13 @@ public:
lenses["02 26 10"] = "Lumix G 25mm f/1.7 Asph.";
lenses["02 27 10"] = "Leica DG Vario-Elmar 100-400mm f/4.0-6.3 Asph. Power OIS";
lenses["02 28 10"] = "Lumix G Vario 12-60mm f/3.5-5.6 Asph. Power OIS";
lenses["02 29 10"] = "Leica DG Summilux 12mm f/1.4 Asph.";
lenses["02 30 10"] = "Leica DG Vario-Elmarit 12-60mm f/2.8-4 Asph. Power OIS";
lenses["02 33 10"] = "Lumix G X Vario 12-35mm f/2.8 II Asph. Power OIS";
lenses["02 35 10"] = "Leica DG Vario-Elmarit 8-18mm f/2.8-4 Asph.";
lenses["02 36 10"] = "Leica DG Elmarit 200mm f/2.8 Power OIS";
lenses["02 37 10"] = "Leica DG Vario-Elmarit 50-200mm f/2.8-4 Asph. Power OIS";
lenses["02 38 10"] = "Leica DG Vario-Summilux 10-25mm f/1.7 Asph.";
lenses["03 01 00"] = "Leica D Vario Elmarit 14-50mm f/2.8-3.5 Asph.";
lenses["03 02 00"] = "Leica D Summilux 25mm f/1.4 Asph.";
lenses["05 01 10"] = "Tamron 14-150mm f/3.5-5.8 Di III";

8
rtexif/pentaxattribs.cc
View File

@ -752,7 +752,7 @@ public:
choices.insert (p_t (256 * 3 + 44, "Sigma 17-70mm f/2.8-4.5 DC Macro"));
choices.insert (p_t (256 * 3 + 44, "Sigma 18-50mm f/3.5-5.6 DC"));
choices.insert (p_t (256 * 3 + 44, "Sigma 17-35mm f/2.8-4 EX DG"));
choices.insert (p_t (256 * 3 + 44, "Tamron 35-90mm f/4 AF"));
choices.insert (p_t (256 * 3 + 44, "Tamron 35-90mm f/4-5.6 AF"));
choices.insert (p_t (256 * 3 + 44, "Sigma AF 18-35mm f/3.5-4.5 Aspherical"));
choices.insert (p_t (256 * 3 + 46, "Sigma or Samsung Lens (3 46)"));
choices.insert (p_t (256 * 3 + 46, "Sigma APO 70-200mm f/2.8 EX"));
@ -908,8 +908,9 @@ public:
choices.insert (p_t (256 * 7 + 243, "smc PENTAX-DA 70mm f/2.4 Limited"));
choices.insert (p_t (256 * 7 + 244, "smc PENTAX-DA 21mm f/3.2 AL Limited"));
choices.insert (p_t (256 * 8 + 0, "Sigma 50-150mm f/2.8 II APO EX DC HSM"));
choices.insert (p_t (256 * 8 + 3, "Sigma AF 18-125mm f/3.5-5.6 DC"));
choices.insert (p_t (256 * 8 + 3, "Sigma 18-125mm f/3.8-5.6 DC HSM"));
choices.insert (p_t (256 * 8 + 4, "Sigma 50mm f/1.4 EX DG HSM"));
choices.insert (p_t (256 * 8 + 6, "Sigma 4.5mm f/2.8 EX DC Fisheye"));
choices.insert (p_t (256 * 8 + 7, "Sigma 24-70mm f/2.8 IF EX DG HSM"));
choices.insert (p_t (256 * 8 + 8, "Sigma 18-250mm f/3.5-6.3 DC OS HSM"));
choices.insert (p_t (256 * 8 + 11, "Sigma 10-20mm f/3.5 EX DC HSM"));
@ -920,6 +921,7 @@ public:
choices.insert (p_t (256 * 8 + 16, "Sigma 70-200mm f/2.8 EX DG Macro HSM II"));
choices.insert (p_t (256 * 8 + 17, "Sigma 50-500mm f/4.5-6.3 DG OS HSM"));
choices.insert (p_t (256 * 8 + 18, "Sigma 8-16mm f/4.5-5.6 DC HSM"));
choices.insert (p_t (256 * 8 + 20, "Sigma 18-50mm f/2.8-4.5 DC HSM"));
choices.insert (p_t (256 * 8 + 21, "Sigma 17-50mm f/2.8 EX DC OS HSM"));
choices.insert (p_t (256 * 8 + 22, "Sigma 85mm f/1.4 EX DG HSM"));
choices.insert (p_t (256 * 8 + 23, "Sigma 70-200mm f/2.8 APO EX DG OS HSM"));
@ -938,6 +940,7 @@ public:
choices.insert (p_t (256 * 8 + 62, "HD PENTAX-D FA 24-70mm f/2.8 ED SDM WR"));
choices.insert (p_t (256 * 8 + 63, "HD PENTAX-D FA 15-30mm f/2.8 ED SDM WR"));
choices.insert (p_t (256 * 8 + 64, "HD PENTAX-D FA* 50mm f/1.4 SDM AW"));
choices.insert (p_t (256 * 8 + 196, "HD PENTAX-DA* 11-18mm f/2.8 ED DC AW"));
choices.insert (p_t (256 * 8 + 197, "HD PENTAX-DA 55-300mm f/4.5-6.3 ED PLM WR RE"));
choices.insert (p_t (256 * 8 + 198, "smc PENTAX-DA L 18-50mm f/4-5.6 DC WR RE"));
choices.insert (p_t (256 * 8 + 199, "HD PENTAX-DA 18-50mm f/4-5.6 DC WR RE"));
@ -992,6 +995,7 @@ public:
choices.insert (p_t (256 * 22 + 3, "03 Fish-eye 3.2mm f/5.6"));
choices.insert (p_t (256 * 22 + 4, "04 Toy Lens Wide 6.3mm f/7.1"));
choices.insert (p_t (256 * 22 + 5, "05 Toy Lens Telephoto 18mm f/8"));
choices.insert (p_t (256 * 31 + 1, "GR Lens"));
}
std::string toString (const Tag* t) const override
{

268
rtexif/sonyminoltaattribs.cc
View File

@ -574,11 +574,12 @@ public:
{23, "Minolta AF 200mm f/4 Macro APO G"},
{24, "Minolta/Sony AF 24-105mm f/3.5-4.5 (D) or Sigma or Tamron Lens"},
{24, "Sigma 18-50mm f/2.8"},
{24, "Sigma 17-70mm f/2.8-4.5 (D)"},
{24, "Sigma 17-70mm f/2.8-4.5 DC Macro"},
{24, "Sigma 20-40mm f/2.8 EX DG Aspherical IF"},
{24, "Sigma 18-200mm f/3.5-6.3 DC"},
{24, "Sigma DC 18-125mm f/4-5,6 D"},
{24, "Tamron SP AF 28-75mm f/2.8 XR Di LD Aspherical [IF] Macro"},
{24, "Sigma 15-30mm f/3.5-4.5 EX DG Aspherical"},
{25, "Minolta AF 100-300mm f/4.5-5.6 APO (D) or Sigma Lens"},
{25, "Sigma 100-300mm f/4 EX (APO (D) or D IF)"},
{25, "Sigma 70mm f/2.8 EX DG Macro"},
@ -612,8 +613,9 @@ public:
{45, "Carl Zeiss Planar T* 85mm f/1.4 ZA (SAL85F14Z)"},
{46, "Carl Zeiss Vario-Sonnar T* DT 16-80mm f/3.5-4.5 ZA (SAL1680Z)"},
{47, "Carl Zeiss Sonnar T* 135mm f/1.8 ZA (SAL135F18Z)"},
{48, "Carl Zeiss Vario-Sonnar T* 24-70mm f/2.8 ZA SSM (SAL2470Z) or ZA SSM II"},
{48, "Carl Zeiss Vario-Sonnar T* 24-70mm f/2.8 ZA SSM (SAL2470Z) or Other Lens"},
{48, "Carl Zeiss Vario-Sonnar T* 24-70mm f/2.8 ZA SSM II (SAL2470Z2)"},
{48, "Tamron SP 24-70mm f/2.8 Di USD"},
{49, "Sony DT 55-200mm f/4-5.6 (SAL55200)"},
{50, "Sony DT 18-250mm f/3.5-6.3 (SAL18250)"},
{51, "Sony DT 16-105mm f/3.5-5.6 (SAL16105)"},
@ -645,7 +647,6 @@ public:
{128, "Tamron or Sigma Lens (128)"},
{128, "Tamron AF 18-200mm f/3.5-6.3 XR Di II LD Aspherical [IF] Macro"},
{128, "Tamron AF 28-300mm f/3.5-6.3 XR Di LD Aspherical [IF] Macro"},
{128, "Tamron 80-300mm f/3.5-6.3"},
{128, "Tamron AF 28-200mm f/3.8-5.6 XR Di Aspherical [IF] Macro"},
{128, "Tamron SP AF 17-35mm f/2.8-4 Di LD Aspherical IF"},
{128, "Sigma AF 50-150mm f/2.8 EX DC APO HSM II"},
@ -680,7 +681,7 @@ public:
{137, "Cosina 70-210mm f/2.8-4 AF"},
{138, "Soligor 19-35mm f/3.5-4.5"},
{139, "Tokina AF 28-300mm f/4-6.3"},
{142, "Voigtlander 70-300mm f/4.5-5.6"},
{142, "Cosina AF 70-300mm f/4.5-5.6 MC"},
{146, "Voigtlander Macro APO-Lanthar 125mm f/2.5 SL"},
{194, "Tamron SP AF 17-50mm f/2.8 XR Di II LD Aspherical [IF]"},
{202, "Tamron SP AF 70-200mm f/2.8 Di LD [IF] Macro"},
@ -723,10 +724,11 @@ public:
{2552, "Angenieux AF 28-70mm f/2.6"},
{2552, "Tokina AT-X 17 AF 17mm f/3.5"},
{2552, "Tokina 20-35mm f/3.5-4.5 II AF"},
{2553, "Minolta AF 28-135mm f/4-4.5 or Sigma Lens"},
{2553, "Minolta AF 28-135mm f/4-4.5 or Other Lens"},
{2553, "Sigma ZOOM-alpha 35-135mm f/3.5-4.5"},
{2553, "Sigma 28-105mm f/2.8-4 Aspherical"},
{2553, "Sigma 28-105mm f/4-5.6 UC"},
{2553, "Tokina AT-X 242 AF 24-200mm f/3.5-5.6"},
{2554, "Minolta AF 35-105mm f/3.5-4.5"},
{2555, "Minolta AF 70-210mm f/4 Macro or Sigma Lens"},
{2555, "Sigma 70-210mm f/4-5.6 APO"},
@ -805,7 +807,7 @@ public:
{2624, "Minolta AF 35-80mm f/4-5.6 Power Zoom"},
{2628, "Minolta AF 80-200mm f/2.8 HS-APO G"},
{2629, "Minolta AF 85mm f/1.4 New"},
{2631, "Minolta/Sony AF 100-300mm f/4.5-5.6 APO"},
{2631, "Minolta AF 100-300mm f/4.5-5.6 APO"},
{2632, "Minolta AF 24-50mm f/4 New"},
{2638, "Minolta AF 50mm f/2.8 Macro New"},
{2639, "Minolta AF 100mm f/2.8 Macro"},
@ -818,6 +820,7 @@ public:
{2672, "Minolta AF 24-105mm f/3.5-4.5 (D)"},
{3046, "Metabones Canon EF Speed Booster"},
{4567, "Tokina 70-210mm f/4-5.6"},
{4568, "Tokina AF 35-200mm f/4-5.6 Zoom SD"},
{4570, "Tamron AF 35-135mm f/3.5-4.5"},
{4571, "Vivitar 70-210mm f/4.5-5.6"},
{4574, "2x Teleconverter or Tamron or Tokina Lens"},
@ -832,97 +835,6 @@ public:
{6118, "Canon EF Adapter"},
{6528, "Sigma 16mm f/2.8 Filtermatic Fisheye"},
{6553, "E-Mount, T-Mount, Other Lens or no lens"},
{6553, "Sony E 16mm f/2.8"},
{6553, "Sony E 18-55mm f/3.5-5.6 OSS"},
{6553, "Sony E 55-210mm f/4.5-6.3 OSS"},
{6553, "Sony E 18-200mm f/3.5-6.3 OSS"},
{6553, "Sony E 30mm f/3.5 Macro"},
{6553, "Sony E 24mm f/1.8 ZA"},
{6553, "Sony E 50mm f/1.8 OSS"},
{6553, "Sony E 16-70mm f/4 ZA OSS"},
{6553, "Sony E 10-18mm f/4 OSS"},
{6553, "Sony E PZ 16-50mm f/3.5-5.6 OSS"},
{6553, "Sony FE 35mm f/2.8 ZA"},
{6553, "Sony FE 24-70mm f/4 ZA OSS"},
{6553, "Sony FE 85mm f/1.8"},
{6553, "Sony E 18-200mm f/3.5-6.3 OSS LE"},
{6553, "Sony E 20mm f/2.8"},
{6553, "Sony E 35mm f/1.8 OSS"},
{6553, "Sony E PZ 18-105mm f/4 G OSS"},
{6553, "Sony FE 12-24mm f/4 G"},
{6553, "Sony FE 90mm f/2.8 Macro G OSS"},
{6553, "Sony E 18-50mm f/4-5.6"},
{6553, "Sony FE 24mm f/1.4 GM"},
{6553, "Sony FE 24-105mm f/4 G OSS"},
{6553, "Sony E PZ 18-200mm f/3.5-6.3 OSS"},
{6553, "Sony FE 55mm f/1.8 ZA"},
{6553, "Sony FE 70-200mm f/4 G OSS"},
{6553, "Sony FE 16-35mm f/4 ZA OSS"},
{6553, "Sony FE 50mm f/2.8 Macro"},
{6553, "Sony FE 28-70mm f/3.5-5.6 OSS"},
{6553, "Sony FE 35mm f/1.4 ZA"},
{6553, "Sony FE 24-240mm f/3.5-6.3 OSS"},
{6553, "Sony FE 28mm f/2"},
{6553, "Sony FE PZ 28-135mm f/4 G OSS"},
{6553, "Sony FE 100mm f/2.8 STF GM OSS"},
{6553, "Sony E PZ 18-110mm f/4 G OSS"},
{6553, "Sony FE 24-70mm f/2.8 GM"},
{6553, "Sony FE 50mm f/1.4 ZA"},
{6553, "Sony FE 85mm f/1.4 GM"},
{6553, "Sony FE 50mm f/1.8"},
{6553, "Sony FE 21mm f/2.8 (SEL28F20 + SEL075UWC)"},
{6553, "Sony FE 16mm f/3.5 Fisheye (SEL28F20 + SEL057FEC)"},
{6553, "Sony FE 70-300mm f/4.5-5.6 G OSS"},
{6553, "Sony FE 100-400mm f/4.5-5.6 GM OSS"},
{6553, "Sony FE 70-200mm f/2.8 GM OSS"},
{6553, "Sony FE 16-35mm f/2.8 GM"},
{6553, "Sony FE 400mm f/2.8 GM OSS"},
{6553, "Sony E 18-135mm f/3.5-5.6 OSS"},
{6553, "Sony FE 70-200mm f/2.8 GM OSS + 1.4X Teleconverter"},
{6553, "Sony FE 70-200mm f/2.8 GM OSS + 2X Teleconverter"},
{6553, "Sony FE 100-400mm f/4.5-5.6 GM OSS + 1.4X Teleconverter"},
{6553, "Sony FE 100-400mm f/4.5-5.6 GM OSS + 2X Teleconverter"},
{6553, "Sony FE 400mm f/2.8 GM OSS + 1.4X Teleconverter"},
{6553, "Sony FE 400mm f/2.8 GM OSS + 2X Teleconverter"},
{6553, "Samyang AF 50mm f/1.4 FE"},
{6553, "Samyang AF 14mm f/2.8 FE"},
{6553, "Samyang AF 24mm f/2.8"},
{6553, "Samyang AF 35mm f/2.8 FE"},
{6553, "Samyang AF 35mm f/1.4"},
{6553, "Sigma 19mm f/2.8 [EX] DN"},
{6553, "Sigma 30mm f/2.8 [EX] DN"},
{6553, "Sigma 60mm f/2.8 DN"},
{6553, "Sigma 30mm f/1.4 DC DN | C"},
{6553, "Sigma 85mm f/1.4 DG HSM | A"},
{6553, "Sigma 16mm f/1.4 DC DN | C"},
{6553, "Sigma 105mm f/1.4 DG HSM | A"},
{6553, "Sigma 56mm f/1.4 DC DN | C"},
{6553, "Sigma 70-200mm f/2.8 DG OS HSM | S"},
{6553, "Sigma 70mm f/2.8 DG MACRO | A"},
{6553, "Tamron 18-200mm f/3.5-6.3 Di III VC"},
{6553, "Tamron 28-75mm f/2.8 Di III RXD"},
{6553, "Tokina Firin 20mm f/2 FE MF"},
{6553, "Voigtlander SUPER WIDE-HELIAR 15mm f/4.5 III"},
{6553, "Voigtlander HELIAR-HYPER WIDE 10mm f/5.6"},
{6553, "Voigtlander ULTRA WIDE-HELIAR 12mm f/5.6 III"},
{6553, "Voigtlander MACRO APO-LANTHAR 65mm f/2 Aspherical"},
{6553, "Voigtlander NOKTON 40mm f/1.2 Aspherical"},
{6553, "Voigtlander NOKTON classic 35mm f/1.4"},
{6553, "Voigtlander MACRO APO-LANTHAR 110mm f/2.5"},
{6553, "Voigtlander COLOR-SKOPAR 21mm f/3.5 Aspherical"},
{6553, "Zeiss Touit 12mm f/2.8"},
{6553, "Zeiss Touit 32mm f/1.8"},
{6553, "Zeiss Touit 50mm f/2.8 Macro"},
{6553, "Zeiss Batis 25mm f/2"},
{6553, "Zeiss Batis 85mm f/1.8"},
{6553, "Zeiss Batis 18mm f/2.8"},
{6553, "Zeiss Batis 135mm f/2.8"},
{6553, "Zeiss Batis 40mm f/2 CF"},
{6553, "Zeiss Loxia 50mm f/2"},
{6553, "Zeiss Loxia 35mm f/2"},
{6553, "Zeiss Loxia 21mm f/2.8"},
{6553, "Zeiss Loxia 85mm f/2.4"},
{6553, "Zeiss Loxia 25mm f/2.4"},
{6553, "Arax MC 35mm f/2.8 Tilt+Shift"},
{6553, "Arax MC 80mm f/2.8 Tilt+Shift"},
{6553, "Zenitar MF 16mm f/2.8 Fisheye M42"},
@ -948,10 +860,11 @@ public:
{25521, "Angenieux AF 28-70mm f/2.6"},
{25521, "Tokina AT-X 17 AF 17mm f/3.5"},
{25521, "Tokina 20-35mm f/3.5-4.5 II AF"},
{25531, "Minolta AF 28-135mm f/4-4.5 or Sigma Lens"},
{25531, "Minolta AF 28-135mm f/4-4.5 or Other Lens"},
{25531, "Sigma ZOOM-alpha 35-135mm f/3.5-4.5"},
{25531, "Sigma 28-105mm f/2.8-4 Aspherical"},
{25531, "Sigma 28-105mm f/4-5.6 UC"},
{25531, "Tokina AT-X 242 AF 24-200mm f/3.5-5.6"},
{25541, "Minolta AF 35-105mm f/3.5-4.5"},
{25551, "Minolta AF 70-210mm f/4 Macro or Sigma Lens"},
{25551, "Sigma 70-210mm f/4-5.6 APO"},
@ -1030,7 +943,7 @@ public:
{26241, "Minolta AF 35-80mm f/4-5.6 Power Zoom"},
{26281, "Minolta AF 80-200mm f/2.8 HS-APO G"},
{26291, "Minolta AF 85mm f/1.4 New"},
{26311, "Minolta/Sony AF 100-300mm f/4.5-5.6 APO"},
{26311, "Minolta AF 100-300mm f/4.5-5.6 APO"},
{26321, "Minolta AF 24-50mm f/4 New"},
{26381, "Minolta AF 50mm f/2.8 Macro New"},
{26391, "Minolta AF 100mm f/2.8 Macro"},
@ -1043,6 +956,7 @@ public:
{26721, "Minolta AF 24-105mm f/3.5-4.5 (D)"},
{30464, "Metabones Canon EF Speed Booster"},
{45671, "Tokina 70-210mm f/4-5.6"},
{45681, "Tokina AF 35-200mm f/4-5.6 Zoom SD"},
{45701, "Tamron AF 35-135mm f/3.5-4.5"},
{45711, "Vivitar 70-210mm f/4.5-5.6"},
{45741, "2x Teleconverter or Tamron or Tokina Lens"},
@ -1057,104 +971,13 @@ public:
{61184, "Canon EF Adapter"},
{65280, "Sigma 16mm f/2.8 Filtermatic Fisheye"},
{65535, "E-Mount, T-Mount, Other Lens or no lens"},
{65535, "Sony E 16mm f/2.8"},
{65535, "Sony E 18-55mm f/3.5-5.6 OSS"},
{65535, "Sony E 55-210mm f/4.5-6.3 OSS"},
{65535, "Sony E 18-200mm f/3.5-6.3 OSS"},
{65535, "Sony E 30mm f/3.5 Macro"},
{65535, "Sony E 24mm f/1.8 ZA"},
{65535, "Sony E 50mm f/1.8 OSS"},
{65535, "Sony E 16-70mm f/4 ZA OSS"},
{65535, "Sony E 10-18mm f/4 OSS"},
{65535, "Sony E PZ 16-50mm f/3.5-5.6 OSS"},
{65535, "Sony FE 35mm f/2.8 ZA"},
{65535, "Sony FE 24-70mm f/4 ZA OSS"},
{65535, "Sony FE 85mm f/1.8"},
{65535, "Sony E 18-200mm f/3.5-6.3 OSS LE"},
{65535, "Sony E 20mm f/2.8"},
{65535, "Sony E 35mm f/1.8 OSS"},
{65535, "Sony E PZ 18-105mm f/4 G OSS"},
{65535, "Sony FE 12-24mm f/4 G"},
{65535, "Sony FE 90mm f/2.8 Macro G OSS"},
{65535, "Sony E 18-50mm f/4-5.6"},
{65535, "Sony FE 24mm f/1.4 GM"},
{65535, "Sony FE 24-105mm f/4 G OSS"},
{65535, "Sony E PZ 18-200mm f/3.5-6.3 OSS"},
{65535, "Sony FE 55mm f/1.8 ZA"},
{65535, "Sony FE 70-200mm f/4 G OSS"},
{65535, "Sony FE 16-35mm f/4 ZA OSS"},
{65535, "Sony FE 50mm f/2.8 Macro"},
{65535, "Sony FE 28-70mm f/3.5-5.6 OSS"},
{65535, "Sony FE 35mm f/1.4 ZA"},
{65535, "Sony FE 24-240mm f/3.5-6.3 OSS"},
{65535, "Sony FE 28mm f/2"},
{65535, "Sony FE PZ 28-135mm f/4 G OSS"},
{65535, "Sony FE 100mm f/2.8 STF GM OSS"},
{65535, "Sony E PZ 18-110mm f/4 G OSS"},
{65535, "Sony FE 24-70mm f/2.8 GM"},
{65535, "Sony FE 50mm f/1.4 ZA"},
{65535, "Sony FE 85mm f/1.4 GM"},
{65535, "Sony FE 50mm f/1.8"},
{65535, "Sony FE 21mm f/2.8 (SEL28F20 + SEL075UWC)"},
{65535, "Sony FE 16mm f/3.5 Fisheye (SEL28F20 + SEL057FEC)"},
{65535, "Sony FE 70-300mm f/4.5-5.6 G OSS"},
{65535, "Sony FE 100-400mm f/4.5-5.6 GM OSS"},
{65535, "Sony FE 70-200mm f/2.8 GM OSS"},
{65535, "Sony FE 16-35mm f/2.8 GM"},
{65535, "Sony FE 400mm f/2.8 GM OSS"},
{65535, "Sony E 18-135mm f/3.5-5.6 OSS"},
{65535, "Sony FE 70-200mm f/2.8 GM OSS + 1.4X Teleconverter"},
{65535, "Sony FE 70-200mm f/2.8 GM OSS + 2X Teleconverter"},
{65535, "Sony FE 100-400mm f/4.5-5.6 GM OSS + 1.4X Teleconverter"},
{65535, "Sony FE 100-400mm f/4.5-5.6 GM OSS + 2X Teleconverter"},
{65535, "Sony FE 400mm f/2.8 GM OSS + 1.4X Teleconverter"},
{65535, "Sony FE 400mm f/2.8 GM OSS + 2X Teleconverter"},
{65535, "Samyang AF 50mm f/1.4 FE"},
{65535, "Samyang AF 14mm f/2.8 FE"},
{65535, "Samyang AF 24mm f/2.8"},
{65535, "Samyang AF 35mm f/2.8 FE"},
{65535, "Samyang AF 35mm f/1.4"},
{65535, "Sigma 19mm f/2.8 [EX] DN"},
{65535, "Sigma 30mm f/2.8 [EX] DN"},
{65535, "Sigma 60mm f/2.8 DN"},
{65535, "Sigma 30mm f/1.4 DC DN | C"},
{65535, "Sigma 85mm f/1.4 DG HSM | A"},
{65535, "Sigma 16mm f/1.4 DC DN | C"},
{65535, "Sigma 105mm f/1.4 DG HSM | A"},
{65535, "Sigma 56mm f/1.4 DC DN | C"},
{65535, "Sigma 70-200mm f/2.8 DG OS HSM | S"},
{65535, "Sigma 70mm f/2.8 DG MACRO | A"},
{65535, "Tamron 18-200mm f/3.5-6.3 Di III VC"},
{65535, "Tamron 28-75mm f/2.8 Di III RXD"},
{65535, "Tokina Firin 20mm f/2 FE MF"},
{65535, "Voigtlander SUPER WIDE-HELIAR 15mm f/4.5 III"},
{65535, "Voigtlander HELIAR-HYPER WIDE 10mm f/5.6"},
{65535, "Voigtlander ULTRA WIDE-HELIAR 12mm f/5.6 III"},
{65535, "Voigtlander MACRO APO-LANTHAR 65mm f/2 Aspherical"},
{65535, "Voigtlander NOKTON 40mm f/1.2 Aspherical"},
{65535, "Voigtlander NOKTON classic 35mm f/1.4"},
{65535, "Voigtlander MACRO APO-LANTHAR 110mm f/2.5"},
{65535, "Voigtlander COLOR-SKOPAR 21mm f/3.5 Aspherical"},
{65535, "Zeiss Touit 12mm f/2.8"},
{65535, "Zeiss Touit 32mm f/1.8"},
{65535, "Zeiss Touit 50mm f/2.8 Macro"},
{65535, "Zeiss Batis 25mm f/2"},
{65535, "Zeiss Batis 85mm f/1.8"},
{65535, "Zeiss Batis 18mm f/2.8"},
{65535, "Zeiss Batis 135mm f/2.8"},
{65535, "Zeiss Batis 40mm f/2 CF"},
{65535, "Zeiss Loxia 50mm f/2"},
{65535, "Zeiss Loxia 35mm f/2"},
{65535, "Zeiss Loxia 21mm f/2.8"},
{65535, "Zeiss Loxia 85mm f/2.4"},
{65535, "Zeiss Loxia 25mm f/2.4"},
{65535, "Arax MC 35mm f/2.8 Tilt+Shift"},
{65535, "Arax MC 80mm f/2.8 Tilt+Shift"},
{65535, "Zenitar MF 16mm f/2.8 Fisheye M42"},
{65535, "Samyang 500mm Mirror f/8.0"},
{65535, "Pentacon Auto 135mm f/2.8"},
{65535, "Pentacon Auto 29mm f/2.8"},
{65535, "Helios 44-2 58mm f/2.0"},
{65535, "Helios 44-2 58mm f/2.0"}
};
}
@ -1198,12 +1021,25 @@ public:
SALensID2Interpreter ()
{
choices.insert (p_t (0, "Unknown E-mount lens or other lens"));
choices.insert (p_t (0, "Sigma 19mm f/2.8 [EX] DN"));
choices.insert (p_t (0, "Sigma 30mm f/2.8 [EX] DN"));
choices.insert (p_t (0, "Sigma 60mm f/2.8 DN"));
choices.insert (p_t (0, "Sony E 18-200mm f/3.5-6.3 OSS LE"));
choices.insert (p_t (0, "Tamron 18-200mm f/3.5-6.3 Di III VC"));
choices.insert (p_t (0, "Tokina FiRIN 20mm f/2 FE AF"));
choices.insert (p_t (0, "Tokina FiRIN 20mm f/2 FE MF"));
choices.insert (p_t (0, "Zeiss Touit 12mm f/2.8"));
choices.insert (p_t (0, "Zeiss Touit 32mm f/1.8"));
choices.insert (p_t (0, "Zeiss Touit 50mm f/2.8 Macro"));
choices.insert (p_t (0, "Zeiss Loxia 50mm f/2"));
choices.insert (p_t (0, "Zeiss Loxia 35mm f/2"));
choices.insert (p_t (1, "Sony LA-EA1 or Sigma MC-11 Adapter"));
choices.insert (p_t (2, "Sony LA-EA2 Adapter"));
choices.insert (p_t (3, "Sony LA-EA3 Adapter"));
choices.insert (p_t (6, "Sony LA-EA4 Adapter"));
choices.insert (p_t (44, "Metabones Canon EF Smart Adapter"));
choices.insert (p_t (78, "Metabones Canon EF Smart Adapter Mark III or Other Adapter"));
choices.insert (p_t (184, "Metabones Canon EF Speed Booster Ultra"));
choices.insert (p_t (234, "Metabones Canon EF Smart Adapter Mark IV"));
choices.insert (p_t (239, "Metabones Canon EF Speed Booster"));
choices.insert (p_t (32784, "Sony E 16mm f/2.8"));
@ -1211,17 +1047,19 @@ public:
choices.insert (p_t (32786, "Sony E 55-210mm f/4.5-6.3 OSS"));
choices.insert (p_t (32787, "Sony E 18-200mm f/3.5-6.3 OSS"));
choices.insert (p_t (32788, "Sony E 30mm f/3.5 Macro"));
choices.insert (p_t (32789, "Sony E 24mm f/1.8 ZA or Samyang AF 50mm f/1.4 FE"));
choices.insert (p_t (32789, "Samyang AF 50mm f/1.4 FE"));
choices.insert (p_t (32790, "Sony E 50mm f/1.8 OSS or Samyang AF 14mm f/2.8 FE"));
choices.insert (p_t (32790, "Samyang AF 14mm f/2.8 FE"));
choices.insert (p_t (32789, "Sony E 24mm f/1.8 ZA or Samyang AF 50mm f/1.4"));
choices.insert (p_t (32789, "Samyang AF 50mm f/1.4"));
choices.insert (p_t (32790, "Sony E 50mm f/1.8 OSS or Samyang AF 14mm f/2.8"));
choices.insert (p_t (32790, "Samyang AF 14mm f/2.8"));
choices.insert (p_t (32791, "Sony E 16-70mm f/4 ZA OSS"));
choices.insert (p_t (32792, "Sony E 10-18mm f/4 OSS"));
choices.insert (p_t (32793, "Sony E PZ 16-50mm f/3.5-5.6 OSS"));
choices.insert (p_t (32794, "Sony FE 35mm f/2.8 ZA or Samyang AF 24mm f/2.8 FE"));
choices.insert (p_t (32794, "Samyang AF 24mm f/2.8 FE"));
choices.insert (p_t (32794, "Sony FE 35mm f/2.8 ZA or Samyang Lens"));
choices.insert (p_t (32794, "Samyang AF 24mm f/2.8"));
choices.insert (p_t (32794, "Samyang AF 35mm f/2.8"));
choices.insert (p_t (32795, "Sony FE 24-70mm f/4 ZA OSS"));
choices.insert (p_t (32796, "Sony FE 85mm f/1.8"));
choices.insert (p_t (32796, "Sony FE 85mm f/1.8 or Viltrox PFU RBMH 85mm f/1.8"));
choices.insert (p_t (32796, "Viltrox PFU RBMH 85mm f/1.8"));
choices.insert (p_t (32797, "Sony E 18-200mm f/3.5-6.3 OSS LE"));
choices.insert (p_t (32798, "Sony E 20mm f/2.8"));
choices.insert (p_t (32799, "Sony E 35mm f/1.8 OSS"));
@ -1245,7 +1083,8 @@ public:
choices.insert (p_t (32820, "Sony E PZ 18-110mm f/4 G OSS"));
choices.insert (p_t (32821, "Sony FE 24-70mm f/2.8 GM"));
choices.insert (p_t (32822, "Sony FE 50mm f/1.4 ZA"));
choices.insert (p_t (32823, "Sony FE 85mm f/1.4 GM"));
choices.insert (p_t (32823, "Sony FE 85mm f/1.4 GM or Samyang AF 85mm f/1.4"));
choices.insert (p_t (32823, "Samyang AF 85mm f/1.4"));
choices.insert (p_t (32824, "Sony FE 50mm f/1.8"));
choices.insert (p_t (32826, "Sony FE 21mm f/2.8 (SEL28F20 + SEL075UWC)"));
choices.insert (p_t (32827, "Sony FE 16mm f/3.5 Fisheye (SEL28F20 + SEL057FEC)"));
@ -1255,6 +1094,12 @@ public:
choices.insert (p_t (32831, "Sony FE 16-35mm f/2.8 GM"));
choices.insert (p_t (32848, "Sony FE 400mm f/2.8 GM OSS"));
choices.insert (p_t (32849, "Sony E 18-135mm f/3.5-5.6 OSS"));
choices.insert (p_t (32850, "Sony FE 135mm f/1.8 GM"));
choices.insert (p_t (32851, "Sony FE 200-600mm f/5.6-6.3 G OSS"));
choices.insert (p_t (32852, "Sony FE 600mm f/4 GM OSS"));
choices.insert (p_t (32853, "Sony E 16-55mm f/2.8 G"));
choices.insert (p_t (32854, "Sony E 70-350mm f/4.5-6.3 G OSS"));
choices.insert (p_t (32858, "Sony FE 35mm f/1.8"));
choices.insert (p_t (33072, "Sony FE 70-200mm f/2.8 GM OSS + 1.4X Teleconverter"));
choices.insert (p_t (33073, "Sony FE 70-200mm f/2.8 GM OSS + 2X Teleconverter"));
choices.insert (p_t (33076, "Sony FE 100mm f/2.8 STF GM OSS (macro mode)"));
@ -1262,6 +1107,10 @@ public:
choices.insert (p_t (33078, "Sony FE 100-400mm f/4.5-5.6 GM OSS + 2X Teleconverter"));
choices.insert (p_t (33079, "Sony FE 400mm f/2.8 GM OSS + 1.4X Teleconverter"));
choices.insert (p_t (33080, "Sony FE 400mm f/2.8 GM OSS + 2X Teleconverter"));
choices.insert (p_t (33081, "Sony FE 200-600mm f/5.6-6.3 G OSS + 1.4X Teleconverter"));
choices.insert (p_t (33082, "Sony FE 200-600mm f/5.6-6.3 G OSS + 2X Teleconverter"));
choices.insert (p_t (33083, "Sony FE 600mm f/4 GM OSS + 1.4X Teleconverter"));
choices.insert (p_t (33084, "Sony FE 600mm f/4 GM OSS + 2X Teleconverter"));
choices.insert (p_t (49201, "Zeiss Touit 12mm f/2.8"));
choices.insert (p_t (49202, "Zeiss Touit 32mm f/1.8"));
choices.insert (p_t (49203, "Zeiss Touit 50mm f/2.8 Macro"));
@ -1276,11 +1125,17 @@ public:
choices.insert (p_t (49235, "Zeiss Loxia 85mm f/2.4"));
choices.insert (p_t (49236, "Zeiss Loxia 25mm f/2.4"));
choices.insert (p_t (49457, "Tamron 28-75mm f/2.8 Di III RXD"));
choices.insert (p_t (49458, "Tamron 17-28mm f/2.8 Di III RXD"));
choices.insert (p_t (49459, "Tamron 35mm f/2.8 Di III OSD M1:2"));
choices.insert (p_t (49460, "Tamron 24mm f/2.8 Di III OSD M1:2"));
choices.insert (p_t (49712, "Tokina FiRIN 20mm f/2 FE AF"));
choices.insert (p_t (49713, "Tokina FiRIN 100mm f/2.8 FE MACRO"));
choices.insert (p_t (50480, "Sigma 30mm f/1.4 DC DN | C"));
choices.insert (p_t (50481, "Sigma 50mm f/1.4 DG HSM | A"));
choices.insert (p_t (50482, "Sigma 18-300mm f/3.5-6.3 DC MACRO OS HSM | C + MC-11"));
choices.insert (p_t (50483, "Sigma 18-35mm f/1.8 DC HSM | A + MC-11"));
choices.insert (p_t (50484, "Sigma 24-35mm f/2 DG HSM | A + MC-11"));
choices.insert (p_t (50485, "Sigma 24mm f/1.4 DG HSM | A + MC-11"));
choices.insert (p_t (50486, "Sigma 150-600mm f/5-6.3 DG OS HSM | C + MC-11"));
choices.insert (p_t (50487, "Sigma 20mm f/1.4 DG HSM | A + MC-11"));
choices.insert (p_t (50488, "Sigma 35mm f/1.4 DG HSM | A"));
@ -1294,8 +1149,11 @@ public:
choices.insert (p_t (50503, "Sigma 16mm f/1.4 DC DN | C"));
choices.insert (p_t (50507, "Sigma 105mm f/1.4 DG HSM | A"));
choices.insert (p_t (50508, "Sigma 56mm f/1.4 DC DN | C"));
choices.insert (p_t (50512, "Sigma 70-200mm f/2.8 DG OS HSM | S"));
choices.insert (p_t (50512, "Sigma 70-200mm f/2.8 DG OS HSM | S + MC-11"));
choices.insert (p_t (50513, "Sigma 70mm f/2.8 DG MACRO | A"));
choices.insert (p_t (50514, "Sigma 45mm f/2.8 DG DN | C"));
choices.insert (p_t (50515, "Sigma 35mm f/1.2 DG DN | A"));
choices.insert (p_t (50516, "Sigma 14-24mm f/2.8 DG DN | A"));
choices.insert (p_t (50992, "Voigtlander SUPER WIDE-HELIAR 15mm f/4.5 III"));
choices.insert (p_t (50993, "Voigtlander HELIAR-HYPER WIDE 10mm f/5.6"));
choices.insert (p_t (50994, "Voigtlander ULTRA WIDE-HELIAR 12mm f/5.6 III"));
@ -1304,9 +1162,15 @@ public:
choices.insert (p_t (50997, "Voigtlander NOKTON classic 35mm f/1.4"));
choices.insert (p_t (50998, "Voigtlander MACRO APO-LANTHAR 110mm f/2.5"));
choices.insert (p_t (50999, "Voigtlander COLOR-SKOPAR 21mm f/3.5 Aspherical"));
choices.insert (p_t (51505, "Samyang AF 14mm f/2.8 FE or Samyang AF 35mm f/2.8 FE"));
choices.insert (p_t (51505, "Samyang AF 35mm f/2.8 FE"));
choices.insert (p_t (51000, "Voigtlander NOKTON 50mm f/1.2 Aspherical"));
choices.insert (p_t (51001, "Voigtlander NOKTON 21mm f/1.4 Aspherical"));
choices.insert (p_t (51002, "Voigtlander APO-LANTHAR 50mm f/2 Aspherical"));
choices.insert (p_t (51504, "Samyang AF 50mm f/1.4"));
choices.insert (p_t (51505, "Samyang AF 14mm f/2.8 or Samyang AF 35mm f/2.8"));
choices.insert (p_t (51505, "Samyang AF 35mm f/2.8"));
choices.insert (p_t (51507, "Samyang AF 35mm f/1.4"));
choices.insert (p_t (51508, "Samyang AF 45mm f/1.8"));
choices.insert (p_t (51510, "Samyang AF 18mm f/2.8"));
}
std::string toString (const Tag* t) const override