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

Sync with GIT

Browse Source
This commit is contained in:
ghorvath
2010-04-20 15:13:34 +00:00
parent 68c4f03a59
commit af8a25edeb
64 changed files with 869 additions and 3405 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
rtexif/rtexif.cc
View File

@@ -24,6 +24,7 @@
#include <string.h>
#include <time.h>
#include <algorithm>
#include <sstream>
namespace rtexif {
@@ -1381,4 +1382,53 @@ short int int2_to_signed (short unsigned int i) {
return u.s;
}
/* Function to parse and extract focal length and aperture information from description
* @fullname must conform to the following formats
* <focal>mm f/<aperture>
* <focal>-<focal>mm f/<aperture>
* <focal>-<focal>mm f/<aperture>-<aperture>
* NB: no space between separator '-'; no space between focal length and 'mm'
*/
bool extractLensInfo(std::string &fullname,double &minFocal, double &maxFocal, double &maxApertureAtMinFocal, double &maxApertureAtMaxFocal)
{
minFocal=0.0;
maxFocal=0.0;
maxApertureAtMinFocal=0.0;
maxApertureAtMaxFocal=0.0;
int iAperture = fullname.find("f/");
if( iAperture != std::string::npos ){
char meno;
std::istringstream apertures( std::string(fullname,iAperture+2) );
apertures >> maxApertureAtMinFocal;
if( !apertures.eof())
apertures >> meno;
if( !apertures.eof())
apertures >> maxApertureAtMaxFocal;
if(maxApertureAtMinFocal >0. && maxApertureAtMaxFocal==0.)
maxApertureAtMaxFocal= maxApertureAtMinFocal;
int eFocal = fullname.rfind("mm",iAperture);
if( eFocal != -1 ){
int iFocal = fullname.rfind(' ',eFocal); // find first space leading focal length
if( iFocal == std::string::npos )
iFocal = 0;
std::istringstream focals( std::string(fullname,iFocal,eFocal-iFocal) );
focals >> minFocal;
if( !focals.eof())
focals >> meno;
if( !focals.eof())
focals >> maxFocal;
if(minFocal >0. && maxFocal==0.0)
maxFocal=minFocal;
return true;
}
return false;
}
return false;
}
}

9
rtexif/rtexif.h
View File

@@ -192,7 +192,12 @@ class StdInterpreter : public Interpreter {
StdInterpreter () {}
virtual std::string toString (Tag* t) {
t->toString (buffer);
return std::string (buffer);
std::string s(buffer);
std::string::size_type p1 = s.find_first_not_of(' ');
if( p1 == std::string::npos )
return s;
else
return s.substr(p1, s.find_last_not_of(' ')-p1+1);
}
virtual void fromString (Tag* t, const std::string& value) {
if (t->getType()==SHORT || t->getType()==LONG)
@@ -226,7 +231,7 @@ inline void sset2 (unsigned short v, unsigned char *s, ByteOrder order);
inline void sset4 (int v, unsigned char *s, ByteOrder order);
inline float int_to_float (int i);
inline short int int2_to_signed (short unsigned int i);
bool extractLensInfo(std::string &fullname,double &minFocal, double &maxFocal, double &maxApertureAtMinFocal, double &maxApertureAtMaxFocal);
extern const TagAttrib exifAttribs[];
extern const TagAttrib gpsAttribs[];

566
rtexif/sonyminoltaattribs.cc
View File

@@ -26,6 +26,9 @@
#include <sstream>
#include <iomanip>
#undef ABS
#define ABS(a) (((a) < 0) ? -(a) : (a))
namespace rtexif {
class SAOnOffInterpreter : public ChoiceInterpreter {
@@ -141,197 +144,384 @@ class SAAntiBlurInterpreter : public ChoiceInterpreter {
};
SAAntiBlurInterpreter saAntiBlurInterpreter;
class SALensIDInterpreter : public ChoiceInterpreter {
class SALensIDInterpreter : public Interpreter {
typedef std::multimap<int, std::string> container_t;
typedef std::pair<int,std::string> p_t;
protected:
container_t choices;
public:
SALensIDInterpreter () {
choices[0] = "Minolta AF 28-85mm F3.5-4.5";
choices[1] = "Minolta AF 80-200mm F2.8 HS-APO G";
choices[2] = "Minolta AF 28-70mm F2.8 G";
choices[3] = "Minolta AF 28-80mm F4-5.6";
choices[5] = "Minolta AF 35-70mm F3.5-4.5";
choices[6] = "Minolta AF 24-85mm F3.5-4.5 [New]";
choices[7] = "Minolta AF 100-300mm F4.5-5.6 APO [New]";
choices[8] = "Minolta AF 70-210mm F4.5-5.6";
choices[9] = "Minolta AF 50mm F3.5 Macro";
choices[10] = "Minolta AF 28-105mm F3.5-4.5 [New]";
choices[11] = "Minolta AF 300mm F4 HS-APO G";
choices[12] = "Minolta AF 100mm F2.8 Soft Focus";
choices[13] = "Minolta AF 75-300mm F4.5-5.6";
choices[14] = "Minolta AF 100-400mm F4.5-6.7 APO";
choices[15] = "Minolta AF 400mm F4.5 HS-APO G";
choices[16] = "Minolta AF 17-35mm F3.5 G";
choices[17] = "Minolta AF 20-35mm F3.5-4.5";
choices[18] = "Minolta AF 28-80mm F3.5-5.6 II";
choices[19] = "Minolta AF 35mm F1.4";
choices[20] = "Minolta/Sony STF 135mm F2.8 [T4.5]";
choices[22] = "Minolta AF 35-80mm F4-5.6";
choices[23] = "Minolta AF 200mm F4 G APO Macro";
choices[24] = "Minolta/Sony AF 24-105mm F3.5-4.5 (D)";
choices[25] = "Minolta AF 100-300mm F4.5-5.6 (APO D)";
choices[27] = "Minolta AF 85mm F1.4 G";
choices[28] = "Minolta AF 100mm F2.8 Macro (D)";
choices[29] = "Minolta AF 75-300mm F4.5-5.6 (D)";
choices[30] = "Minolta AF 28-80mm F3.5-5.6 (D)";
choices[31] = "Minolta/Sony AF 50mm F2.8 Macro (D) or AF 50mm F3.5 Macro";
choices[32] = "Minolta AF 300mm F2.8 G";
choices[33] = "Minolta/Sony AF 70-200mm F2.8 G (D) SSM";
choices[35] = "Minolta AF 85mm F1.4 G (D) Limited";
choices[36] = "Minolta AF 28-100mm F3.5-5.6 (D)";
choices[38] = "Minolta AF 17-35mm F2.8-4 (D)";
choices[39] = "Minolta AF 28-75mm F2.8 (D)";
choices[40] = "Minolta/Sony AF DT 18-70mm F3.5-5.6 (D)";
choices[41] = "Minolta/Sony AF DT 11-18mm F4.5-5.6 (D)";
choices[42] = "Minolta AF DT 18-200mm F3.5-6.3 (D)";
choices[43] = "Minolta AF 35mm F1.4 G";
choices[44] = "Minolta AF 50mm F1.4";
choices[45] = "Carl Zeiss Planar T* 85mm F1.4 ZA";
choices[46] = "Carl Zeiss Vario-Sonnar T* DT 16-80mm F3.5-4.5 ZA";
choices[47] = "Carl Zeiss Sonnar T* 135mm F1.8 ZA";
choices[48] = "Carl Zeiss Vario-Sonnar T* 24-70mm F2.8 ZA SSM";
choices[49] = "Sony AF DT 55-200mm F4-5.6";
choices[50] = "Sony AF DT 18-250mm F3.5-6.3";
choices[51] = "Sony AF DT 16-105mm F3.5-5.6 or 55-200mm f/4-5.5";
choices[52] = "Sony AF 70-300mm F4.5-5.6 G SSM";
choices[53] = "Sony AF 70-400mm F4.5-5.6 G SSM";
choices[54] = "Carl Zeiss Vario-Sonnar T* 16-35mm F2.8 ZA SSM";
choices[55] = "Sony DT 18-55mm F3.5-5.6 SAM";
choices[56] = "Sony AF DT 55-200mm F4-5.6 SAM";
choices[57] = "Sony AF DT 50mm F1.8 SAM";
choices[58] = "Sony AF DT 30mm F2.8 SAM Macro";
choices[59] = "Sony AF 28-75mm F2.8 SAM";
choices[128] = "Tamron or Sigma Lens";
choices[129] = "Tamron 200-400mm F5.6 or 70-300mm f/4-5.6 LD";
choices[135] = "Vivitar 28-210mm F3.5-5.6";
choices[136] = "Tokina EMZ M100 AF 100mm F3.5";
choices[137] = "Cosina 70-210mm F2.8-4 AF";
choices[138] = "Soligor 19-35mm F3.5-4.5";
choices[142] = "Voigtlander 70-300mm F4.5-5.6";
choices[146] = "Voigtlander Macro APO-Lanthar 125mm F2.5 SL";
choices[255] = "Tamron Lens";
choices[2550] = "Minolta AF 50mm F1.7";
choices[2551] = "Minolta AF 35-70mm F4";
choices[2552] = "Minolta AF 28-85mm F3.5-4.5 [New]";
choices[2553] = "Minolta AF 28-135mm F4-4.5";
choices[2554] = "Minolta AF 35-105mm F3.5-4.5";
choices[2555] = "Minolta AF 70-210mm F4 Macro";
choices[2556] = "Minolta AF 135mm F2.8";
choices[2557] = "Minolta AF 28mm F2.8";
choices[2558] = "Minolta AF 24-50mm F4";
choices[2560] = "Minolta AF 100-200mm F4.5";
choices[2561] = "Minolta AF 75-300mm F4.5-5.6";
choices[2562] = "Minolta/Sony AF 50mm F1.4 [New]";
choices[2563] = "Minolta AF 300mm F2.8 G";
choices[2564] = "Minolta AF 50mm F2.8 Macro";
choices[2565] = "Minolta AF 600mm F4";
choices[2566] = "Minolta AF 24mm F2.8";
choices[2572] = "Minolta/Sony AF 500mm F8 Reflex";
choices[2578] = "Minolta AF 16mm F2.8 Fisheye or Sigma Lens";
choices[2579] = "Minolta AF 20mm F2.8";
choices[2581] = "Minolta/Sony AF 100mm F2.8 Macro or Sigma or Tamron";
choices[2585] = "Minolta AF 35-105mm F3.5-4.5 New";
choices[2588] = "Minolta AF 70-210mm F3.5-4.5";
choices[2589] = "Minolta AF 80-200 F2.8 APO";
choices[2591] = "Minolta AF 35mm F1.4";
choices[2592] = "Minolta AF 85mm F1.4 G (D)";
choices[2593] = "Minolta AF 200mm F2.8 G APO";
choices[2594] = "Minolta AF 3x-1x F1.7-2.8 Macro";
choices[2596] = "Minolta AF 28mm F2";
choices[2597] = "Minolta AF 35mm F2";
choices[2598] = "Minolta AF 100mm F2";
choices[2604] = "Minolta AF 80-200mm F4.5-5.6";
choices[2605] = "Minolta AF 35-80mm F4-5.6";
choices[2606] = "Minolta AF 100-300mm F4.5-5.6 (D)";
choices[2607] = "Minolta AF 35-80mm F4-5.6";
choices[2608] = "Minolta AF 300mm F2.8 G";
choices[2609] = "Minolta AF 600mm F4 HS-APO G";
choices[2612] = "Minolta AF 200mm F2.8 G HS-APO";
choices[2613] = "Minolta AF 50mm F1.7 New";
choices[2615] = "Minolta AF 28-105mm F3.5-4.5 Power Zoom";
choices[2616] = "Minolta AF 35-200mm F4.5-5.6 Power Zoom";
choices[2618] = "Minolta AF 28-80mm F4-5.6 Power Zoom";
choices[2619] = "Minolta AF 80-200mm F4.5-5.6 Power Zoom";
choices[2620] = "Minolta AF 28-70mm F2.8 G";
choices[2621] = "Minolta AF 100-300mm F4.5-5.6 Power Zoom";
choices[2624] = "Minolta AF 35-80mm F4-5.6 Power Zoom";
choices[2628] = "Minolta AF 80-200mm F2.8 G";
choices[2629] = "Minolta AF 85mm F1.4 New";
choices[2631] = "Minolta/Sony AF 100-300mm F4.5-5.6 APO";
choices[2632] = "Minolta AF 24-50mm F4 New";
choices[2638] = "Minolta AF 50mm F2.8 Macro New";
choices[2639] = "Minolta AF 100mm F2.8 Macro";
choices[2641] = "Minolta AF 20mm F2.8 New";
choices[2642] = "Minolta AF 24mm F2.8 New";
choices[2644] = "Minolta AF 100-400mm F4.5-6.7 APO";
choices[2662] = "Minolta AF 50mm F1.4 New";
choices[2667] = "Minolta AF 35mm F2 New";
choices[2668] = "Minolta AF 28mm F2 New";
choices[2672] = "Minolta AF 24-105mm F3.5-4.5 (D)";
choices[4574] = "Minolta AF 200mm F2.8 G x2";
choices[4575] = "1.4 x Teleconverter";
choices[4585] = "Tamron - SP AF 300 F2.8 LD IF";
choices[25501] = "Minolta AF 50mm F1.7";
choices[25511] = "Minolta AF 35-70mm F4";
choices[25521] = "Minolta AF 28-85mm F3.5-4.5 [New]";
choices[25531] = "Minolta AF 28-135mm F4-4.5";
choices[25541] = "Minolta AF 35-105mm F3.5-4.5";
choices[25551] = "Minolta AF 70-210mm F4 Macro";
choices[25561] = "Minolta AF 135mm F2.8";
choices[25571] = "Minolta AF 28mm F2.8";
choices[25581] = "Minolta AF 24-50mm F4";
choices[25601] = "Minolta AF 100-200mm F4.5";
choices[25611] = "Minolta AF 75-300mm F4.5-5.6";
choices[25621] = "Minolta/Sony AF 50mm F1.4 [New]";
choices[25631] = "Minolta AF 300mm F2.8 G";
choices[25641] = "Minolta AF 50mm F2.8 Macro";
choices[25651] = "Minolta AF 600mm F4";
choices[25661] = "Minolta AF 24mm F2.8";
choices[25721] = "Minolta/Sony AF 500mm F8 Reflex";
choices[25781] = "Minolta AF 16mm F2.8 Fisheye";
choices[25791] = "Minolta AF 20mm F2.8";
choices[25811] = "Minolta/Sony AF 100mm F2.8 Macro New";
choices[25851] = "Beroflex 35-135mm F3.5-4.5";
choices[25858] = "Minolta AF 35-105mm F3.5-4.5 New";
choices[25881] = "Minolta AF 70-210mm F3.5-4.5";
choices[25891] = "Minolta AF 80-200 F2.8 APO";
choices[25911] = "Minolta AF 35mm F1.4";
choices[25921] = "Minolta AF 85mm F1.4 G (D)";
choices[25931] = "Minolta AF 200mm F2.8 G APO";
choices[25941] = "Minolta AF 3x-1x F1.7-2.8 Macro";
choices[25961] = "Minolta AF 28mm F2";
choices[25971] = "Minolta AF 35mm F2";
choices[25981] = "Minolta AF 100mm F2";
choices[26041] = "Minolta AF 80-200mm F4.5-5.6";
choices[26051] = "Minolta AF 35-80mm F4-5.6";
choices[26061] = "Minolta AF 100-300mm F4.5-5.6 (D)";
choices[26071] = "Minolta AF 35-80mm F4-5.6";
choices[26081] = "Minolta AF 300mm F2.8 G";
choices[26091] = "Minolta AF 600mm F4 HS-APO G";
choices[26121] = "Minolta AF 200mm F2.8 G HS-APO";
choices[26131] = "Minolta AF 50mm F1.7 New";
choices[26151] = "Minolta AF 28-105mm F3.5-4.5 Power Zoom";
choices[26161] = "Minolta AF 35-200mm F4.5-5.6 Power Zoom";
choices[26181] = "Minolta AF 28-80mm F4-5.6 Power Zoom";
choices[26191] = "Minolta AF 80-200mm F4.5-5.6 Power Zoom";
choices[26201] = "Minolta AF 28-70mm F2.8 G";
choices[26211] = "Minolta AF 100-300mm F4.5-5.6 Power Zoom";
choices[26241] = "Minolta AF 35-80mm F4-5.6 Power Zoom";
choices[26281] = "Minolta AF 80-200mm F2.8 G";
choices[26291] = "Minolta AF 85mm F1.4 New";
choices[26311] = "Minolta/Sony AF 100-300mm F4.5-5.6 APO";
choices[26321] = "Minolta AF 24-50mm F4 New";
choices[26381] = "Minolta AF 50mm F2.8 Macro New";
choices[26391] = "Minolta AF 100mm F2.8 Macro";
choices[26411] = "Minolta AF 20mm F2.8 New";
choices[26421] = "Minolta AF 24mm F2.8 New";
choices[26441] = "Minolta AF 100-400mm F4.5-6.7 APO";
choices[26621] = "Minolta AF 50mm F1.4 New";
choices[26671] = "Minolta AF 35mm F2 New";
choices[26681] = "Minolta AF 28mm F2 New";
choices[26721] = "Minolta AF 24-105mm F3.5-4.5 (D)";
choices[45671] = "Tokina 70-210mm F4-5.6";
choices[45741] = "Minolta AF 200mm F2.8 G x2";
choices[45851] = "Tamron - SP AF 300 F2.8 LD IF";
choices.insert(p_t(0, "Minolta AF 28-85mm f/3.5-4.5"));
choices.insert(p_t(1, "Minolta AF 80-200mm f/2.8 HS-APO G"));
choices.insert(p_t(2, "Minolta AF 28-70mm f/2.8 G"));
choices.insert(p_t(3, "Minolta AF 28-80mm f/4-5.6"));
choices.insert(p_t(5, "Minolta AF 35-70mm f/3.5-4.5"));
choices.insert(p_t(6, "Minolta AF 24-85mm f/3.5-4.5 [New]"));
choices.insert(p_t(7, "Minolta AF 100-300mm f/4.5-5.6 APO [New]"));
choices.insert(p_t(7, "Sigma AF 100-300mm f/4 EX DG IF"));
choices.insert(p_t(8, "Minolta AF 70-210mm f/4.5-5.6"));
choices.insert(p_t(9, "Minolta AF 50mm f/3.5 Macro"));
choices.insert(p_t(10, "Minolta AF 28-105mm f/3.5-4.5 [New]"));
choices.insert(p_t(11, "Minolta AF 300mm f/4 HS-APO G"));
choices.insert(p_t(12, "Minolta AF 100mm f/2.8 Soft Focus"));
choices.insert(p_t(13, "Minolta AF 75-300mm f/4.5-5.6"));
choices.insert(p_t(14, "Minolta AF 100-400mm f/4.5-6.7 APO"));
choices.insert(p_t(15, "Minolta AF 400mm f/4.5 HS-APO G"));
choices.insert(p_t(16, "Minolta AF 17-35mm f/3.5 G"));
choices.insert(p_t(17, "Minolta AF 20-35mm f/3.5-4.5"));
choices.insert(p_t(18, "Minolta AF 28-80mm f/3.5-5.6 II"));
choices.insert(p_t(19, "Minolta AF 35mm f/1.4"));
choices.insert(p_t(20, "Minolta/Sony STF 135mm F2.8 [T4.5]"));
choices.insert(p_t(22, "Minolta AF 35-80mm f/4-5.6"));
choices.insert(p_t(23, "Minolta AF 200mm f/4 G APO Macro"));
choices.insert(p_t(24, "Minolta/Sony AF 24-105mm f/3.5-4.5 (D)"));
choices.insert(p_t(24, "Sigma 18-50mm f/2.8 EX DC Macro"));
choices.insert(p_t(24, "Sigma 17-70mm f/2.8-4.5 DC Macro"));
choices.insert(p_t(24, "Sigma 20-40mm f/2.8 EX DG Aspherical IF"));
choices.insert(p_t(24, "Sigma 18-200mm f/3.5-6.3 DC"));
choices.insert(p_t(24, "Tamron SP AF 28-75mm f/2.8 XR Di (IF) Macro"));
choices.insert(p_t(25, "Minolta AF 100-300mm f/4.5-5.6 APO D"));
choices.insert(p_t(25, "Sigma 100-300mm f/4 EX DG APO"));
choices.insert(p_t(25, "Sigma 70mm f/2.8 EX DG Macro"));
choices.insert(p_t(25, "Sigma 20mm f/1.8 EX DG Aspherical RF"));
choices.insert(p_t(25, "Sigma 30mm f/1.4 EX DG"));
choices.insert(p_t(27, "Minolta AF 85mm f71.4 G"));
choices.insert(p_t(28, "Minolta AF 100mm f/2.8 Macro (D)"));
choices.insert(p_t(28, "Tamron SP AF 90mm f/2.8 Di Macro "));
choices.insert(p_t(29, "Minolta AF 75-300mm f/4.5-5.6 (D)"));
choices.insert(p_t(30, "Minolta AF 28-80mm f/3.5-5.6 (D)"));
choices.insert(p_t(30, "Sigma 10-20mm f/4-5.6 EX DC"));
choices.insert(p_t(30, "Sigma 12-24mm f/4.5-5.6 EX DG"));
choices.insert(p_t(30, "Sigma 28-70mm f/2.8 EX DG"));
choices.insert(p_t(30, "Sigma 55-200mm f/4-5.6 DC"));
choices.insert(p_t(31, "Minolta/Sony AF 50mm f/2.8 Macro (D)"));
choices.insert(p_t(32, "Minolta AF 300mm f/2.8 G"));
choices.insert(p_t(33, "Minolta/Sony AF 70-200mm f/2.8 G (D) SSM"));
choices.insert(p_t(35, "Minolta AF 85mm f/1.4 G (D) Limited"));
choices.insert(p_t(36, "Minolta AF 28-100mm f/3.5-5.6 (D)"));
choices.insert(p_t(38, "Minolta AF 17-35mm f/2.8-4 (D)"));
choices.insert(p_t(39, "Minolta AF 28-75mm f/2.8 (D)"));
choices.insert(p_t(40, "Minolta/Sony AF DT 18-70mm f/3.5-5.6 (D)"));
choices.insert(p_t(41, "Minolta/Sony AF DT 11-18mm f/4.5-5.6 (D)"));
choices.insert(p_t(42, "Minolta AF DT 18-200mm f/3.5-6.3 (D)"));
choices.insert(p_t(43, "Minolta AF 35mm f/1.4 G"));
choices.insert(p_t(44, "Sony AF 50mm f/1.4"));
choices.insert(p_t(45, "Carl Zeiss Planar T* 85mm f/1.4 ZA"));
choices.insert(p_t(46, "Carl Zeiss Vario-Sonnar T* DT 16-80mm f/3.5-4.5 ZA"));
choices.insert(p_t(47, "Carl Zeiss Sonnar T* 135mm F1.8 ZA"));
choices.insert(p_t(48, "Carl Zeiss Vario-Sonnar T* 24-70mm f/2.8 ZA SSM"));
choices.insert(p_t(49, "Sony AF DT 55-200mm f/4-5.6"));
choices.insert(p_t(50, "Sony AF DT 18-250mm f/3.5-6.3"));
choices.insert(p_t(51, "Sony AF DT 16-105mm f/3.5-5.6 or 55-200mm f/4-5.5"));
choices.insert(p_t(52, "Sony AF 70-300mm f/4.5-5.6 G SSM"));
choices.insert(p_t(53, "Sony AF 70-400mm f/4.5-5.6 G SSM"));
choices.insert(p_t(54, "Carl Zeiss Vario-Sonnar T* 16-35mm f/2.8 ZA SSM"));
choices.insert(p_t(55, "Sony DT 18-55mm f/3.5-5.6 SAM"));
choices.insert(p_t(56, "Sony AF DT 55-200mm f/4-5.6 SAM"));
choices.insert(p_t(57, "Sony AF DT 50mm f/1.8 SAM"));
choices.insert(p_t(58, "Sony AF DT 30mm f/2.8 SAM Macro"));
choices.insert(p_t(59, "Sony AF 28-75mm f/2.8 SAM"));
choices.insert(p_t(128, "Tamron AF 18-200mm f/3.5-6.3 XR Di II LD Aspherical (IF)"));
choices.insert(p_t(128, "Tamron AF 28-300mm f/3.5-6.3"));
choices.insert(p_t(128, "Tamron AF 28-200mm f/3.8-5.6 XR Di Aspherical (IF) Macro "));
choices.insert(p_t(128, "Tamron SP AF 17-35mm f/2.8-4 Di LD Aspherical IF"));
choices.insert(p_t(128, "Sigma 10-20mm f/3.5 EX DC"));
choices.insert(p_t(128, "Sigma 70-200mm f/2.8 II EX DG APO Macro"));
choices.insert(p_t(129, "Tamron 200-400mm f/5.6 LD (IF)"));
choices.insert(p_t(129, "Tamron 70-300mm f/4-5.6 LD"));
choices.insert(p_t(135, "Vivitar 28-210mm f/3.5-5.6"));
choices.insert(p_t(136, "Tokina EMZ M100 AF 100mm f/3.5"));
choices.insert(p_t(137, "Cosina 70-210mm f/2.8-4 AF"));
choices.insert(p_t(138, "Soligor 19-35mm f/3.5-4.5"));
choices.insert(p_t(142, "Voigtlander 70-300mm f/4.5-5.6"));
choices.insert(p_t(146, "Voigtlander Macro APO-Lanthar 125mm f/2.5 SL"));
choices.insert(p_t(255, "Tamron SP AF 17-50mm f/2.8 XR Di II LD Aspherical"));
choices.insert(p_t(255, "Tamron AF 18-250mm f/3.5-6.3 XR Di II LD"));
choices.insert(p_t(255, "Tamron AF 55-200mm f/4-5.6 Di II"));
choices.insert(p_t(255, "Tamron AF 70-300mm f/4-5.6 Di LD Macro 1:2"));
choices.insert(p_t(255, "Tamron SP AF 200-500mm f/5.0-6.3 Di LD (IF)"));
choices.insert(p_t(255, "Tamron SP AF 10-24mm f/3.5-4.5 Di II LD Aspherical (IF)"));
choices.insert(p_t(255, "Tamron SP AF 70-200mm f/2.8 Di LD Macro (IF)"));
choices.insert(p_t(255, "Tamron SP AF 28-75mm f/2.8 XR Di LD Aspherical (IF)"));
choices.insert(p_t(2550, "Minolta AF 50mm f/1.7"));
choices.insert(p_t(2551, "Minolta AF 35-70mm f/4"));
choices.insert(p_t(2551, "Sigma UC AF 28-70mm f/3.5-4.5"));
choices.insert(p_t(2551, "Sigma AF 28-70mm f/2.8"));
choices.insert(p_t(2551, "Sigma M-AF 70-200mm f/2.8 EX Aspherical"));
choices.insert(p_t(2551, "Quantaray M-AF 35-80mm f/4-5.6"));
choices.insert(p_t(2552, "Minolta AF 28-85mm f/3.5-4.5 [New]"));
choices.insert(p_t(2552, "Tokina 19-35mm f/3.5-4.5"));
choices.insert(p_t(2552, "Tokina 28-70mm f/2.8 AT-X"));
choices.insert(p_t(2552, "Tokina 80-400mm f/4.5-5.6 AT-X AF II 840"));
choices.insert(p_t(2552, "Tokina AF PRO 28-80mm f/2.8 AT-X 280"));
choices.insert(p_t(2552, "Tokina AT-X PRO II AF 28-70mm f/2.6-2.8 270"));
choices.insert(p_t(2552, "Tamron AF 19-35mm f/3.5-4.5"));
choices.insert(p_t(2552, "Angenieux AF 28-70mm f/2.6"));
choices.insert(p_t(2553, "Minolta AF 28-135mm f/4-4.5"));
choices.insert(p_t(2553, "Sigma ZOOM-alpha 35-135mm f/3.5-4.5"));
choices.insert(p_t(2553, "Sigma 28-105mm f/2.8-4 Aspherical"));
choices.insert(p_t(2554, "Minolta AF 35-105mm f/3.5-4.5"));
choices.insert(p_t(2555, "Minolta AF 70-210mm f/4 Macro"));
choices.insert(p_t(2555, "Sigma 70-210mm f/4-5.6 APO"));
choices.insert(p_t(2555, "Sigma M-AF 70-200mm f/2.8 EX APO"));
choices.insert(p_t(2555, "Sigma 75-200mm f/2.8-3.5"));
choices.insert(p_t(2556, "Minolta AF 135mm f/2.8"));
choices.insert(p_t(2557, "Minolta AF 28mm f/2.8"));
choices.insert(p_t(2558, "Minolta AF 24-50mm f/4"));
choices.insert(p_t(2560, "Minolta AF 100-200mm f/4.5"));
choices.insert(p_t(2561, "Minolta AF 75-300mm f/4.5-5.6"));
choices.insert(p_t(2561, "Sigma 70-300mm f/4-5.6 DL Macro"));
choices.insert(p_t(2561, "Sigma 300mm f/4 APO Macro"));
choices.insert(p_t(2561, "Sigma AF 500mm f/4.5 APO"));
choices.insert(p_t(2561, "Sigma AF 170-500mm f/5-6.3 APO Aspherical"));
choices.insert(p_t(2561, "Tokina AT-X AF 300mm f/4"));
choices.insert(p_t(2561, "Tokina AT-X AF 400mm f/5.6 SD"));
choices.insert(p_t(2561, "Tokina AF 730 II 75-300mm f/4.5-5.6"));
choices.insert(p_t(2562, "Minolta/Sony AF 50mm f/1.4 [New]"));
choices.insert(p_t(2563, "Minolta AF 300mm f/2.8 G"));
choices.insert(p_t(2563, "Sigma AF 50-500mm f/4-6.3 EX DG APO"));
choices.insert(p_t(2563, "Sigma AF 170-500mm f/5-6.3 APO Aspherical"));
choices.insert(p_t(2563, "Sigma AF 500mm f/4.5 EX DG APO"));
choices.insert(p_t(2563, "Sigma 400mm f/5.6 APO"));
choices.insert(p_t(2564, "Minolta AF 50mm f/2.8 Macro"));
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(2566, "Minolta AF 24mm f/2.8"));
choices.insert(p_t(2572, "Minolta/Sony AF 500mm f/8 Reflex"));
choices.insert(p_t(2578, "Minolta AF 16mm f/2.8 Fisheye"));
choices.insert(p_t(2578, "Sigma 8mm f/4 EX DG Fisheye"));
choices.insert(p_t(2578, "Sigma 14mm f/3.5"));
choices.insert(p_t(2578, "Sigma 15mm f/2.8 Fisheye"));
choices.insert(p_t(2579, "Minolta AF 20mm f/2.8"));
choices.insert(p_t(2581, "Minolta/Sony AF 100mm f/2.8 Macro"));
choices.insert(p_t(2581, "Sigma AF 90mm f/2.8 Macro"));
choices.insert(p_t(2581, "Sigma AF 105mm f/2.8 EX DG Macro"));
choices.insert(p_t(2581, "Sigma 180mm f/5.6 Macro"));
choices.insert(p_t(2581, "Tamron AF 90mm f/2.8 Macro"));
choices.insert(p_t(2585, "Minolta AF 35-105mm f/3.5-4.5 New"));
choices.insert(p_t(2585, "Tamron AF 24-135mm f/3.5-5.6"));
choices.insert(p_t(2588, "Minolta AF 70-210mm f/3.5-4.5"));
choices.insert(p_t(2589, "Minolta AF 80-200 f/2.8 APO"));
choices.insert(p_t(2589, "Tokina 80-200mm f/2.8"));
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(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"));
choices.insert(p_t(2598, "Minolta AF 100mm f/2"));
choices.insert(p_t(2604, "Minolta AF 80-200mm f/4.5-5.6"));
choices.insert(p_t(2605, "Minolta AF 35-80mm f/4-5.6"));
choices.insert(p_t(2606, "Minolta AF 100-300mm f/4.5-5.6 (D)"));
choices.insert(p_t(2607, "Minolta AF 35-80mm f/4-5.6"));
choices.insert(p_t(2608, "Minolta AF 300mm f/2.8 G"));
choices.insert(p_t(2609, "Minolta AF 600mm f/4 HS-APO G"));
choices.insert(p_t(2612, "Minolta AF 200mm f/2.8 G HS-APO"));
choices.insert(p_t(2613, "Minolta AF 50mm f/1.7 New"));
choices.insert(p_t(2615, "Minolta AF 28-105mm f/3.5-4.5 Power Zoom"));
choices.insert(p_t(2616, "Minolta AF 35-200mm f/4.5-5.6 Power Zoom"));
choices.insert(p_t(2618, "Minolta AF 28-80mm f/4-5.6 Power Zoom"));
choices.insert(p_t(2619, "Minolta AF 80-200mm f/4.5-5.6 Power Zoom"));
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 Power Zoom"));
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(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"));
choices.insert(p_t(2638, "Minolta AF 50mm f/2.8 Macro New"));
choices.insert(p_t(2639, "Minolta AF 100mm f/2.8 Macro"));
choices.insert(p_t(2641, "Minolta AF 20mm f/2.8 New"));
choices.insert(p_t(2642, "Minolta AF 24mm f/2.8 New"));
choices.insert(p_t(2644, "Minolta AF 100-400mm f/4.5-6.7 APO"));
choices.insert(p_t(2662, "Minolta AF 50mm f/1.4 New"));
choices.insert(p_t(2667, "Minolta AF 35mm f/2 New"));
choices.insert(p_t(2668, "Minolta AF 28mm f/2 New"));
choices.insert(p_t(2672, "Minolta AF 24-105mm f/3.5-4.5 (D)"));
choices.insert(p_t(4574, "Minolta AF 200mm f/2.8 G x2"));
choices.insert(p_t(4575, "1.4 x Teleconverter"));
choices.insert(p_t(4585, "Tamron SP AF 300mm f/2.8 LD IF"));
choices.insert(p_t(6553, "Arax MC 35mm f/2.8 Tilt+Shift"));
choices.insert(p_t(6553, "Arax MC 80mm f/2.8 Tilt+Shift"));
choices.insert(p_t(6553, "Zenitar MF 16mm f/2.8 Fisheye M42"));
choices.insert(p_t(6553, "Samyang 500mm Mirror f/8"));
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"));
choices.insert(p_t(25501, "Minolta AF 50mm f/1.7"));
choices.insert(p_t(25511, "Minolta AF 35-70mm f/4"));
choices.insert(p_t(25511, "Sigma UC AF 28-70mm f/3.5-4.5"));
choices.insert(p_t(25511, "Sigma AF 28-70mm f/2.8"));
choices.insert(p_t(25511, "Sigma M-AF 70-200mm f/2.8 EX Aspherical"));
choices.insert(p_t(25511, "Quantaray M-AF 35-80mm f/4-5.6"));
choices.insert(p_t(25521, "Minolta AF 28-85mm f/3.5-4.5 [New]"));
choices.insert(p_t(25521, "Tokina 19-35mm f/3.5-4.5"));
choices.insert(p_t(25521, "Tokina 28-70mm f/2.8 AT-X"));
choices.insert(p_t(25521, "Tokina 80-400mm f/4.5-5.6 AT-X AF II 840"));
choices.insert(p_t(25521, "Tokina AF PRO 28-80mm f/2.8 AT-X 280"));
choices.insert(p_t(25521, "Tokina AT-X PRO II AF 28-70mm f/2.6-2.8 270"));
choices.insert(p_t(25521, "Tamron AF 19-35mm f/3.5-4.5"));
choices.insert(p_t(25521, "Angenieux AF 28-70mm f/2.6"));
choices.insert(p_t(25531, "Minolta AF 28-135mm f/4-4.5"));
choices.insert(p_t(25531, "Sigma ZOOM-alpha 35-135mm f/3.5-4.5"));
choices.insert(p_t(25531, "Sigma 28-105mm f/2.8-4 Aspherical"));
choices.insert(p_t(25541, "Minolta AF 35-105mm f/3.5-4.5"));
choices.insert(p_t(25551, "Minolta AF 70-210mm f/4 Macro"));
choices.insert(p_t(25551, "Sigma 70-210mm f/4-5.6 APO"));
choices.insert(p_t(25551, "Sigma M-AF 70-200mm f/2.8 EX APO"));
choices.insert(p_t(25551, "Sigma 75-200mm f/2.8-3.5"));
choices.insert(p_t(25561, "Minolta AF 135mm f/2.8"));
choices.insert(p_t(25571, "Minolta AF 28mm f/2.8"));
choices.insert(p_t(25581, "Minolta AF 24-50mm f/4"));
choices.insert(p_t(25601, "Minolta AF 100-200mm f/4.5"));
choices.insert(p_t(25611, "Minolta AF 75-300mm f/4.5-5.6"));
choices.insert(p_t(25611, "Sigma 70-300mm f/4-5.6 DL Macro"));
choices.insert(p_t(25611, "Sigma 300mm f/4 APO Macro"));
choices.insert(p_t(25611, "Sigma AF 500mm f/4.5 APO"));
choices.insert(p_t(25611, "Sigma AF 170-500mm f/5-6.3 APO Aspherical"));
choices.insert(p_t(25611, "Tokina AT-X AF 300mm f/4"));
choices.insert(p_t(25611, "Tokina AT-X AF 400mm f/5.6 SD"));
choices.insert(p_t(25611, "Tokina AF 730 II 75-300mm f/4.5-5.6"));
choices.insert(p_t(25621, "Minolta AF 50mm f/1.4"));
choices.insert(p_t(25631, "Minolta AF 300mm f/2.8 G"));
choices.insert(p_t(25631, "Sigma AF 50-500mm f/4-6.3 EX DG APO"));
choices.insert(p_t(25631, "Sigma AF 170-500mm f/5-6.3 APO Aspherical"));
choices.insert(p_t(25631, "Sigma AF 500mm f/4.5 EX DG APO"));
choices.insert(p_t(25631, "Sigma 400mm f/5.6 APO"));
choices.insert(p_t(25641, "Minolta AF 50mm f/2.8 Macro"));
choices.insert(p_t(25641, "Sigma AF 50mm f/2.8 Macro"));
choices.insert(p_t(25651, "Minolta AF 600mm f/4"));
choices.insert(p_t(25661, "Minolta AF 24mm f/2.8"));
choices.insert(p_t(25721, "Minolta/Sony AF 500mm f/8 Reflex"));
choices.insert(p_t(25781, "Minolta AF 16mm f/2.8 Fisheye"));
choices.insert(p_t(25781, "Sigma 8mm f/4 EX DG Fisheye"));
choices.insert(p_t(25781, "Sigma 14mm f/3.5"));
choices.insert(p_t(25781, "Sigma 15mm f/2.8 Fisheye"));
choices.insert(p_t(25791, "Minolta AF 20mm f/2.8"));
choices.insert(p_t(25811, "Minolta/Sony AF 100mm f/2.8 Macro New"));
choices.insert(p_t(25811, "Sigma AF 90mm f/2.8 Macro"));
choices.insert(p_t(25811, "Sigma AF 105mm f/2.8 EX DG Macro"));
choices.insert(p_t(25811, "Sigma 180mm f/5.6 Macro"));
choices.insert(p_t(25811, "Tamron 90mm f/2.8 Macro"));
choices.insert(p_t(25851, "Beroflex 35-135mm f/3.5-4.5"));
choices.insert(p_t(25858, "Minolta AF 35-105mm f/3.5-4.5 New"));
choices.insert(p_t(25858, "Tamron 24-135mm f/3.5-5.6"));
choices.insert(p_t(25881, "Minolta AF 70-210mm f/3.5-4.5"));
choices.insert(p_t(25891, "Minolta AF 80-200 f/2.8 APO"));
choices.insert(p_t(25891, "Tokina 80-200mm f/2.8"));
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(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"));
choices.insert(p_t(25981, "Minolta AF 100mm f/2"));
choices.insert(p_t(26041, "Minolta AF 80-200mm f/4.5-5.6"));
choices.insert(p_t(26051, "Minolta AF 35-80mm f/4-5.6"));
choices.insert(p_t(26061, "Minolta AF 100-300mm f/4.5-5.6 (D)"));
choices.insert(p_t(26071, "Minolta AF 35-80mm f/4-5.6"));
choices.insert(p_t(26081, "Minolta AF 300mm f/2.8 HS-APO G"));
choices.insert(p_t(26091, "Minolta AF 600mm f/4 HS-APO G"));
choices.insert(p_t(26121, "Minolta AF 200mm f/2.8 HS-APO G"));
choices.insert(p_t(26131, "Minolta AF 50mm f/1.7 New"));
choices.insert(p_t(26151, "Minolta AF 28-105mm f/3.5-4.5 Power Zoom"));
choices.insert(p_t(26161, "Minolta AF 35-200mm f/4.5-5.6 Power Zoom"));
choices.insert(p_t(26181, "Minolta AF 28-80mm f/4-5.6 Power Zoom"));
choices.insert(p_t(26191, "Minolta AF 80-200mm f/4.5-5.6 Power Zoom"));
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 Power Zoom"));
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(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"));
choices.insert(p_t(26381, "Minolta AF 50mm f/2.8 Macro New"));
choices.insert(p_t(26391, "Minolta AF 100mm f/2.8 Macro"));
choices.insert(p_t(26411, "Minolta AF 20mm f/2.8 New"));
choices.insert(p_t(26421, "Minolta AF 24mm f/2.8 New"));
choices.insert(p_t(26441, "Minolta AF 100-400mm f/4.5-6.7 APO"));
choices.insert(p_t(26621, "Minolta AF 50mm f/1.4 New"));
choices.insert(p_t(26671, "Minolta AF 35mm f/2 New"));
choices.insert(p_t(26681, "Minolta AF 28mm f/2 New"));
choices.insert(p_t(26721, "Minolta AF 24-105mm f/3.5-4.5 (D)"));
choices.insert(p_t(45671, "Tokina 70-210mm f/4-5.6"));
choices.insert(p_t(45741, "Minolta AF 200mm f/2.8 G x2"));
choices.insert(p_t(45851, "Tamron SP AF 300mm f/2.8 LD IF"));
choices.insert(p_t(45871, "Tamron SP AF 70-210mm f/2.8 LD"));
choices.insert(p_t(65535, "Arax MC 35mm f/2.8 Tilt+Shift"));
choices.insert(p_t(65535, "Arax MC 80mm f/2.8 Tilt+Shift"));
choices.insert(p_t(65535, "Zenitar MF 16mm f/2.8 Fisheye M42"));
choices.insert(p_t(65535, "Samyang 500mm f/8 Mirror"));
choices.insert(p_t(65535, "Pentacon Auto 135mm f/2.8"));
choices.insert(p_t(65535, "Pentacon Auto 29mm f/2.8"));
choices.insert(p_t(65535, "Helios 44-2 58mm f/2"));
}
virtual std::string toString (Tag* t)
{
int lensID = t->toInt();
size_t nFound = choices.count( lensID );
container_t::iterator r;
switch( nFound )
{
case 0: // lens Unknown
t->toString (buffer);
return std::string (buffer);
case 1: // lens found
r = choices.find ( lensID );
return r->second;
default:
// More than one hit: we must guess
break;
}
double maxApertureAtFocal = pow(2.0, t->getParent()->getParent()->getTag(0x9205)->toDouble()/2.0); // MaxApertureValue at focal Length
double focalLength = t->getParent()->getParent()->getTag(0x920A)->toDouble(); // Focal Length
double deltaMin = 1000.;
/* Choose the best match: thanks to exiftool by Phil Harvey
* first throws for "out of focal range" and lower or upper aperture of the lens compared to MaxApertureAtFocal
* if the lens is not constant aperture, calculate aprox. aperture of the lens at focalLength
* and compare with actual aperture.
*/
std::string bestMatch("Unknown");
std::ostringstream candidates;
for ( r = choices.lower_bound( lensID ); r != choices.upper_bound(lensID); r++ ){
double a1,a2,f1,f2,lensAperture,dif;
if( !extractLensInfo( r->second ,f1,f2,a1,a2) )
continue;
if( f1 == 0. || a1 == 0.)
continue;
if( focalLength < f1 - .5 || focalLength > f2 + 0.5 )
continue;
if( maxApertureAtFocal < a1 - 0.15 || maxApertureAtFocal > a2 +0.15)
continue;
if( a1 == a2 || f1 == f2)
lensAperture = a1;
else
lensAperture = exp( log(a1)+(log(a2)-log(a1))/(log(f2)-log(f1))*(log(focalLength)-log(f1)) );
dif = ABS(lensAperture - maxApertureAtFocal);
if( dif < deltaMin ){
deltaMin = dif;
bestMatch = r->second;
}
if( dif < 0.15){
if( candidates.tellp() )
candidates << "\n or " << r->second;
else
candidates << r->second;
}
}
if( !candidates.tellp() )
return bestMatch;
else
return candidates.str();
}
};
SALensIDInterpreter saLensIDInterpreter;