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

Updated rtexif using ExifTool-10.78, closes #4371

Browse Source
This commit is contained in:
Morgan Hardwood
2018-02-06 01:10:11 +01:00
parent 21f27e1f21
commit 12025f2851
6 changed files with 114 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

126
rtexif/canonattribs.cc
View File

@@ -660,9 +660,9 @@ public:
{125, "Canon TS-E 24mm f/3.5L"},
{126, "Canon TS-E 45mm f/2.8"},
{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 or Sigma Lens"},
{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"},
{131, "Sigma 8mm f/3.5 EX DG Circular Fisheye"},
{131, "Sigma 17-35mm f/2.8-4 EX DG Aspherical HSM"},
{131, "Sigma 17-70mm f/2.8-4.5 DC Macro"},
@@ -670,11 +670,11 @@ 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"},
{132, "Canon EF 1200mm f/5.6L"},
{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 or Sigma or Tamron Lens"},
{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"},
{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"},
{137, "Sigma 18-250mm f/3.5-6.3 DC OS HSM"},
@@ -692,11 +692,11 @@ public:
{137, "Sigma 18-35mm f/1.8 DC HSM"},
{137, "Sigma 12-24mm f/4.5-5.6 DG HSM II"},
{138, "Canon EF 28-80mm f/2.8-4L"},
{139, "Canon EF 400mm f/2.8L"},
{140, "Canon EF 500mm f/4.5L"},
{141, "Canon EF 500mm f/4.5L"},
{142, "Canon EF 300mm f/2.8L IS"},
{143, "Canon EF 500mm f/4L IS or Sigma Lens"},
{139, "Canon EF 400mm f/2.8L USM"},
{140, "Canon EF 500mm f/4.5L USM"},
{141, "Canon EF 500mm f/4.5L USM"},
{142, "Canon EF 300mm f/2.8L IS USM"},
{143, "Canon EF 500mm f/4L IS USM or Sigma Lens"},
{143, "Sigma 17-70mm f/2.8-4 DC Macro OS HSM"},
{144, "Canon EF 35-135mm f/4-5.6 USM"},
{145, "Canon EF 100-300mm f/4.5-5.6 USM"},
@@ -704,18 +704,18 @@ public:
{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 or Sigma Lens"},
{150, "Canon EF 14mm f/2.8L USM or Sigma Lens"},
{150, "Sigma 20mm EX f/1.8"},
{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"},
{151, "Canon EF 200mm f/2.8L"},
{152, "Canon EF 300mm f/4L IS or Sigma Lens"},
{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"},
{153, "Canon EF 35-350mm f/3.5-5.6L or Sigma or Tamron Lens"},
{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"},
@@ -724,7 +724,7 @@ public:
{154, "Zeiss Milvus 21mm f/2.8"},
{155, "Canon EF 85mm f/1.8 USM"},
{156, "Canon EF 28-105mm f/3.5-4.5 USM or Tamron Lens"},
{156, "Tamron SP 70-300mm f/4.0-5.6 Di VC USD"},
{156, "Tamron SP 70-300mm f/4-5.6 Di VC USD"},
{156, "Tamron SP AF 28-105mm f/2.8 LD Aspherical IF"},
{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"},
@@ -732,7 +732,7 @@ public:
{160, "Tokina AT-X 107 AF DX 10-17mm f/3.5-4.5 Fisheye"},
{160, "Tokina AT-X 116 AF Pro DX 11-16mm f/2.8"},
{160, "Tokina AT-X 11-20 F2.8 PRO DX Aspherical 11-20mm f/2.8"},
{161, "Canon EF 28-70mm f/2.8L or Sigma or Tamron Lens"},
{161, "Canon EF 28-70mm f/2.8L USM or Sigma or Tamron Lens"},
{161, "Sigma 24-70mm f/2.8 EX"},
{161, "Sigma 28-70mm f/2.8 EX"},
{161, "Sigma 24-60mm f/2.8 EX DG"},
@@ -740,15 +740,15 @@ public:
{161, "Tamron 90mm f/2.8"},
{161, "Tamron SP AF 17-35mm f/2.8-4 Di LD Aspherical IF"},
{161, "Tamron SP AF 28-75mm f/2.8 XR Di LD Aspherical [IF] Macro"},
{162, "Canon EF 200mm f/2.8L"},
{162, "Canon EF 200mm f/2.8L USM"},
{163, "Canon EF 300mm f/4L"},
{164, "Canon EF 400mm f/5.6L"},
{165, "Canon EF 70-200mm f/2.8 L"},
{166, "Canon EF 70-200mm f/2.8 L + 1.4x"},
{167, "Canon EF 70-200mm f/2.8 L + 2x"},
{165, "Canon EF 70-200mm f/2.8L USM"},
{166, "Canon EF 70-200mm f/2.8L USM + 1.4x"},
{167, "Canon EF 70-200mm f/2.8L USM + 2x"},
{168, "Canon EF 28mm f/1.8 USM or Sigma Lens"},
{168, "Sigma 50-100mm f/1.8 DC HSM | A"},
{169, "Canon EF 17-35mm f/2.8L or Sigma Lens"},
{169, "Canon EF 17-35mm f/2.8L USM or Sigma Lens"},
{169, "Sigma 18-200mm f/3.5-6.3 DC OS"},
{169, "Sigma 15-30mm f/3.5-4.5 EX DG Aspherical"},
{169, "Sigma 18-50mm f/2.8 Macro"},
@@ -756,46 +756,46 @@ public:
{169, "Sigma 85mm f/1.4 EX DG HSM"},
{169, "Sigma 30mm f/1.4 EX DC HSM"},
{169, "Sigma 35mm f/1.4 DG HSM"},
{170, "Canon EF 200mm f/2.8L II"},
{171, "Canon EF 300mm f/4L"},
{172, "Canon EF 400mm f/5.6L or Sigma Lens"},
{170, "Canon EF 200mm f/2.8L II USM"},
{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"},
{173, "Canon EF 180mm Macro f/3.5L or Sigma Lens"},
{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"},
{174, "Canon EF 135mm f/2L or Other Lens"},
{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"},
{175, "Canon EF 400mm f/2.8L"},
{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"},
{177, "Canon EF 300mm f/4L IS USM"},
{178, "Canon EF 28-135mm f/3.5-5.6 IS"},
{179, "Canon EF 24mm f/1.4L"},
{180, "Canon EF 35mm f/1.4L or Other Lens"},
{179, "Canon EF 24mm f/1.4L USM"},
{180, "Canon EF 35mm f/1.4L USM or Other Lens"},
{180, "Sigma 50mm f/1.4 DG HSM | A"},
{180, "Sigma 24mm f/1.4 DG HSM | A"},
{180, "Zeiss Milvus 50mm f/1.4"},
{180, "Zeiss Milvus 85mm f/1.4"},
{180, "Zeiss Otus 28mm f/1.4 ZE"},
{181, "Canon EF 100-400mm f/4.5-5.6L IS + 1.4x or Sigma Lens"},
{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 + 2x or Sigma Lens"},
{182, "Canon EF 100-400mm f/4.5-5.6L IS USM + 2x or Sigma Lens"},
{182, "Sigma 150-600mm f/5-6.3 DG OS HSM | S + 2x"},
{183, "Canon EF 100-400mm f/4.5-5.6L IS or Sigma Lens"},
{183, "Canon EF 100-400mm f/4.5-5.6L IS USM or Sigma Lens"},
{183, "Sigma 150mm f/2.8 EX DG OS HSM APO Macro"},
{183, "Sigma 105mm f/2.8 EX DG OS HSM Macro"},
{183, "Sigma 180mm f/2.8 EX DG OS HSM APO Macro"},
{183, "Sigma 150-600mm f/5-6.3 DG OS HSM | C"},
{183, "Sigma 150-600mm f/5-6.3 DG OS HSM | S"},
{183, "Sigma 100-400mm f/5-6.3 DG OS HSM"},
{184, "Canon EF 400mm f/2.8L + 2x"},
{185, "Canon EF 600mm f/4L IS"},
{186, "Canon EF 70-200mm f/4L"},
{187, "Canon EF 70-200mm f/4L + 1.4x"},
{188, "Canon EF 70-200mm f/4L + 2x"},
{189, "Canon EF 70-200mm f/4L + 2.8x"},
{184, "Canon EF 400mm f/2.8L USM + 2x"},
{185, "Canon EF 600mm f/4L IS USM"},
{186, "Canon EF 70-200mm f/4L USM"},
{187, "Canon EF 70-200mm f/4L USM + 1.4x"},
{188, "Canon EF 70-200mm f/4L USM + 2x"},
{189, "Canon EF 70-200mm f/4L USM + 2.8x"},
{190, "Canon EF 100mm f/2.8 Macro USM"},
{191, "Canon EF 400mm f/4 DO IS"},
{193, "Canon EF 35-80mm f/4-5.6 USM"},
@@ -824,35 +824,35 @@ public:
{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"},
{224, "Canon EF 70-200mm f/2.8L IS"},
{225, "Canon EF 70-200mm f/2.8L IS + 1.4x"},
{226, "Canon EF 70-200mm f/2.8L IS + 2x"},
{227, "Canon EF 70-200mm f/2.8L IS + 2.8x"},
{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"},
{227, "Canon EF 70-200mm f/2.8L IS USM + 2.8x"},
{228, "Canon EF 28-105mm f/3.5-4.5 USM"},
{229, "Canon EF 16-35mm f/2.8L"},
{230, "Canon EF 24-70mm f/2.8L"},
{231, "Canon EF 17-40mm f/4L"},
{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"},
{232, "Canon EF 70-300mm f/4.5-5.6 DO IS USM"},
{233, "Canon EF 28-300mm f/3.5-5.6L IS"},
{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"},
{234, "Tokina AT-X 12-28 PRO DX 12-28mm f/4"},
{235, "Canon EF-S 10-22mm f/3.5-4.5 USM"},
{236, "Canon EF-S 60mm f/2.8 Macro USM"},
{237, "Canon EF 24-105mm f/4L IS"},
{237, "Canon EF 24-105mm f/4L IS USM"},
{238, "Canon EF 70-300mm f/4-5.6 IS USM"},
{239, "Canon EF 85mm f/1.2L II"},
{239, "Canon EF 85mm f/1.2L II USM"},
{240, "Canon EF-S 17-55mm f/2.8 IS USM"},
{241, "Canon EF 50mm f/1.2L"},
{242, "Canon EF 70-200mm f/4L IS"},
{243, "Canon EF 70-200mm f/4L IS + 1.4x"},
{244, "Canon EF 70-200mm f/4L IS + 2x"},
{245, "Canon EF 70-200mm f/4L IS + 2.8x"},
{246, "Canon EF 16-35mm f/2.8L II"},
{241, "Canon EF 50mm f/1.2L USM"},
{242, "Canon EF 70-200mm f/4L IS USM"},
{243, "Canon EF 70-200mm f/4L IS USM + 1.4x"},
{244, "Canon EF 70-200mm f/4L IS USM + 2x"},
{245, "Canon EF 70-200mm f/4L IS USM + 2.8x"},
{246, "Canon EF 16-35mm f/2.8L II USM"},
{247, "Canon EF 14mm f/2.8L II USM"},
{248, "Canon EF 200mm f/2L IS or Sigma Lens"},
{248, "Canon EF 200mm f/2L IS USM or Sigma Lens"},
{248, "Sigma 24-35mm f/2 DG HSM | A"},
{249, "Canon EF 800mm f/5.6L IS"},
{250, "Canon EF 24mm f/1.4L II or Sigma Lens"},
{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"},
{251, "Canon EF 70-200mm f/2.8L IS II USM"},
{252, "Canon EF 70-200mm f/2.8L IS II USM + 1.4x"},
@@ -869,7 +869,7 @@ public:
{492, "Canon EF 400mm f/2.8L IS II USM"},
{493, "Canon EF 500mm f/4L IS II USM or EF 24-105mm f4L IS USM"},
{493, "Canon EF 24-105mm f/4L IS USM"},
{494, "Canon EF 600mm f/4.0L IS II 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"},
{496, "Canon EF 200-400mm f/4L IS USM"},
@@ -888,6 +888,7 @@ public:
{750, "Canon EF 35mm f/1.4L II USM"},
{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"},
{4142, "Canon EF-S 18-135mm f/3.5-5.6 IS STM"},
{4143, "Canon EF-M 18-55mm f/3.5-5.6 IS STM or Tamron Lens"},
{4143, "Tamron 18-200mm f/3.5-6.3 Di III VC"},
@@ -1702,6 +1703,7 @@ public:
choices[68485120] = "PowerShot ELPH 185 / IXUS 185 / IXY 200";
choices[68550656] = "PowerShot SX430 IS";
choices[68616192] = "PowerShot SX730 HS";
choices[68681728] = "PowerShot G1 X Mark III";
choices[100925440] = "PowerShot S100 / Digital IXUS / IXY Digital";
choices[1074255475] = "DC19/DC21/DC22";
choices[1074255476] = "XH A1";