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

Updated rtexif/*.cc to use f/ aperture notation

Browse Source
This commit is contained in:
Morgan Hardwood
2015-08-27 17:35:03 +02:00
parent ea8e878400
commit 71eb36535d
5 changed files with 1024 additions and 1024 deletions
Download Patch File Download Diff File Expand all files Collapse all files

204
rtexif/olympusattribs.cc
View File

@@ -79,108 +79,108 @@ class OLLensTypeInterpreter : public Interpreter
public:
OLLensTypeInterpreter ()
{
lenses["00 01 00"] = "Olympus Zuiko Digital ED 50mm F2.0 Macro";
lenses["00 01 01"] = "Olympus Zuiko Digital 40-150mm F3.5-4.5";
lenses["00 01 10"] = "Olympus M.Zuiko Digital ED 14-42mm F3.5-5.6";
lenses["00 02 00"] = "Olympus Zuiko Digital ED 150mm F2.0";
lenses["00 02 10"] = "Olympus M.Zuiko Digital 17mm F2.8 Pancake";
lenses["00 03 00"] = "Olympus Zuiko Digital ED 300mm F2.8";
lenses["00 03 10"] = "Olympus M.Zuiko Digital ED 14-150mm F4.0-5.6 [II]";
lenses["00 04 10"] = "Olympus M.Zuiko Digital ED 9-18mm F4.0-5.6";
lenses["00 05 00"] = "Olympus Zuiko Digital 14-54mm F2.8-3.5";
lenses["00 05 01"] = "Olympus Zuiko Digital Pro ED 90-250mm F2.8";
lenses["00 05 10"] = "Olympus M.Zuiko Digital ED 14-42mm F3.5-5.6 L";
lenses["00 06 00"] = "Olympus Zuiko Digital ED 50-200mm F2.8-3.5";
lenses["00 06 01"] = "Olympus Zuiko Digital ED 8mm F3.5 Fisheye";
lenses["00 06 10"] = "Olympus M.Zuiko Digital ED 40-150mm F4.0-5.6";
lenses["00 07 00"] = "Olympus Zuiko Digital 11-22mm F2.8-3.5";
lenses["00 07 01"] = "Olympus Zuiko Digital 18-180mm F3.5-6.3";
lenses["00 07 10"] = "Olympus M.Zuiko Digital ED 12mm F2.0";
lenses["00 08 01"] = "Olympus Zuiko Digital 70-300mm F4.0-5.6";
lenses["00 08 10"] = "Olympus M.Zuiko Digital ED 75-300mm F4.8-6.7";
lenses["00 09 10"] = "Olympus M.Zuiko Digital 14-42mm F3.5-5.6 II";
lenses["00 10 01"] = "Kenko Tokina Reflex 300mm F6.3 MF Macro";
lenses["00 10 10"] = "Olympus M.Zuiko Digital ED 12-50mm F3.5-6.3 EZ";
lenses["00 11 10"] = "Olympus M.Zuiko Digital 45mm F1.8";
lenses["00 12 10"] = "Olympus M.Zuiko Digital ED 60mm F2.8 Macro";
lenses["00 13 10"] = "Olympus M.Zuiko Digital 14-42mm F3.5-5.6 II R";
lenses["00 14 10"] = "Olympus M.Zuiko Digital ED 40-150mm F4.0-5.6 R";
lenses["00 15 00"] = "Olympus Zuiko Digital ED 7-14mm F4.0";
lenses["00 15 10"] = "Olympus M.Zuiko Digital ED 75mm F1.8";
lenses["00 16 10"] = "Olympus M.Zuiko Digital 17mm F1.8";
lenses["00 17 00"] = "Olympus Zuiko Digital Pro ED 35-100mm F2.0";
lenses["00 18 00"] = "Olympus Zuiko Digital 14-45mm F3.5-5.6";
lenses["00 18 10"] = "Olympus M.Zuiko Digital ED 75-300mm F4.8-6.7 II";
lenses["00 19 10"] = "Olympus M.Zuiko Digital ED 12-40mm F2.8 Pro";
lenses["00 20 00"] = "Olympus Zuiko Digital 35mm F3.5 Macro";
lenses["00 20 10"] = "Olympus M.Zuiko Digital ED 40-150mm F2.8 Pro";
lenses["00 21 10"] = "Olympus M.Zuiko Digital ED 14-42mm F3.5-5.6 EZ";
lenses["00 22 00"] = "Olympus Zuiko Digital 17.5-45mm F3.5-5.6";
lenses["00 22 10"] = "Olympus M.Zuiko Digital 25mm F1.8";
lenses["00 23 00"] = "Olympus Zuiko Digital ED 14-42mm F3.5-5.6";
lenses["00 23 10"] = "Olympus M.Zuiko Digital ED 7-14mm F2.8 Pro";
lenses["00 24 00"] = "Olympus Zuiko Digital ED 40-150mm F4.0-5.6";
lenses["00 25 10"] = "Olympus M.Zuiko Digital ED 8mm F1.8 Fisheye Pro";
lenses["00 30 00"] = "Olympus Zuiko Digital ED 50-200mm F2.8-3.5 SWD";
lenses["00 31 00"] = "Olympus Zuiko Digital ED 12-60mm F2.8-4.0 SWD";
lenses["00 32 00"] = "Olympus Zuiko Digital ED 14-35mm F2.0 SWD";
lenses["00 33 00"] = "Olympus Zuiko Digital 25mm F2.8";
lenses["00 34 00"] = "Olympus Zuiko Digital ED 9-18mm F4.0-5.6";
lenses["00 35 00"] = "Olympus Zuiko Digital 14-54mm F2.8-3.5 II";
lenses["01 01 00"] = "Sigma 18-50mm F3.5-5.6 DC";
lenses["01 01 10"] = "Sigma 30mm F2.8 EX DN";
lenses["01 02 00"] = "Sigma 55-200mm F4.0-5.6 DC";
lenses["01 02 10"] = "Sigma 19mm F2.8 EX DN";
lenses["01 03 00"] = "Sigma 18-125mm F3.5-5.6 DC";
lenses["01 03 10"] = "Sigma 30mm F2.8 DN | A";
lenses["01 04 00"] = "Sigma 18-125mm F3.5-5.6 DC";
lenses["01 04 10"] = "Sigma 19mm F2.8 DN | A";
lenses["01 05 00"] = "Sigma 30mm F1.4 EX DC HSM";
lenses["01 05 10"] = "Sigma 60mm F2.8 DN | A";
lenses["01 06 00"] = "Sigma APO 50-500mm F4.0-6.3 EX DG HSM";
lenses["01 07 00"] = "Sigma Macro 105mm F2.8 EX DG";
lenses["01 08 00"] = "Sigma APO Macro 150mm F2.8 EX DG HSM";
lenses["01 09 00"] = "Sigma 18-50mm F2.8 EX DC Macro";
lenses["01 10 00"] = "Sigma 24mm F1.8 EX DG Aspherical Macro";
lenses["01 11 00"] = "Sigma APO 135-400mm F4.5-5.6 DG";
lenses["01 12 00"] = "Sigma APO 300-800mm F5.6 EX DG HSM";
lenses["01 13 00"] = "Sigma 30mm F1.4 EX DC HSM";
lenses["01 14 00"] = "Sigma APO 50-500mm F4.0-6.3 EX DG HSM";
lenses["01 15 00"] = "Sigma 10-20mm F4.0-5.6 EX DC HSM";
lenses["01 16 00"] = "Sigma APO 70-200mm F2.8 II EX DG Macro HSM";
lenses["01 17 00"] = "Sigma 50mm F1.4 EX DG HSM";
lenses["02 01 00"] = "Leica D Vario Elmarit 14-50mm F2.8-3.5 Asph.";
lenses["02 01 10"] = "Lumix G Vario 14-45mm F3.5-5.6 Asph. Mega OIS";
lenses["02 02 00"] = "Leica D Summilux 25mm F1.4 Asph.";
lenses["02 02 10"] = "Lumix G Vario 45-200mm F4.0-5.6 Mega OIS";
lenses["02 03 00"] = "Leica D Vario Elmar 14-50mm F3.8-5.6 Asph. Mega OIS";
lenses["02 03 01"] = "Leica D Vario Elmar 14-50mm F3.8-5.6 Asph.";
lenses["02 03 10"] = "Lumix G Vario HD 14-140mm F4.0-5.8 Asph. Mega OIS";
lenses["02 04 00"] = "Leica D Vario Elmar 14-150mm F3.5-5.6";
lenses["02 04 10"] = "Lumix G Vario 7-14mm F4.0 Asph.";
lenses["02 05 10"] = "Lumix G 20mm F1.7 Asph.";
lenses["02 06 10"] = "Leica DG Macro-Elmarit 45mm F2.8 Asph. Mega OIS";
lenses["02 07 10"] = "Lumix G Vario 14-42mm F3.5-5.6 Asph. Mega OIS";
lenses["02 08 10"] = "Lumix G Fisheye 8mm F3.5";
lenses["02 09 10"] = "Lumix G Vario 100-300mm F4.0-5.6 Mega OIS";
lenses["02 10 10"] = "Lumix G 14mm F2.5 Asph.";
lenses["02 11 10"] = "Lumix G 12.5mm F12 3D";
lenses["02 12 10"] = "Leica DG Summilux 25mm F1.4 Asph.";
lenses["02 13 10"] = "Lumix G X Vario PZ 45-175mm F4.0-5.6 Asph. Power OIS";
lenses["02 14 10"] = "Lumix G X Vario PZ 14-42mm F3.5-5.6 Asph. Power OIS";
lenses["02 15 10"] = "Lumix G X Vario 12-35mm F2.8 Asph. Power OIS";
lenses["02 16 10"] = "Lumix G Vario 45-150mm F4.0-5.6 Asph. Mega OIS";
lenses["02 17 10"] = "Lumix G X Vario 35-100mm F2.8 Power OIS";
lenses["02 18 10"] = "Lumix G Vario 14-42mm F3.5-5.6 II Asph. Mega OIS";
lenses["02 19 10"] = "Lumix G Vario 14-140mm F3.5-5.6 Asph. Power OIS";
lenses["02 20 10"] = "Lumix G Vario 12-32mm F3.5-5.6 Asph. Mega OIS";
lenses["02 21 10"] = "Leica DG Nocticron 42.5mm F1.2 Asph. Power OIS";
lenses["02 22 10"] = "Leica DG Summilux 15mm F1.7 Asph.";
lenses["02 24 10"] = "Lumix G Macro 30mm F2.8 Asph. Mega OIS";
lenses["02 25 10"] = "Lumix G 42.5mm F1.7 Asph. Power OIS";
lenses["03 01 00"] = "Leica D Vario Elmarit 14-50mm F2.8-3.5 Asph.";
lenses["03 02 00"] = "Leica D Summilux 25mm F1.4 Asph.";
lenses["05 01 10"] = "Tamron 14-150mm F3.5-5.8 Di III";
lenses["00 01 00"] = "Olympus Zuiko Digital ED 50mm f/2.0 Macro";
lenses["00 01 01"] = "Olympus Zuiko Digital 40-150mm f/3.5-4.5";
lenses["00 01 10"] = "Olympus M.Zuiko Digital ED 14-42mm f/3.5-5.6";
lenses["00 02 00"] = "Olympus Zuiko Digital ED 150mm f/2.0";
lenses["00 02 10"] = "Olympus M.Zuiko Digital 17mm f/2.8 Pancake";
lenses["00 03 00"] = "Olympus Zuiko Digital ED 300mm f/2.8";
lenses["00 03 10"] = "Olympus M.Zuiko Digital ED 14-150mm f/4.0-5.6 [II]";
lenses["00 04 10"] = "Olympus M.Zuiko Digital ED 9-18mm f/4.0-5.6";
lenses["00 05 00"] = "Olympus Zuiko Digital 14-54mm f/2.8-3.5";
lenses["00 05 01"] = "Olympus Zuiko Digital Pro ED 90-250mm f/2.8";
lenses["00 05 10"] = "Olympus M.Zuiko Digital ED 14-42mm f/3.5-5.6 L";
lenses["00 06 00"] = "Olympus Zuiko Digital ED 50-200mm f/2.8-3.5";
lenses["00 06 01"] = "Olympus Zuiko Digital ED 8mm f/3.5 Fisheye";
lenses["00 06 10"] = "Olympus M.Zuiko Digital ED 40-150mm f/4.0-5.6";
lenses["00 07 00"] = "Olympus Zuiko Digital 11-22mm f/2.8-3.5";
lenses["00 07 01"] = "Olympus Zuiko Digital 18-180mm f/3.5-6.3";
lenses["00 07 10"] = "Olympus M.Zuiko Digital ED 12mm f/2.0";
lenses["00 08 01"] = "Olympus Zuiko Digital 70-300mm f/4.0-5.6";
lenses["00 08 10"] = "Olympus M.Zuiko Digital ED 75-300mm f/4.8-6.7";
lenses["00 09 10"] = "Olympus M.Zuiko Digital 14-42mm f/3.5-5.6 II";
lenses["00 10 01"] = "Kenko Tokina Reflex 300mm f/6.3 MF Macro";
lenses["00 10 10"] = "Olympus M.Zuiko Digital ED 12-50mm f/3.5-6.3 EZ";
lenses["00 11 10"] = "Olympus M.Zuiko Digital 45mm f/1.8";
lenses["00 12 10"] = "Olympus M.Zuiko Digital ED 60mm f/2.8 Macro";
lenses["00 13 10"] = "Olympus M.Zuiko Digital 14-42mm f/3.5-5.6 II R";
lenses["00 14 10"] = "Olympus M.Zuiko Digital ED 40-150mm f/4.0-5.6 R";
lenses["00 15 00"] = "Olympus Zuiko Digital ED 7-14mm f/4.0";
lenses["00 15 10"] = "Olympus M.Zuiko Digital ED 75mm f/1.8";
lenses["00 16 10"] = "Olympus M.Zuiko Digital 17mm f/1.8";
lenses["00 17 00"] = "Olympus Zuiko Digital Pro ED 35-100mm f/2.0";
lenses["00 18 00"] = "Olympus Zuiko Digital 14-45mm f/3.5-5.6";
lenses["00 18 10"] = "Olympus M.Zuiko Digital ED 75-300mm f/4.8-6.7 II";
lenses["00 19 10"] = "Olympus M.Zuiko Digital ED 12-40mm f/2.8 Pro";
lenses["00 20 00"] = "Olympus Zuiko Digital 35mm f/3.5 Macro";
lenses["00 20 10"] = "Olympus M.Zuiko Digital ED 40-150mm f/2.8 Pro";
lenses["00 21 10"] = "Olympus M.Zuiko Digital ED 14-42mm f/3.5-5.6 EZ";
lenses["00 22 00"] = "Olympus Zuiko Digital 17.5-45mm f/3.5-5.6";
lenses["00 22 10"] = "Olympus M.Zuiko Digital 25mm f/1.8";
lenses["00 23 00"] = "Olympus Zuiko Digital ED 14-42mm f/3.5-5.6";
lenses["00 23 10"] = "Olympus M.Zuiko Digital ED 7-14mm f/2.8 Pro";
lenses["00 24 00"] = "Olympus Zuiko Digital ED 40-150mm f/4.0-5.6";
lenses["00 25 10"] = "Olympus M.Zuiko Digital ED 8mm f/1.8 Fisheye Pro";
lenses["00 30 00"] = "Olympus Zuiko Digital ED 50-200mm f/2.8-3.5 SWD";
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 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";
lenses["01 01 00"] = "Sigma 18-50mm f/3.5-5.6 DC";
lenses["01 01 10"] = "Sigma 30mm f/2.8 EX DN";
lenses["01 02 00"] = "Sigma 55-200mm f/4.0-5.6 DC";
lenses["01 02 10"] = "Sigma 19mm f/2.8 EX DN";
lenses["01 03 00"] = "Sigma 18-125mm f/3.5-5.6 DC";
lenses["01 03 10"] = "Sigma 30mm f/2.8 DN | A";
lenses["01 04 00"] = "Sigma 18-125mm f/3.5-5.6 DC";
lenses["01 04 10"] = "Sigma 19mm f/2.8 DN | A";
lenses["01 05 00"] = "Sigma 30mm f/1.4 EX DC HSM";
lenses["01 05 10"] = "Sigma 60mm f/2.8 DN | A";
lenses["01 06 00"] = "Sigma APO 50-500mm f/4.0-6.3 EX DG HSM";
lenses["01 07 00"] = "Sigma Macro 105mm f/2.8 EX DG";
lenses["01 08 00"] = "Sigma APO Macro 150mm f/2.8 EX DG HSM";
lenses["01 09 00"] = "Sigma 18-50mm f/2.8 EX DC Macro";
lenses["01 10 00"] = "Sigma 24mm f/1.8 EX DG Aspherical Macro";
lenses["01 11 00"] = "Sigma APO 135-400mm f/4.5-5.6 DG";
lenses["01 12 00"] = "Sigma APO 300-800mm f/5.6 EX DG HSM";
lenses["01 13 00"] = "Sigma 30mm f/1.4 EX DC HSM";
lenses["01 14 00"] = "Sigma APO 50-500mm f/4.0-6.3 EX DG HSM";
lenses["01 15 00"] = "Sigma 10-20mm f/4.0-5.6 EX DC HSM";
lenses["01 16 00"] = "Sigma APO 70-200mm f/2.8 II EX DG Macro HSM";
lenses["01 17 00"] = "Sigma 50mm f/1.4 EX DG HSM";
lenses["02 01 00"] = "Leica D Vario Elmarit 14-50mm f/2.8-3.5 Asph.";
lenses["02 01 10"] = "Lumix G Vario 14-45mm f/3.5-5.6 Asph. Mega OIS";
lenses["02 02 00"] = "Leica D Summilux 25mm f/1.4 Asph.";
lenses["02 02 10"] = "Lumix G Vario 45-200mm f/4.0-5.6 Mega OIS";
lenses["02 03 00"] = "Leica D Vario Elmar 14-50mm f/3.8-5.6 Asph. Mega OIS";
lenses["02 03 01"] = "Leica D Vario Elmar 14-50mm f/3.8-5.6 Asph.";
lenses["02 03 10"] = "Lumix G Vario HD 14-140mm f/4.0-5.8 Asph. Mega OIS";
lenses["02 04 00"] = "Leica D Vario Elmar 14-150mm f/3.5-5.6";
lenses["02 04 10"] = "Lumix G Vario 7-14mm f/4.0 Asph.";
lenses["02 05 10"] = "Lumix G 20mm f/1.7 Asph.";
lenses["02 06 10"] = "Leica DG Macro-Elmarit 45mm f/2.8 Asph. Mega OIS";
lenses["02 07 10"] = "Lumix G Vario 14-42mm f/3.5-5.6 Asph. Mega OIS";
lenses["02 08 10"] = "Lumix G Fisheye 8mm f/3.5";
lenses["02 09 10"] = "Lumix G Vario 100-300mm f/4.0-5.6 Mega OIS";
lenses["02 10 10"] = "Lumix G 14mm f/2.5 Asph.";
lenses["02 11 10"] = "Lumix G 12.5mm f/12 3D";
lenses["02 12 10"] = "Leica DG Summilux 25mm f/1.4 Asph.";
lenses["02 13 10"] = "Lumix G X Vario PZ 45-175mm f/4.0-5.6 Asph. Power OIS";
lenses["02 14 10"] = "Lumix G X Vario PZ 14-42mm f/3.5-5.6 Asph. Power OIS";
lenses["02 15 10"] = "Lumix G X Vario 12-35mm f/2.8 Asph. Power OIS";
lenses["02 16 10"] = "Lumix G Vario 45-150mm f/4.0-5.6 Asph. Mega OIS";
lenses["02 17 10"] = "Lumix G X Vario 35-100mm f/2.8 Power OIS";
lenses["02 18 10"] = "Lumix G Vario 14-42mm f/3.5-5.6 II Asph. Mega OIS";
lenses["02 19 10"] = "Lumix G Vario 14-140mm f/3.5-5.6 Asph. Power OIS";
lenses["02 20 10"] = "Lumix G Vario 12-32mm f/3.5-5.6 Asph. Mega OIS";
lenses["02 21 10"] = "Leica DG Nocticron 42.5mm f/1.2 Asph. Power OIS";
lenses["02 22 10"] = "Leica DG Summilux 15mm f/1.7 Asph.";
lenses["02 24 10"] = "Lumix G Macro 30mm f/2.8 Asph. Mega OIS";
lenses["02 25 10"] = "Lumix G 42.5mm f/1.7 Asph. Power OIS";
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";
}
virtual std::string toString (Tag* t)
{