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
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;