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

Updated all lens interpreters with data from exiftool-10.20

Browse Source
This commit is contained in:
Morgan Hardwood
2016-06-19 17:02:07 +02:00
parent b526050b6b
commit 0189a99e1c
5 changed files with 136 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
rtexif/canonattribs.cc
View File

@@ -593,6 +593,8 @@ public:
choices.insert(p_t(44, "Canon EF 90-300mm f/4.5-5.6"));
choices.insert(p_t(45, "Canon EF-S 18-55mm f/3.5-5.6 [II]"));
choices.insert(p_t(46, "Canon EF 28-90mm f/4-5.6"));
choices.insert(p_t(47, "Zeiss Milvus 35mm f/2 or 50mm f/2"));
choices.insert(p_t(47, "Zeiss Milvus 50mm f/2 Makro"));
choices.insert(p_t(48, "Canon EF-S 18-55mm f/3.5-5.6 IS"));
choices.insert(p_t(49, "Canon EF-S 55-250mm f/4-5.6 IS"));
choices.insert(p_t(50, "Canon EF-S 18-200mm f/3.5-5.6 IS"));
@@ -626,9 +628,9 @@ public:
choices.insert(p_t(137, "Sigma 18-250mm f/3.5-6.3 DC OS HSM"));
choices.insert(p_t(137, "Sigma 24-70mm f/2.8 IF EX DG HSM"));
choices.insert(p_t(137, "Sigma 18-125mm f/3.8-5.6 DC OS HSM"));
choices.insert(p_t(137, "Sigma 17-70mm f/2.8-4 DC Macro OS HSM"));
choices.insert(p_t(137, "Sigma 17-70mm f/2.8-4 DC Macro OS HSM | C"));
choices.insert(p_t(137, "Sigma 17-50mm f/2.8 OS HSM"));
choices.insert(p_t(137, "Sigma 18-200mm f/3.5-6.3 II DC OS HSM"));
choices.insert(p_t(137, "Sigma 18-200mm f/3.5-6.3 DC OS HSM [II]"));
choices.insert(p_t(137, "Tamron AF 18-270mm f/3.5-6.3 Di II VC PZD"));
choices.insert(p_t(137, "Sigma 8-16mm f/4.5-5.6 DC HSM"));
choices.insert(p_t(137, "Tamron SP 17-50mm f/2.8 XR Di II VC"));
@@ -642,7 +644,8 @@ public:
choices.insert(p_t(140, "Canon EF 500mm f/4.5L"));
choices.insert(p_t(141, "Canon EF 500mm f/4.5L"));
choices.insert(p_t(142, "Canon EF 300mm f/2.8L IS"));
choices.insert(p_t(143, "Canon EF 500mm f/4L IS"));
choices.insert(p_t(143, "Canon EF 500mm f/4L IS or Sigma Lens"));
choices.insert(p_t(143, "Sigma 17-70mm f/2.8-4 DC Macro OS HSM"));
choices.insert(p_t(144, "Canon EF 35-135mm f/4-5.6 USM"));
choices.insert(p_t(145, "Canon EF 100-300mm f/4.5-5.6 USM"));
choices.insert(p_t(146, "Canon EF 70-210mm f/3.5-4.5 USM"));
@@ -665,15 +668,18 @@ public:
choices.insert(p_t(153, "Tamron AF 28-300mm f/3.5-6.3 XR LD Aspherical [IF] Macro"));
choices.insert(p_t(153, "Tamron AF 18-200mm f/3.5-6.3 XR Di II LD Aspherical [IF] Macro Model A14"));
choices.insert(p_t(153, "Tamron 18-250mm f/3.5-6.3 Di II LD Aspherical [IF] Macro"));
choices.insert(p_t(154, "Canon EF 20mm f/2.8 USM"));
choices.insert(p_t(154, "Canon EF 20mm f/2.8 USM or Zeiss Lens"));
choices.insert(p_t(154, "Zeiss Milvus 21mm f/2.8"));
choices.insert(p_t(155, "Canon EF 85mm f/1.8 USM"));
choices.insert(p_t(156, "Canon EF 28-105mm f/3.5-4.5 USM or Tamron Lens"));
choices.insert(p_t(156, "Tamron SP 70-300mm f/4.0-5.6 Di VC USD"));
choices.insert(p_t(156, "Tamron SP AF 28-105mm f/2.8 LD Aspherical IF"));
choices.insert(p_t(160, "Canon EF 20-35mm f/3.5-4.5 USM or Tamron or Tokina Lens"));
choices.insert(p_t(160, "Tamron AF 19-35mm f/3.5-4.5"));
choices.insert(p_t(160, "Tokina AT-X 124 AF Pro DX 12-24mm f/4"));
choices.insert(p_t(160, "Tokina AT-X 107 AF DX 10-17mm f/3.5-4.5 Fisheye"));
choices.insert(p_t(160, "Tokina AT-X 116 AF Pro DX 11-16mm f/2.8"));
choices.insert(p_t(160, "Tokina AT-X 11-20 F2.8 PRO DX Aspherical 11-20mm f/2.8"));
choices.insert(p_t(161, "Canon EF 28-70mm f/2.8L or Sigma or Tamron Lens"));
choices.insert(p_t(161, "Sigma 24-70mm f/2.8 EX"));
choices.insert(p_t(161, "Sigma 28-70mm f/2.8 EX"));
@@ -688,7 +694,8 @@ public:
choices.insert(p_t(165, "Canon EF 70-200mm f/2.8 L"));
choices.insert(p_t(166, "Canon EF 70-200mm f/2.8 L + 1.4x"));
choices.insert(p_t(167, "Canon EF 70-200mm f/2.8 L + 2x"));
choices.insert(p_t(168, "Canon EF 28mm f/1.8 USM"));
choices.insert(p_t(168, "Canon EF 28mm f/1.8 USM or Sigma Lens"));
choices.insert(p_t(168, "Sigma 50-100mm f/1.8 DC HSM | A"));
choices.insert(p_t(169, "Canon EF 17-35mm f/2.8L or Sigma Lens"));
choices.insert(p_t(169, "Sigma 18-200mm f/3.5-6.3 DC OS"));
choices.insert(p_t(169, "Sigma 15-30mm f/3.5-4.5 EX DG Aspherical"));
@@ -704,25 +711,32 @@ public:
choices.insert(p_t(173, "Canon EF 180mm Macro f/3.5L or Sigma Lens"));
choices.insert(p_t(173, "Sigma 180mm EX HSM Macro f/3.5"));
choices.insert(p_t(173, "Sigma APO Macro 150mm f/2.8 EX DG HSM"));
choices.insert(p_t(174, "Canon EF 135mm f/2L or Sigma Lens"));
choices.insert(p_t(174, "Canon EF 135mm f/2L or Other Lens"));
choices.insert(p_t(174, "Sigma 70-200mm f/2.8 EX DG APO OS HSM"));
choices.insert(p_t(174, "Sigma 50-500mm f/4.5-6.3 APO DG OS HSM"));
choices.insert(p_t(174, "Sigma 150-500mm f/5-6.3 APO DG OS HSM"));
choices.insert(p_t(174, "Zeiss Milvus 100mm f/2 Makro"));
choices.insert(p_t(175, "Canon EF 400mm f/2.8L"));
choices.insert(p_t(176, "Canon EF 24-85mm f/3.5-4.5 USM"));
choices.insert(p_t(177, "Canon EF 300mm f/4L IS"));
choices.insert(p_t(178, "Canon EF 28-135mm f/3.5-5.6 IS"));
choices.insert(p_t(179, "Canon EF 24mm f/1.4L"));
choices.insert(p_t(180, "Canon EF 35mm f/1.4L or Sigma Lens"));
choices.insert(p_t(180, "Canon EF 35mm f/1.4L or Other Lens"));
choices.insert(p_t(180, "Sigma 50mm f/1.4 DG HSM | A"));
choices.insert(p_t(180, "Sigma 24mm f/1.4 DG HSM | A"));
choices.insert(p_t(181, "Canon EF 100-400mm f/4.5-5.6L IS + 1.4x"));
choices.insert(p_t(182, "Canon EF 100-400mm f/4.5-5.6L IS + 2x"));
choices.insert(p_t(180, "Zeiss Milvus 50mm f/1.4"));
choices.insert(p_t(180, "Zeiss Milvus 85mm f/1.4"));
choices.insert(p_t(180, "Zeiss Otus 28mm f/1.4 ZE"));
choices.insert(p_t(181, "Canon EF 100-400mm f/4.5-5.6L IS + 1.4x or Sigma Lens"));
choices.insert(p_t(181, "Sigma 150-600mm f/5-6.3 DG OS HSM | S + 1.4x"));
choices.insert(p_t(182, "Canon EF 100-400mm f/4.5-5.6L IS + 2x or Sigma Lens"));
choices.insert(p_t(182, "Sigma 150-600mm f/5-6.3 DG OS HSM | S + 2x"));
choices.insert(p_t(183, "Canon EF 100-400mm f/4.5-5.6L IS or Sigma Lens"));
choices.insert(p_t(183, "Sigma 150mm f/2.8 EX DG OS HSM APO Macro"));
choices.insert(p_t(183, "Sigma 105mm f/2.8 EX DG OS HSM Macro"));
choices.insert(p_t(183, "Sigma 180mm f/2.8 EX DG OS HSM APO Macro"));
choices.insert(p_t(183, "Sigma 150-600mm f/5-6.3 DG OS HSM | C"));
choices.insert(p_t(183, "Sigma 150-600mm f/5-6.3 DG OS HSM | S"));
choices.insert(p_t(184, "Canon EF 400mm f/2.8L + 2x"));
choices.insert(p_t(185, "Canon EF 600mm f/4L IS"));
choices.insert(p_t(186, "Canon EF 70-200mm f/4L"));
@@ -751,6 +765,8 @@ public:
choices.insert(p_t(213, "Canon EF 90-300mm f/4.5-5.6 USM or Tamron Lens"));
choices.insert(p_t(213, "Tamron SP 150-600mm f/5-6.3 Di VC USD"));
choices.insert(p_t(213, "Tamron 16-300mm f/3.5-6.3 Di II VC PZD Macro"));
choices.insert(p_t(213, "Tamron SP 35mm f/1.8 Di VC USD"));
choices.insert(p_t(213, "Tamron SP 45mm f/1.8 Di VC USD"));
choices.insert(p_t(214, "Canon EF-S 18-55mm f/3.5-5.6 USM"));
choices.insert(p_t(215, "Canon EF 55-200mm f/4.5-5.6 II USM"));
choices.insert(p_t(217, "Tamron AF 18-270mm f/3.5-6.3 Di II VC PZD"));
@@ -765,7 +781,7 @@ public:
choices.insert(p_t(232, "Canon EF 70-300mm f/4.5-5.6 DO IS USM"));
choices.insert(p_t(233, "Canon EF 28-300mm f/3.5-5.6L IS"));
choices.insert(p_t(234, "Canon EF-S 17-85mm f/4-5.6 IS USM or Tokina Lens"));
choices.insert(p_t(234, "Tokina AT-X 12-28mm f/4 PRO DX"));
choices.insert(p_t(234, "Tokina AT-X 12-28 PRO DX 12-28mm f/4"));
choices.insert(p_t(235, "Canon EF-S 10-22mm f/3.5-4.5 USM"));
choices.insert(p_t(236, "Canon EF-S 60mm f/2.8 Macro USM"));
choices.insert(p_t(237, "Canon EF 24-105mm f/4L IS"));
@@ -779,9 +795,11 @@ public:
choices.insert(p_t(245, "Canon EF 70-200mm f/4L IS + 2.8x"));
choices.insert(p_t(246, "Canon EF 16-35mm f/2.8L II"));
choices.insert(p_t(247, "Canon EF 14mm f/2.8L II USM"));
choices.insert(p_t(248, "Canon EF 200mm f/2L IS"));
choices.insert(p_t(248, "Canon EF 200mm f/2L IS or Sigma Lens"));
choices.insert(p_t(248, "Sigma 24-35mm f/2 DG HSM | A"));
choices.insert(p_t(249, "Canon EF 800mm f/5.6L IS"));
choices.insert(p_t(250, "Canon EF 24 f/1.4L II"));
choices.insert(p_t(250, "Canon EF 24mm f/1.4L II or Sigma Lens"));
choices.insert(p_t(250, "Sigma 20mm f/1.4 DG HSM | A"));
choices.insert(p_t(251, "Canon EF 70-200mm f/2.8L IS II USM"));
choices.insert(p_t(252, "Canon EF 70-200mm f/2.8L IS II USM + 1.4x"));
choices.insert(p_t(253, "Canon EF 70-200mm f/2.8L IS II USM + 2x"));
@@ -807,6 +825,8 @@ public:
choices.insert(p_t(507, "Canon EF 16-35mm f/4L IS USM"));
choices.insert(p_t(508, "Canon EF 11-24mm f/4L USM"));
choices.insert(p_t(747, "Canon EF 100-400mm f/4.5-5.6L IS II USM"));
choices.insert(p_t(748, "Canon EF 100-400mm f/4.5-5.6L IS II USM + 1.4x"));
choices.insert(p_t(750, "Canon EF 35mm f/1.4L II USM"));
choices.insert(p_t(4142, "Canon EF-S 18-135mm f/3.5-5.6 IS STM"));
choices.insert(p_t(4143, "Canon EF-M 18-55mm f/3.5-5.6 IS STM or Tamron Lens"));
choices.insert(p_t(4143, "Tamron 18-200mm f/3.5-6.3 Di III VC"));
@@ -818,8 +838,12 @@ public:
choices.insert(p_t(4149, "Canon EF-M 55-200mm f/4.5-6.3 IS STM"));
choices.insert(p_t(4150, "Canon EF-S 10-18mm f/4.5-5.6 IS STM"));
choices.insert(p_t(4152, "Canon EF 24-105mm f/3.5-5.6 IS STM"));
choices.insert(p_t(4153, "Canon EF-M 15-45mm f/3.5-6.3 IS STM"));
choices.insert(p_t(4154, "Canon EF-S 24mm f/2.8 STM"));
choices.insert(p_t(4155, "Canon EF-M 28mm f/3.5 Macro IS STM "));
choices.insert(p_t(4156, "Canon EF 50mm f/1.8 STM"));
choices.insert(p_t(36912, "Canon EF-S 18-135mm f/3.5-5.6 IS USM"));
choices.insert(p_t(65535, "n/a"));
}
virtual std::string toString (Tag* t)