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

68
rtexif/sonyminoltaattribs.cc
View File

@@ -611,7 +611,7 @@ public:
choices.insert(p_t(55, "Sony DT 18-55mm f/3.5-5.6 SAM (SAL1855) or SAM II"));
choices.insert(p_t(55, "Sony DT 18-55mm f/3.5-5.6 SAM II (SAL18552)"));
choices.insert(p_t(56, "Sony DT 55-200mm f/4-5.6 SAM (SAL55200-2)"));
choices.insert(p_t(57, "Sony DT 50mm f/1.8 SAM (SAL50F18) or Tamron Lens"));
choices.insert(p_t(57, "Sony DT 50mm f/1.8 SAM (SAL50F18) or Tamron Lens or Commlite CM-EF-NEX adapter"));
choices.insert(p_t(57, "Tamron SP AF 60mm f/2 Di II LD [IF] Macro 1:1"));
choices.insert(p_t(57, "Tamron 18-270mm f/3.5-6.3 Di II PZD"));
choices.insert(p_t(58, "Sony DT 30mm f/2.8 Macro SAM (SAL30M28)"));
@@ -648,6 +648,7 @@ public:
choices.insert(p_t(128, "Tamron AF 28-105mm f/4-5.6 [IF]"));
choices.insert(p_t(128, "Sigma 35mm f/1.4 DG HSM"));
choices.insert(p_t(128, "Sigma 18-35mm f/1.8 DC HSM"));
choices.insert(p_t(128, "Sigma 50-500mm f/4.5-6.3 APO DG OS HSM"));
choices.insert(p_t(129, "Tamron Lens (129)"));
choices.insert(p_t(129, "Tamron 200-400mm f/5.6 LD"));
choices.insert(p_t(129, "Tamron 70-300mm f/4-5.6 LD"));
@@ -675,6 +676,7 @@ public:
choices.insert(p_t(255, "Tamron SP AF 70-200mm f/2.8 Di LD IF Macro"));
choices.insert(p_t(255, "Tamron SP AF 28-75mm f/2.8 XR Di LD Aspherical IF"));
choices.insert(p_t(255, "Tamron AF 90-300mm f/4.5-5.6 Telemacro"));
choices.insert(p_t(1868, "Sigma MC-11 Adapter"));
choices.insert(p_t(2550, "Minolta AF 50mm f/1.7"));
choices.insert(p_t(2551, "Minolta AF 35-70mm f/4 or Other Lens"));
choices.insert(p_t(2551, "Sigma UC AF 28-70mm f/3.5-4.5"));
@@ -723,7 +725,7 @@ public:
choices.insert(p_t(2563, "Sigma 400mm f/5.6 APO"));
choices.insert(p_t(2564, "Minolta AF 50mm f/2.8 Macro or Sigma Lens"));
choices.insert(p_t(2564, "Sigma 50mm f/2.8 EX Macro"));
choices.insert(p_t(2565, "Minolta AF 600mm f/4"));
choices.insert(p_t(2565, "Minolta AF 600mm f/4 APO"));
choices.insert(p_t(2566, "Minolta AF 24mm f/2.8 or Sigma Lens"));
choices.insert(p_t(2566, "Sigma 17-35mm f/2.8-4 EX Aspherical"));
choices.insert(p_t(2572, "Minolta/Sony AF 500mm f/8 Reflex"));
@@ -749,7 +751,7 @@ public:
choices.insert(p_t(2590, "Minolta AF 600mm f/4 HS-APO G + Minolta AF 1.4x APO"));
choices.insert(p_t(2591, "Minolta AF 35mm f/1.4"));
choices.insert(p_t(2592, "Minolta AF 85mm f/1.4 G (D)"));
choices.insert(p_t(2593, "Minolta AF 200mm f/2.8 G APO"));
choices.insert(p_t(2593, "Minolta AF 200mm f/2.8 APO"));
choices.insert(p_t(2594, "Minolta AF 3x-1x f/1.7-2.8 Macro"));
choices.insert(p_t(2596, "Minolta AF 28mm f/2"));
choices.insert(p_t(2597, "Minolta AF 35mm f/2 [New]"));
@@ -771,7 +773,7 @@ public:
choices.insert(p_t(2620, "Minolta AF 28-70mm f/2.8 G"));
choices.insert(p_t(2621, "Minolta AF 100-300mm f/4.5-5.6 xi"));
choices.insert(p_t(2624, "Minolta AF 35-80mm f/4-5.6 Power Zoom"));
choices.insert(p_t(2628, "Minolta AF 80-200mm f/2.8 G"));
choices.insert(p_t(2628, "Minolta AF 80-200mm f/2.8 HS-APO G"));
choices.insert(p_t(2629, "Minolta AF 85mm f/1.4 New"));
choices.insert(p_t(2631, "Minolta/Sony AF 100-300mm f/4.5-5.6 APO"));
choices.insert(p_t(2632, "Minolta AF 24-50mm f/4 New"));
@@ -795,7 +797,8 @@ public:
choices.insert(p_t(4585, "Tamron SP AF 300mm f/2.8 LD IF"));
choices.insert(p_t(4586, "Tamron SP AF 35-105mm f/2.8 LD Aspherical IF"));
choices.insert(p_t(4587, "Tamron AF 70-210mm f/2.8 SP LD"));
choices.insert(p_t(6118, "Metabones Canon EF Adapter"));
choices.insert(p_t(4812, "Metabones Canon EF Speed Booster Ultra"));
choices.insert(p_t(6118, "Canon EF Adapter"));
choices.insert(p_t(6553, "E-Mount, T-Mount, Other Lens or no lens"));
choices.insert(p_t(6553, "Sony E 16mm f/2.8"));
choices.insert(p_t(6553, "Sony E 18-55mm f/3.5-5.6 OSS"));
@@ -824,14 +827,22 @@ public:
choices.insert(p_t(6553, "Sony FE 24-240mm f/3.5-6.3 OSS"));
choices.insert(p_t(6553, "Sony FE 28mm f/2"));
choices.insert(p_t(6553, "Sony FE PZ 28-135mm f/4 G OSS"));
choices.insert(p_t(6553, "Sony FE 24-70mm f/2.8 GM"));
choices.insert(p_t(6553, "Sony FE 85mm f/1.4 GM"));
choices.insert(p_t(6553, "Sony FE 50mm f/1.8"));
choices.insert(p_t(6553, "Sony FE 21mm f/2.8 (SEL28F20 + SEL075UWC)"));
choices.insert(p_t(6553, "Sony FE 16mm f/3.5 Fisheye (SEL28F20 + SEL057FEC)"));
choices.insert(p_t(6553, "Sony FE 70-300mm f/4.5-5.6 G OSS"));
choices.insert(p_t(6553, "Sony FE 70-200mm f/2.8 GM OSS"));
choices.insert(p_t(6553, "Sigma 19mm f/2.8 [EX] DN"));
choices.insert(p_t(6553, "Sigma 30mm f/2.8 [EX] DN"));
choices.insert(p_t(6553, "Sigma 60mm f/2.8 DN"));
choices.insert(p_t(6553, "Sigma 30mm f/1.4 DC DN | C"));
choices.insert(p_t(6553, "Tamron 18-200mm f/3.5-6.3 Di III VC"));
choices.insert(p_t(6553, "Zeiss Batis 25mm f/2"));
choices.insert(p_t(6553, "Zeiss Batis 85mm f/1.8"));
choices.insert(p_t(6553, "Zeiss Batis 18mm f/2.8"));
choices.insert(p_t(6553, "Zeiss Loxia 21mm f/2.8"));
choices.insert(p_t(6553, "Zeiss Loxia 35mm f/2"));
choices.insert(p_t(6553, "Zeiss Loxia 50mm f/2"));
choices.insert(p_t(6553, "Zeiss Touit 12mm f/2.8"));
@@ -844,6 +855,7 @@ public:
choices.insert(p_t(6553, "Pentacon Auto 135mm f/2.8"));
choices.insert(p_t(6553, "Pentacon Auto 29mm f/2.8"));
choices.insert(p_t(6553, "Helios 44-2 58mm f/2.0"));
choices.insert(p_t(18688, "Sigma MC-11 Adapter"));
choices.insert(p_t(25501, "Minolta AF 50mm f/1.7"));
choices.insert(p_t(25511, "Minolta AF 35-70mm f/4 or Other Lens"));
choices.insert(p_t(25511, "Sigma UC AF 28-70mm f/3.5-4.5"));
@@ -892,7 +904,7 @@ public:
choices.insert(p_t(25631, "Sigma 400mm f/5.6 APO"));
choices.insert(p_t(25641, "Minolta AF 50mm f/2.8 Macro or Sigma Lens"));
choices.insert(p_t(25641, "Sigma 50mm f/2.8 EX Macro"));
choices.insert(p_t(25651, "Minolta AF 600mm f/4"));
choices.insert(p_t(25651, "Minolta AF 600mm f/4 APO"));
choices.insert(p_t(25661, "Minolta AF 24mm f/2.8 or Sigma Lens"));
choices.insert(p_t(25661, "Sigma 17-35mm f/2.8-4 EX Aspherical"));
choices.insert(p_t(25721, "Minolta/Sony AF 500mm f/8 Reflex"));
@@ -918,7 +930,7 @@ public:
choices.insert(p_t(25901, "Minolta AF 600mm f/4 HS-APO G + Minolta AF 1.4x APO"));
choices.insert(p_t(25911, "Minolta AF 35mm f/1.4"));
choices.insert(p_t(25921, "Minolta AF 85mm f/1.4 G (D)"));
choices.insert(p_t(25931, "Minolta AF 200mm f/2.8 G APO"));
choices.insert(p_t(25931, "Minolta AF 200mm f/2.8 APO"));
choices.insert(p_t(25941, "Minolta AF 3x-1x f/1.7-2.8 Macro"));
choices.insert(p_t(25961, "Minolta AF 28mm f/2"));
choices.insert(p_t(25971, "Minolta AF 35mm f/2 [New]"));
@@ -940,7 +952,7 @@ public:
choices.insert(p_t(26201, "Minolta AF 28-70mm f/2.8 G"));
choices.insert(p_t(26211, "Minolta AF 100-300mm f/4.5-5.6 xi"));
choices.insert(p_t(26241, "Minolta AF 35-80mm f/4-5.6 Power Zoom"));
choices.insert(p_t(26281, "Minolta AF 80-200mm f/2.8 G"));
choices.insert(p_t(26281, "Minolta AF 80-200mm f/2.8 HS-APO G"));
choices.insert(p_t(26291, "Minolta AF 85mm f/1.4 New"));
choices.insert(p_t(26311, "Minolta/Sony AF 100-300mm f/4.5-5.6 APO"));
choices.insert(p_t(26321, "Minolta AF 24-50mm f/4 New"));
@@ -964,7 +976,8 @@ public:
choices.insert(p_t(45851, "Tamron SP AF 300mm f/2.8 LD IF"));
choices.insert(p_t(45861, "Tamron SP AF 35-105mm f/2.8 LD Aspherical IF"));
choices.insert(p_t(45871, "Tamron AF 70-210mm f/2.8 SP LD"));
choices.insert(p_t(61184, "Metabones Canon EF Adapter"));
choices.insert(p_t(48128, "Metabones Canon EF Speed Booster Ultra"));
choices.insert(p_t(61184, "Canon EF Adapter"));
choices.insert(p_t(65535, "E-Mount, T-Mount, Other Lens or no lens"));
choices.insert(p_t(65535, "Sony E 16mm f/2.8"));
choices.insert(p_t(65535, "Sony E 18-55mm f/3.5-5.6 OSS"));
@@ -993,14 +1006,22 @@ public:
choices.insert(p_t(65535, "Sony FE 24-240mm f/3.5-6.3 OSS"));
choices.insert(p_t(65535, "Sony FE 28mm f/2"));
choices.insert(p_t(65535, "Sony FE PZ 28-135mm f/4 G OSS"));
choices.insert(p_t(65535, "Sony FE 24-70mm f/2.8 GM"));
choices.insert(p_t(65535, "Sony FE 85mm f/1.4 GM"));
choices.insert(p_t(65535, "Sony FE 50mm f/1.8"));
choices.insert(p_t(65535, "Sony FE 21mm f/2.8 (SEL28F20 + SEL075UWC)"));
choices.insert(p_t(65535, "Sony FE 16mm f/3.5 Fisheye (SEL28F20 + SEL057FEC)"));
choices.insert(p_t(65535, "Sony FE 70-300mm f/4.5-5.6 G OSS"));
choices.insert(p_t(65535, "Sony FE 70-200mm f/2.8 GM OSS"));
choices.insert(p_t(65535, "Sigma 19mm f/2.8 [EX] DN"));
choices.insert(p_t(65535, "Sigma 30mm f/2.8 [EX] DN"));
choices.insert(p_t(65535, "Sigma 60mm f/2.8 DN"));
choices.insert(p_t(65535, "Sigma 30mm f/1.4 DC DN | C"));
choices.insert(p_t(65535, "Tamron 18-200mm f/3.5-6.3 Di III VC"));
choices.insert(p_t(65535, "Zeiss Batis 25mm f/2"));
choices.insert(p_t(65535, "Zeiss Batis 85mm f/1.8"));
choices.insert(p_t(65535, "Zeiss Batis 18mm f/2.8"));
choices.insert(p_t(65535, "Zeiss Loxia 21mm f/2.8"));
choices.insert(p_t(65535, "Zeiss Loxia 35mm f/2"));
choices.insert(p_t(65535, "Zeiss Loxia 50mm f/2"));
choices.insert(p_t(65535, "Zeiss Touit 12mm f/2.8"));
@@ -1060,8 +1081,8 @@ public:
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 IV"));
choices.insert(p_t(234, "Adapter only - no lens attached"));
choices.insert(p_t(78, "Metabones Canon EF Smart Adapter Mark III or Other Adapter"));
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"));
choices.insert(p_t(32785, "Sony E 18-55mm f/3.5-5.6 OSS"));
@@ -1090,10 +1111,35 @@ public:
choices.insert(p_t(32815, "Sony FE 24-240mm f/3.5-6.3 OSS"));
choices.insert(p_t(32816, "Sony FE 28mm f/2"));
choices.insert(p_t(32817, "Sony FE PZ 28-135mm f/4 G OSS"));
choices.insert(p_t(32821, "Sony FE 24-70mm f/2.8 GM"));
choices.insert(p_t(32823, "Sony FE 85mm f/1.4 GM"));
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)"));
choices.insert(p_t(32828, "Sony FE 70-300mm f/4.5-5.6 G OSS"));
choices.insert(p_t(32830, "Sony FE 70-200mm f/2.8 GM OSS"));
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"));
choices.insert(p_t(49216, "Zeiss Batis 25mm f/2"));
choices.insert(p_t(49217, "Zeiss Batis 85mm f/1.8"));
choices.insert(p_t(49218, "Zeiss Batis 18mm f/2.8"));
choices.insert(p_t(49232, "Zeiss Loxia 50mm f/2"));
choices.insert(p_t(49233, "Zeiss Loxia 35mm f/2"));
choices.insert(p_t(49234, "Zeiss Loxia 21mm f/2.8"));
choices.insert(p_t(50480, "Sigma 30mm f/1.4 DC DN | C 016"));
choices.insert(p_t(50481, "Sigma 50mm f/1.4 DG HSM | A 014 + MC-11"));
choices.insert(p_t(50482, "Sigma 18-300mm f/3.5-6.3 DC MACRO OS HSM | C 014 + MC-11"));
choices.insert(p_t(50483, "Sigma 18-35mm f/1.8 DC HSM | A 013 + MC-11"));
choices.insert(p_t(50484, "Sigma 24-35mm f/2 DG HSM | A 015 + MC-11"));
choices.insert(p_t(50486, "Sigma 150-600mm f/5-6.3 DG OS HSM | C 015 + MC-11"));
choices.insert(p_t(50487, "Sigma 20mm f/1.4 DG HSM | A 015 + MC-11"));
choices.insert(p_t(50488, "Sigma 35mm f/1.4 DG HSM | A 012 + MC-11"));
choices.insert(p_t(50489, "Sigma 150-600mm f/5-6.3 DG OS HSM | S 014 + MC-11"));
choices.insert(p_t(50490, "Sigma 120-300mm f/2.8 DG OS HSM | S 013 + MC-11"));
choices.insert(p_t(50492, "Sigma 24-105mm f/4 DG OS HSM | A 013 + MC-11"));
choices.insert(p_t(50493, "Sigma 17-70mm f/2.8-4 DC MACRO OS HSM | C 013 + MC-11"));
choices.insert(p_t(50495, "Sigma 50-100mm f/1.8 DC HSM | A 016 + MC-11"));
}
virtual std::string toString (Tag* t)