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

Various bug fixes (including negative thumbnail bug and return-to-file-browser-tab bugs) and lens data update

Browse Source
This commit is contained in:
ghorvath 2010-01-31 20:28:04 +00:00
parent e247b37e54
commit 57d9e113b9
9 changed files with 267 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
compile
View File

@ -23,6 +23,9 @@ Requirements:
- libtiff, libpng, libjpeg, lcms, libiptcdata development packages
- ...did I forget something?
On Ubuntu/Debian the requirements can be installed by running:
sudo apt-get install build-essential cmake libgtk2.0-dev libgtkmm-2.4-dev libtiff-dev libpng-dev libjpeg-dev liblcms-dev libiptcdata-dev subversion
Compile:
- Enter the root directory of the RawTherapee source tree
- Type: cmake .

7
rtengine/CMakeLists.txt
View File

@ -48,10 +48,13 @@ target_link_libraries (rtengine rtexif ${EXTRA_LIB} ${GOBJECT_LIBRARIES} ${GTHRE
#target_link_libraries (rtcmd rtengine)
#target_link_libraries (ppmap rtengine)
SET (INSTALL_SOURCE_PATH "${CMAKE_BINARY_DIR}/rtengine")
IF (WIN32)
install (FILES librtengine.dll DESTINATION ${CMAKE_CURRENT_SOURCE_DIR}/../release
install (FILES ${INSTALL_SOURCE_PATH}/librtengine.dll DESTINATION ${CMAKE_CURRENT_SOURCE_DIR}/../release
PERMISSIONS OWNER_WRITE OWNER_READ GROUP_EXECUTE GROUP_READ GROUP_EXECUTE GROUP_READ WORLD_EXECUTE WORLD_READ )
ELSE (WIN32)
install (FILES librtengine.so DESTINATION ${CMAKE_CURRENT_SOURCE_DIR}/../release
install (FILES ${INSTALL_SOURCE_PATH}/librtengine.so DESTINATION ${CMAKE_CURRENT_SOURCE_DIR}/../release
PERMISSIONS OWNER_WRITE OWNER_READ GROUP_EXECUTE GROUP_READ GROUP_EXECUTE GROUP_READ WORLD_EXECUTE WORLD_READ )
ENDIF (WIN32)

6
rtengine/rtthumbnail.cc
View File

@ -195,9 +195,9 @@ IImage8* Thumbnail::processImage (const procparams::ProcParams& params, int rhei
int rmi, gmi, bmi;
if (!isRaw || !params.hlrecovery.enabled) {
logDefGain = 0.0;
rmi = 16384.0 * rm * defGain / mul_lum;
gmi = 16384.0 * gm * defGain / mul_lum;
bmi = 16384.0 * bm * defGain / mul_lum;
rmi = 1024.0 * rm * defGain / mul_lum;
gmi = 1024.0 * gm * defGain / mul_lum;
bmi = 1024.0 * bm * defGain / mul_lum;
}
else {
rmi = 1024.0 * rm / mul_lum;

69
rtexif/canonattribs.cc
View File

@ -216,48 +216,86 @@ class CACameraSettingsInterpreter : public Interpreter {
choices[1] = "Canon EF 50mm f/1.8";
choices[2] = "Canon EF 28mm f/2.8";
choices[3] = "Canon EF 135mm f/2.8 Soft";
choices[4] = "Sigma UC Zoom 35-135mm f/4-5.6";
choices[6] = "Tokina AF193-2 19-35mm f/3.5-4.5 or Sigma Lens";
choices[4] = "Canon EF 35-105mm f/3.5-4.5 or Sigma Lens";
choices[5] = "Canon EF 35-70mm f/3.5-4.5";
choices[6] = "Canon EF 28-70mm f/3.5-4.5 or Sigma or Tokina Lens";
choices[7] = "Canon EF 100-300mm F5.6L";
choices[10] = "Canon EF 50mm f/2.5 Macro or Sigma";
choices[8] = "Canon EF 100-300mm f/5.6 or Sigma or Tokina Lens";
choices[9] = "Canon EF 70-210mm f/4 orSigma Lens";
choices[10] = "Canon EF 50mm f/2.5 Macro or Sigma Lens";
choices[11] = "Canon EF 35mm f/2";
choices[13] = "Canon EF 15mm f/2.8";
choices[14] = "Canon EF 50-200mm f/3.5-4.5L";
choices[15] = "Canon EF 50-200mm f/3.5-4.5";
choices[16] = "Canon EF 35-135mm f/3.5-4.5";
choices[17] = "Canon EF 35-70mm f/3.5-4.5A";
choices[18] = "Canon EF 28-70mm f/3.5-4.5";
choices[20] = "Canon EF 100-200mm f/4.5A";
choices[21] = "Canon EF 80-200mm f/2.8L";
choices[22] = "Tokina AT-X280AF PRO 28-80mm F2.8 ASPHERICAL";
choices[22] = "Canon EF 20-35mm f/2.8L or Tokina 28-80mm F2.8";
choices[23] = "Canon EF 35-105mm f/3.5-4.5";
choices[24] = "Canon EF 35-80mm f/4-5.6 Power Zoom";
choices[25] = "Canon EF 35-80mm f/4-5.6 Power Zoom";
choices[26] = "Canon EF 100mm f/2.8 Macro or Cosina 100mm f/3.5 Macro AF or Tamron";
choices[28] = "Tamron AF Aspherical 28-200mm f/3.8-5.6 or 28-75mm f/2.8 or 28-105mm f/2.8";
choices[27] = "Canon EF 35-80mm f/4-5.6";
choices[28] = "Canon EF 80-200mm f/4.5-5.6 or Tamron Lens";
choices[29] = "Canon EF 50mm f/1.8 MkII";
choices[30] = "Canon EF 35-105mm f/4.5-5.6";
choices[31] = "Tamron SP AF 300mm f/2.8 LD IF";
choices[32] = "Canon EF 24mm f/2.8 or Sigma 15mm f/2.8 EX Fisheye";
choices[33] = "Voigtlander Ultron 40mm f/2 SLII Aspherical";
choices[35] = "Canon EF 35-80mm f/4-5.6";
choices[36] = "Canon EF 38-76mm f/4.5-5.6";
choices[37] = "Canon EF 35-80mm f/4-5.6 or Tamron Lens";
choices[38] = "Canon EF 80-200mm f/4.5-5.6";
choices[39] = "Canon EF 75-300mm f/4-5.6";
choices[40] = "Canon EF 28-80mm f/3.5-5.6";
choices[41] = "Canon EF 28-90mm f/4-5.6";
choices[42] = "Canon EF 28-200mm f/3.5-5.6 or Tamron AF 28-300mm f/3.5-6.3";
choices[43] = "Canon EF 28-105mm f/4-5.6";
choices[44] = "Canon EF 90-300mm f/4.5-5.6";
choices[45] = "Canon EF-S 18-55mm f/3.5-5.6";
choices[46] = "Canon EF 28-90mm f/4-5.6";
choices[48] = "Canon EF-S 18-55mm f/3.5-5.6 IS";
choices[49] = "Canon EF-S 55-250mm f/4-5.6 IS";
choices[50] = "Canon EF-S 18-200mm f/3.5-5.6 IS";
choices[51] = "Canon EF-S 18-135mm f/3.5-5.6 IS";
choices[94] = "Canon TS-E 17mm f/4L";
choices[95] = "Canon TS-E 24.0mm f/3.5 L II";
choices[124] = "Canon MP-E 65mm f/2.8 1-5x Macro Photo";
choices[125] = "Canon TS-E 24mm f/3.5L";
choices[126] = "Canon TS-E 45mm f/2.8";
choices[127] = "Canon TS-E 90mm f/2.8";
choices[129] = "Canon EF 300mm f/2.8L";
choices[130] = "Canon EF 50mm f/1.0L";
choices[131] = "Sigma 17-35mm f2.8-4 EX Aspherical HSM";
choices[131] = "Canon EF 28-80mm f/2.8-4L or Sigma Lens";
choices[132] = "Canon EF 1200mm f/5.6L";
choices[134] = "Canon EF 600mm f/4L IS";
choices[135] = "Canon EF 200mm f/1.8L";
choices[136] = "Canon EF 300mm f/2.8L";
choices[137] = "Canon EF 85mm f/1.2L";
choices[137] = "Canon EF 85mm f/1.2L or Sigma Lens";
choices[138] = "Canon EF 28-80mm f/2.8-4L";
choices[139] = "Canon EF 400mm f/2.8L";
choices[140] = "Canon EF 500mm f/4.5L";
choices[141] = "Canon EF 500mm f/4.5L";
choices[142] = "Canon EF 300mm f/2.8L IS";
choices[143] = "Canon EF 500mm f/4L IS";
choices[144] = "Canon EF 35-135mm f/4-5.6 USM";
choices[145] = "Canon EF 100-300mm f/4.5-5.6 USM";
choices[146] = "Canon EF 70-210mm f/3.5-4.5 USM";
choices[147] = "Canon EF 35-135mm f/4-5.6 USM";
choices[148] = "Canon EF 28-80mm f/3.5-5.6 USM";
choices[149] = "Canon EF 100mm f/2";
choices[150] = "Canon EF 14mm f/2.8L or Sigma 20mm EX f/1.8";
choices[150] = "Canon EF 14mm f/2.8L or Sigma Lens";
choices[151] = "Canon EF 200mm f/2.8L";
choices[152] = "Sigma Lens (various models)";
choices[153] = "Canon EF 35-350mm f/3.5-5.6L or Tamron or Sigma Bigma";
choices[152] = "Canon EF 300mm f/4L IS or Sigma Lens";
choices[153] = "Canon EF 35-350mm f/3.5-5.6L or Tamron or Sigma Lens";
choices[154] = "Canon EF 20mm f/2.8 USM";
choices[155] = "Canon EF 85mm f/1.8 USM";
choices[156] = "Canon EF 28-105mm f/3.5-4.5 USM";
choices[160] = "Canon EF 20-35mm f/3.5-4.5 USM";
choices[161] = "Canon EF 28-70mm f/2.8L or Sigma 24-70mm EX f/2.8 or Tamron 90mm f/2.8";
choices[160] = "Canon EF 20-35mm f/3.5-4.5 USM or Tamron AF 19-35mm f/3.5-4.5";
choices[161] = "Canon EF 28-70mm f/2.8L or Sigma or Tamron Lens";
choices[162] = "Canon EF 200mm f/2.8L";
choices[163] = "Canon EF 300mm f/4L";
choices[164] = "Canon EF 400mm f/5.6L";
@ -302,16 +340,20 @@ class CACameraSettingsInterpreter : public Interpreter {
choices[209] = "Canon EF 55-200mm f/4.5-5.6";
choices[210] = "Canon EF 28-90mm f/4-5.6 USM";
choices[211] = "Canon EF 28-200mm f/3.5-5.6";
choices[212] = "Canon EF 28-105mm f/4-5.6 USM";
choices[213] = "Canon EF 90-300mm f/4.5-5.6";
choices[214] = "Canon EF-S 18-55mm f/3.5-4.5 USM";
choices[215] = "Canon EF 55-200mm f/4.5-5.6 II USM";
choices[224] = "Canon EF 70-200mm f/2.8L IS USM";
choices[225] = "Canon EF 70-200mm f/2.8L IS USM + x1.4";
choices[226] = "Canon EF 70-200mm f/2.8L IS USM + x2";
choices[227] = "Canon EF 70-200mm f/2.8L IS + 2.8x";
choices[228] = "Canon EF 28-105mm f/3.5-4.5 USM";
choices[229] = "Canon EF 16-35mm f/2.8L";
choices[230] = "Canon EF 24-70mm f/2.8L";
choices[231] = "Canon EF 17-40mm f/4L";
choices[232] = "Canon EF 70-300mm f/4.5-5.6 DO IS USM";
choices[233] = "Canon EF 28-300mm f/3.5-5.6L IS";
choices[234] = "Canon EF-S 17-85mm f4-5.6 IS USM";
choices[235] = "Canon EF-S10-22mm F3.5-4.5 USM";
choices[236] = "Canon EF-S60mm F2.8 Macro USM";
@ -326,6 +368,11 @@ class CACameraSettingsInterpreter : public Interpreter {
choices[245] = "Canon EF 70-200mm f/4L IS + 2.8x";
choices[246] = "Canon EF 16-35mm f/2.8L II";
choices[247] = "Canon EF 14mm f/2.8L II USM";
choices[248] = "Canon EF 200mm f/2L IS";
choices[249] = "Canon EF 800mm f/5.6L IS";
choices[250] = "Canon EF 24 f/1.4L II";
choices[254] = "Canon EF 100mm f/2.8L Macro IS USM";
choices[488] = "Canon EF-S 15-85mm f/3.5-5.6 IS USM";
}
virtual std::string toString (Tag* t) {
std::ostringstream str;

103
rtexif/nikonattribs.cc
View File

@ -172,6 +172,10 @@ class NALensDataInterpreter : public Interpreter {
std::map<std::string,std::string> lenses;
public:
NALensDataInterpreter () {
lenses["00 00 00 00 00 00 00 01"] = "Manual Lens No CPU ";
lenses["00 00 00 00 00 00 E1 12"] = "TC-17E II ";
lenses["00 00 00 00 00 00 F1 0C"] = "TC-14E [II] or Sigma APO Tele Converter 1.4x EX DG or Kenko Teleplus PRO 300 DG 1.4x";
lenses["00 00 00 00 00 00 F2 18"] = "TC-20E [II] or Sigma APO Tele Converter 2x EX DG or Kenko Teleplus PRO 300 DG 2.0x";
lenses["00 36 1C 2D 34 3C 00 06"] = "Tamron SP AF11-18mm f/4.5-5.6 Di II LD Aspherical (IF)";
lenses["00 3C 1F 37 30 30 00 06"] = "Tokina AT-X 124 AF PRO DX - AF 12-24mm F4";
lenses["00 3E 80 A0 38 3F 00 02"] = "Tamron SP AF200-500mm f/5-6.3 Di LD (IF)";
@ -179,16 +183,34 @@ class NALensDataInterpreter : public Interpreter {
lenses["00 3F 2D 80 2C 40 00 06"] = "Tamron AF18-200mm f/3.5-6.3 XR Di II LD Aspherical (IF) Macro";
lenses["00 3F 80 A0 38 3F 00 02"] = "Tamron SP AF200-500mm f/5-6.3 Di";
lenses["00 40 18 2B 2C 34 00 06"] = "Tokina AT-X 107 DX Fish-Eye - AF 10-17mm F3.5-4.5";
lenses["00 40 2A 72 2C 3C 00 06"] = "Tokina AT-X 16.5-135 DX (AF 16.5-135mm F3.5-5.6)";
lenses["00 40 2B 2B 2C 2C 00 02"] = "Tokina AT-X 17 AF PRO - AF 17mm F3.5";
lenses["00 40 2D 80 2C 40 00 06"] = "Tamron AF 18-200mm f/3.5-6.3 XR Di II LD Aspherical (IF) Macro (A14NII)";
lenses["00 40 2D 88 2C 40 00 06"] = "Tamron AF 18-250mm f/3.5-6.3 Di II LD Aspherical (IF) Macro (A18NII)";
lenses["00 40 2D 88 2C 40 62 06"] = "Tamron AF 18-250mm f/3.5-6.3 Di II LD Aspherical (IF) Macro (A18)";
lenses["00 40 31 31 2C 2C 00 00"] = "Voigtlander Color Skopar 20mm F3.5 SLII Aspherical";
lenses["00 44 60 98 34 3C 00 02"] = "Tokina AT-X 840D 80-400mm F4.5-5.6";
lenses["00 47 10 10 24 24 00 00"] = "Fisheye Nikkor 8mm f/2.8 AiS";
lenses["00 47 44 44 24 24 00 06"] = "Tokina AT-X M35 PRO DX (AF 35mm f/2.8 Macro)";
lenses["00 47 53 80 30 3C 00 06"] = "Tamron AF55-200mm f/4-5.6 Di II LD";
lenses["00 48 1C 29 24 24 00 06"] = "Tokina AT-X 116 PRO DX (AF 11-16mm f/2.8)";
lenses["00 48 29 50 24 24 00 06"] = "Tokina AT-X 165 PRO DX - AF 16-50mm F2.8";
lenses["00 48 3C 60 24 24 00 02"] = "Tokina AT-X 280 AF PRO 28-80mm F2.8 Aspherical";
lenses["00 48 3C 6A 24 24 00 02"] = "Tamron SP AF28-105mm f/2.8";
lenses["00 48 50 50 18 18 00 00"] = "Nikkor H 50mm f/2";
lenses["00 48 50 72 24 24 00 06"] = "Tokina AT-X 535 PRO DX - AF 50-135mm F2.8";
lenses["00 48 5C 8E 30 3C 00 06"] = "Tamron AF 70-300mm f/4-5.6 Di LD Macro 1:2 (A17)";
lenses["00 48 68 68 24 24 00 00"] = "Series E 100mm f/2.8";
lenses["00 48 80 80 30 30 00 00"] = "Nikkor 200mm f/4 AiS";
lenses["00 49 30 48 22 2B 00 02"] = "Tamron SP AF20-40mm f/2.7-3.5";
lenses["00 4C 6A 6A 20 20 00 00"] = "Nikkor 105mm f/2.5 AiS";
lenses["00 4C 7C 7C 2C 2C 00 02"] = "Tamron SP AF180mm f/3.5 Di Model B01";
lenses["00 53 2B 50 24 24 00 06"] = "Tamron SP AF17-50mm f/2.8 (A16)";
lenses["00 54 2B 50 24 24 00 06"] = "Tamron SP AF 17-50mm f/2.8 XR Di II LD Aspherical (IF) (A16NII)";
lenses["00 54 44 44 0C 0C 00 00"] = "Nikkor 35mm f/1.4 AiS";
lenses["00 54 48 48 18 18 00 00"] = "Voigtlander Ultron 40mm F2 SLII Aspherical";
lenses["00 54 55 55 0C 0C 00 00"] = "Voigtlander Nokton 58mm F1.4 SLII";
lenses["00 54 56 56 30 30 00 00"] = "Coastal Optical Systems 60mm 1:4 UV-VIS-IR Macro Apo";
lenses["00 54 68 68 24 24 00 02"] = "Tokina AT-X M100 PRO D - 100mm F2.8";
lenses["00 54 8E 8E 24 24 00 02"] = "Tokina AT-X 300 AF PRO 300mm F2.8";
lenses["01 00 00 00 00 00 02 00"] = "AF Teleconverter TC-16A 1.6x";
@ -197,6 +219,8 @@ class NALensDataInterpreter : public Interpreter {
lenses["02 2F 98 98 3D 3D 02 00"] = "Sigma 400mm F5.6 APO";
lenses["02 37 5E 8E 35 3D 02 00"] = "Sigma 75-300mm F4.5-5.6 APO";
lenses["02 37 A0 A0 34 34 02 00"] = "Sigma APO 500mm F4.5";
lenses["02 3A 5E 8E 32 3D 02 00"] = "Sigma 75-300mm F4.0-5.6";
lenses["02 3B 44 61 30 3D 02 00"] = "Sigma 35-80mm F4-5.6";
lenses["02 3F 24 24 2C 2C 02 00"] = "Sigma 14mm F3.5";
lenses["02 3F 3C 5C 2D 35 02 00"] = "Sigma 28-70mm F3.5-4.5 UC";
lenses["02 40 44 73 2B 36 02 00"] = "Sigma 35-135mm F3.5-4.5 a";
@ -212,10 +236,15 @@ class NALensDataInterpreter : public Interpreter {
lenses["05 54 50 50 0C 0C 04 00"] = "AF Nikkor 50mm f/1.4";
lenses["06 3F 68 68 2C 2C 06 00"] = "Cosina 100mm f/3.5 Macro";
lenses["06 54 53 53 24 24 06 00"] = "AF Micro-Nikkor 55mm f/2.8";
lenses["07 36 3D 5F 2C 3C 03 00"] = "Cosina AF Zoom 28-80mm F3.5-5.6 MC Macro";
lenses["07 3E 30 43 2D 35 03 00"] = "Soligor AF Zoom 19-35mm 1:3.5-4.5 MC";
lenses["07 40 2F 44 2C 34 03 02"] = "Tamron AF19-35mm f/3.5-4.5 N";
lenses["07 40 30 45 2D 35 03 02"] = "Tamron AF19-35mm f/3.5-4.5";
lenses["07 40 3C 62 2C 34 03 00"] = "AF Zoom-Nikkor 28-85mm f/3.5-4.5";
lenses["07 46 2B 44 24 30 03 02"] = "Tamron SP AF17-35mm f/2.8-4 Di LD Aspherical (IF)";
lenses["07 46 3D 6A 25 2F 03 00"] = "Cosina AF Zoom 28-105mm F2.8-3.8 MC";
lenses["07 47 3C 5C 25 35 03 00"] = "Tokina AF 287 SD (AF 28-70mm f/2.8-4.5)";
lenses["07 48 3C 5C 24 24 03 00"] = "Tokina AT-X 287 AF (AF 28-70mm f/2.8)";
lenses["08 40 44 6A 2C 34 04 00"] = "AF Zoom-Nikkor 35-105mm f/3.5-4.5";
lenses["09 48 37 37 24 24 04 00"] = "AF Nikkor 24mm f/2.8";
lenses["0A 48 8E 8E 24 24 03 00"] = "AF Nikkor 300mm f/2.8 IF-ED";
@ -229,14 +258,19 @@ class NALensDataInterpreter : public Interpreter {
lenses["10 3D 3C 60 2C 3C D2 02"] = "Tamron AF28-80mm f/3.5-5.6 Aspherical";
lenses["10 48 8E 8E 30 30 08 00"] = "AF Nikkor 300mm f/4 IF-ED";
lenses["11 48 44 5C 24 24 08 00"] = "AF Zoom-Nikkor 35-70mm f/2.8";
lenses["12 36 5C 81 35 3D 09 00"] = "Cosina AF Zoom 70-210mm F4.5-5.6 MC Macro";
lenses["12 39 5C 8E 34 3D 08 02"] = "Cosina AF Zoom 70-300mm F4.5-5.6 MC Macro";
lenses["12 3B 68 8D 3D 43 09 02"] = "Unknown 100-290mm f/5.6-6.7";
lenses["12 3D 3C 80 2E 3C DF 02"] = "Tamron AF 28-200mm f/3.8-5.6 AF Aspherical LD (IF) (271D)";
lenses["12 48 5C 81 30 3C 09 00"] = "AF Nikkor 70-210mm f/4-5.6";
lenses["12 4A 5C 81 31 3D 09 00"] = "Soligor AF C/D Auto Zoom+Macro 70-210mm 1:4-5.6 UMCS";
lenses["13 42 37 50 2A 34 0B 00"] = "AF Zoom-Nikkor 24-50mm f/3.3-4.5";
lenses["14 48 60 80 24 24 0B 00"] = "AF Zoom-Nikkor 80-200mm f/2.8 ED";
lenses["14 48 68 8E 30 30 0B 00"] = "Tokina AT-X 340 AF II 100-300mm F4";
lenses["14 54 60 80 24 24 0B 00"] = "Tokina AT-X 828 AF 80-200mm F2.8";
lenses["15 4C 62 62 14 14 0C 00"] = "AF Nikkor 85mm f/1.8";
lenses["17 3C A0 A0 30 30 11 00"] = "Nikkor 500mm f/4 P";
lenses["17 3C A0 A0 30 30 0F 00"] = "Nikkor 500mm f/4 P ED IF";
lenses["17 3C A0 A0 30 30 11 00"] = "Nikkor 500mm f/4 P ED IF";
lenses["18 40 44 72 2C 34 0E 00"] = "AF Zoom-Nikkor 35-135mm f/3.5-4.5 N";
lenses["1A 54 44 44 18 18 11 00"] = "AF Nikkor 35mm f/2";
lenses["1B 44 5E 8E 34 3C 10 00"] = "AF Zoom-Nikkor 75-300mm f/4.5-5.6";
@ -249,6 +283,7 @@ class NALensDataInterpreter : public Interpreter {
lenses["20 48 60 80 24 24 15 00"] = "AF Zoom-Nikkor ED 80-200mm f/2.8";
lenses["21 40 3C 5C 2C 34 16 00"] = "AF Zoom-Nikkor 28-70mm f/3.5-4.5";
lenses["22 48 72 72 18 18 16 00"] = "AF DC-Nikkor 135mm f/2";
lenses["23 30 BE CA 3C 48 17 00"] = "Zoom-Nikkor 1200-1700mm f/5.6-8 P ED IF";
lenses["24 44 60 98 34 3C 1A 02"] = "Tokina AT-X 840 AF II 80-400mm F4.5-5.6";
lenses["24 48 60 80 24 24 1A 02"] = "AF Zoom-Nikkor ED 80-200mm f/2.8D";
lenses["25 48 3C 5C 24 24 1B 02"] = "Tokina AT-X 287 AF PRO SV 28-70mm F2.8";
@ -257,6 +292,7 @@ class NALensDataInterpreter : public Interpreter {
lenses["26 3C 54 80 30 3C 1C 06"] = "Sigma 55-200mm F4-5.6 DC";
lenses["26 3C 5C 82 30 3C 1C 02"] = "Sigma 70-210mm F4-5.6 UC-II";
lenses["26 3C 5C 8E 30 3C 1C 02"] = "Sigma 70-300mm F4-5.6 DG Macro";
lenses["26 3D 3C 80 2F 3D 1C 02"] = "Sigma 28-300mm F3.8-5.6 Aspherical";
lenses["26 3E 3C 6A 2E 3C 1C 02"] = "Sigma 28-105mm F3.8-5.6 UC-III Aspherical IF";
lenses["26 40 27 3F 2C 34 1C 02"] = "Sigma 15-30mm F3.5-4.5 EX Aspherical DG DF";
lenses["26 40 2D 44 2B 34 1C 02"] = "Sigma 18-35 F3.5-4.5 Aspherical";
@ -293,12 +329,20 @@ class NALensDataInterpreter : public Interpreter {
lenses["27 48 8E 8E 24 24 F1 02"] = "AF-I Nikkor 300mm f/2.8D IF-ED + TC-14E";
lenses["27 48 8E 8E 24 24 F2 02"] = "AF-I Nikkor 300mm f/2.8D IF-ED + TC-20E";
lenses["28 3C A6 A6 30 30 1D 02"] = "AF-I Nikkor 600mm f/4D IF-ED";
lenses["28 3C A6 A6 30 30 E1 02"] = "AF-I Nikkor 600mm f/4D IF-ED + TC-17E";
lenses["28 3C A6 A6 30 30 F1 02"] = "AF-I Nikkor 600mm f/4D IF-ED + TC-14E";
lenses["28 3C A6 A6 30 30 F2 02"] = "AF-I Nikkor 600mm f/4D IF-ED + TC-20E";
lenses["2A 54 3C 3C 0C 0C 26 02"] = "AF Nikkor 28mm f/1.4D";
lenses["2B 3C 44 60 30 3C 1F 02"] = "AF Zoom-Nikkor 35-80mm f/4-5.6D";
lenses["2C 48 6A 6A 18 18 27 02"] = "AF DC-Nikkor 105mm f/2D";
lenses["2D 48 80 80 30 30 21 02"] = "AF Micro-Nikkor 200mm f/4D IF-ED";
lenses["2E 48 5C 82 30 3C 28 02"] = "AF Nikkor 70-210mm f/4-5.6D";
lenses["2F 40 30 44 2C 34 29 02"] = "Unknown 20-35mm f/3.5-4.5D";
lenses["2F 48 30 44 24 24 29 02"] = "Tokina AT-X 235 AF PRO - AF 20-35mm f/2.8";
lenses["30 48 98 98 24 24 24 02"] = "AF-I Nikkor 400mm f/2.8D IF-ED";
lenses["30 48 98 98 24 24 E1 02"] = "AF-I Nikkor 400mm f/2.8D IF-ED + TC-17E";
lenses["30 48 98 98 24 24 F1 02"] = "AF-I Nikkor 400mm f/2.8D IF-ED + TC-14E";
lenses["30 48 98 98 24 24 F2 02"] = "AF-I Nikkor 400mm f/2.8D IF-ED + TC-20E";
lenses["31 54 56 56 24 24 25 02"] = "AF Micro-Nikkor 60mm f/2.8D";
lenses["32 53 64 64 24 24 35 02"] = "Tamron SP AF90mm f/2.8 Di Macro 1:2 (272E)";
lenses["32 54 50 50 24 24 35 02"] = "Sigma 50mm F2.8 EX DG Macro";
@ -306,16 +350,23 @@ class NALensDataInterpreter : public Interpreter {
lenses["33 48 2D 2D 24 24 31 02"] = "AF Nikkor 18mm f/2.8D";
lenses["33 54 3C 5E 24 24 62 02"] = "Tamron SP AF28-75mm f/2.8 XR Di LD Aspherical (IF) Macro";
lenses["34 48 29 29 24 24 32 02"] = "AF Fisheye Nikkor 16mm f/2.8D";
lenses["35 3C A0 A0 30 30 33 02"] = "AF-I Nikkor 500mm f/4D IF-ED";
lenses["35 3C A0 A0 30 30 E1 02"] = "AF-I Nikkor 500mm f/4D IF-ED + TC-17E";
lenses["35 3C A0 A0 30 30 F1 02"] = "AF-I Nikkor 500mm f/4D IF-ED + TC-14E";
lenses["35 3C A0 A0 30 30 F2 02"] = "AF-I Nikkor 500mm f/4D IF-ED + TC-20E";
lenses["36 48 37 37 24 24 34 02"] = "AF Nikkor 24mm f/2.8D";
lenses["37 48 30 30 24 24 36 02"] = "AF Nikkor 20mm f/2.8D";
lenses["38 4C 62 62 14 14 37 02"] = "AF Nikkor 85mm f/1.8D";
lenses["3A 40 3C 5C 2C 34 39 02"] = "AF Zoom-Nikkor 28-70mm f/3.5-4.5D";
lenses["3B 48 44 5C 24 24 3A 02"] = "AF Zoom-Nikkor 35-70mm f/2.8D N";
lenses["3C 48 60 80 24 24 3B 02"] = "AF Zoom-Nikkor 80-200mm f/2.8D ED";
lenses["3D 3C 44 60 30 3C 3E 02"] = "AF Zoom-Nikkor 35-80mm f/4-5.6D";
lenses["3E 48 3C 3C 24 24 3D 02"] = "AF Nikkor 28mm f/2.8D";
lenses["3F 40 44 6A 2C 34 45 02"] = "AF Zoom-Nikkor 35-105mm f/3.5-4.5D";
lenses["41 48 7C 7C 24 24 43 02"] = "AF Nikkor 180mm f/2.8D IF-ED";
lenses["42 54 44 44 18 18 44 02"] = "AF Nikkor 35mm f/2D";
lenses["43 54 50 50 0C 0C 46 02"] = "AF Nikkor 50mm f/1.4D";
lenses["44 44 60 80 34 3C 47 02"] = "AF Zoom-Nikkor 80-200mm f/4.5-5.6D ";
lenses["45 3D 3C 60 2C 3C 48 02"] = "Tamron AF28-80mm f/3.5-5.6 Aspherical";
lenses["45 40 3C 60 2C 3C 48 02"] = "AF Zoom-Nikkor 28-80mm F/3.5-5.6D";
lenses["45 41 37 72 2C 3C 48 02"] = "Tamron SP AF24-135mm f/3.5-5.6 AD Aspherical (IF) Macro";
@ -325,11 +376,16 @@ class NALensDataInterpreter : public Interpreter {
lenses["48 3C 19 31 30 3C 4B 06"] = "Sigma 10-20mm F4-5.6 EX DC HSM";
lenses["48 3C 50 A0 30 40 4B 02"] = "Sigma 50-500mm F4-6.3 EX APO RF HSM";
lenses["48 3C 8E B0 3C 3C 4B 02"] = "Sigma APO 300-800 F5.6 EX DG HSM";
lenses["48 3C B0 B0 3C 3C 4B 02"] = "Sigma APO 800mm F5.6 EX HSM";
lenses["48 44 A0 A0 34 34 4B 02"] = "Sigma APO 500mm F4.5 EX HSM";
lenses["48 48 24 24 24 24 4B 02"] = "Sigma 14mm F2.8 EX Aspherical HSM";
lenses["48 48 2B 44 24 30 4B 06"] = "Sigma 17-35mm F2.8-4 EX DG Aspherical HSM";
lenses["48 48 68 8E 30 30 4B 02"] = "Sigma 100-300mm F4 EX IF HSM";
lenses["48 48 76 76 24 24 4B 06"] = "Sigma 150mm F2.8 EX DG APO Macro HSM";
lenses["48 48 8E 8E 24 24 4B 02"] = "AF-S Nikkor 300mm f/2.8D IF-ED";
lenses["48 48 8E 8E 24 24 E1 02"] = "AF-S Nikkor 300mm f/2.8D IF-ED + TC-17E";
lenses["48 48 8E 8E 24 24 F1 02"] = "AF-S Nikkor 300mm f/2.8D IF-ED + TC-14E";
lenses["48 48 8E 8E 24 24 F2 02"] = "AF-S Nikkor 300mm f/2.8D IF-ED + TC-20E";
lenses["48 4C 7C 7C 2C 2C 4B 02"] = "Sigma 180mm F3.5 EX DG Macro";
lenses["48 4C 7D 7D 2C 2C 4B 02"] = "Sigma APO MACRO 180mm F3.5 EX DG HSM";
lenses["48 54 3E 3E 0C 0C 4B 06"] = "Sigma 30mm F1.4 EX DC HSM";
@ -337,21 +393,32 @@ class NALensDataInterpreter : public Interpreter {
lenses["48 54 6F 8E 24 24 4B 02"] = "Sigma APO 120-300mm F2.8 EX DG HSM";
lenses["48 54 8E 8E 24 24 4B 02"] = "Sigma APO 300mm F2.8 EX DG HSM";
lenses["49 3C A6 A6 30 30 4C 02"] = "AF-S Nikkor 600mm f/4D IF-ED";
lenses["49 3C A6 A6 30 30 E1 02"] = "AF-S Nikkor 600mm f/4D IF-ED + TC-17E";
lenses["49 3C A6 A6 30 30 F1 02"] = "AF-S Nikkor 600mm f/4D IF-ED + TC-14E";
lenses["49 3C A6 A6 30 30 F2 02"] = "AF-S Nikkor 600mm f/4D IF-ED + TC-20E";
lenses["4A 54 62 62 0C 0C 4D 02"] = "AF Nikkor 85mm f/1.4D IF";
lenses["4B 3C A0 A0 30 30 4E 02"] = "AF-S Nikkor 500mm f/4D IF-ED";
lenses["4B 3C A0 A0 30 30 E1 02"] = "AF-S Nikkor 500mm f/4D IF-ED + TC-17E";
lenses["4B 3C A0 A0 30 30 F1 02"] = "AF-S Nikkor 500mm f/4D IF-ED + TC-14E";
lenses["4B 3C A0 A0 30 30 F2 02"] = "AF-S Nikkor 500mm f/4D IF-ED + TC-20E";
lenses["4C 40 37 6E 2C 3C 4F 02"] = "AF Zoom-Nikkor 24-120mm f/3.5-5.6D IF";
lenses["4D 40 3C 80 2C 3C 62 02"] = "AF Zoom-Nikkor 28-200mm f/3.5-5.6D IF";
lenses["4D 41 3C 8E 2B 40 62 02"] = "Tamron AF28-300mm f/3.5-6.3 XR Di LD Aspherical (IF)";
lenses["4D 41 3C 8E 2C 40 62 02"] = "Tamron AF28-300mm f/3.5-6.3 XR LD Aspherical (IF)";
lenses["4E 48 72 72 18 18 51 02"] = "AF DC-Nikkor 135mm f/2D";
lenses["4F 40 37 5C 2C 3C 53 06"] = "IX-Nikkor 24-70mm f/3.5-5.6";
lenses["50 48 56 7C 30 3C 54 06"] = "IX-Nikkor 60-180mm f/4-5.6";
lenses["53 48 60 80 24 24 57 02"] = "AF Zoom-Nikkor 80-200mm f/2.8D ED";
lenses["53 48 60 80 24 24 60 02"] = "AF Zoom-Nikkor 80-200mm f/2.8D ED";
lenses["54 44 5C 7C 34 3C 58 02"] = "AF Zoom-Micro Nikkor 70-180mm f/4.5-5.6D ED";
lenses["56 3C 5C 8E 30 3C 1C 02"] = "Sigma 70-300mm F4-5.6 APO Macro Super II";
lenses["56 48 5C 8E 30 3C 5A 02"] = "AF Zoom-Nikkor 70-300mm f/4-5.6D ED";
lenses["59 48 98 98 24 24 5D 02"] = "AF-S Nikkor 400mm f/2.8D IF-ED";
lenses["59 48 98 98 24 24 E1 02"] = "AF-S Nikkor 400mm f/2.8D IF-ED + TC-17E";
lenses["59 48 98 98 24 24 F1 02"] = "AF-S Nikkor 400mm f/2.8D IF-ED + TC-14E";
lenses["59 48 98 98 24 24 F2 02"] = "AF-S Nikkor 400mm f/2.8D IF-ED + TC-20E";
lenses["5A 3C 3E 56 30 3C 5E 06"] = "IX-Nikkor 30-60mm f/4-5.6";
lenses["5B 44 56 7C 34 3C 5F 06"] = "IX-Nikkor 60-180mm f/4.5-5.6";
lenses["5D 48 3C 5C 24 24 63 02"] = "AF-S Zoom-Nikkor 28-70mm f/2.8D IF-ED";
lenses["5E 48 60 80 24 24 64 02"] = "AF-S Zoom-Nikkor 80-200mm f/2.8D IF-ED";
lenses["5F 40 3C 6A 2C 34 65 02"] = "AF Zoom-Nikkor 28-105mm f/3.5-4.5D IF";
@ -387,11 +454,15 @@ class NALensDataInterpreter : public Interpreter {
lenses["7A 40 2D 50 2C 3C 4B 06"] = "Sigma 18-50mm F3.5-5.6 DC HSM";
lenses["7A 47 2B 5C 24 34 4B 06"] = "Sigma 17-70mm F2.8-4.5 DC Macro Asp. IF HSM";
lenses["7A 47 50 76 24 24 4B 06"] = "Sigma APO 50-150mm F2.8 EX DC HSM";
lenses["7A 48 2B 5C 24 34 4B 06"] = "Sigma 17-70mm F2.8-4.5 DC Macro Asp. IF HSM";
lenses["7A 48 2D 50 24 24 4B 06"] = "Sigma 18-50mm F2.8 EX DC HSM";
lenses["7A 48 5C 80 24 24 4B 06"] = "Sigma 70-200mm F2.8 EX APO DG Macro HSM II";
lenses["7A 54 6E 8E 24 24 4B 02"] = "Sigma APO 120-300mm F2.8 EX DG HSM";
lenses["7B 48 80 98 30 30 80 0E"] = "AF-S VR Zoom-Nikkor 200-400mm f/4G IF-ED";
lenses["7D 48 2B 53 24 24 82 06"] = "AF-S DX Zoom-Nikkor 17-55mm f/2.8G IF-ED";
lenses["7F 40 2D 5C 2C 34 84 06"] = "AF-S DX Zoom-Nikkor 18-70mm f/3.5-4.5G IF-ED";
lenses["7F 48 2B 5C 24 34 1C 06"] = "Sigma 17-70mm F2.8-4.5 DC Macro Asp. IF";
lenses["7F 48 2D 50 24 24 1C 06"] = "Sigma 18-50mm F2.8 EX DC Macro";
lenses["80 48 1A 1A 24 24 85 06"] = "AF DX Fisheye-Nikkor 10.5mm f/2.8G ED";
lenses["81 54 80 80 18 18 86 0E"] = "AF-S VR Nikkor 200mm f/2G IF-ED";
lenses["82 48 8E 8E 24 24 87 0E"] = "AF-S VR Nikkor 300mm f/2.8G IF-ED";
@ -413,15 +484,45 @@ class NALensDataInterpreter : public Interpreter {
lenses["98 3C A6 A6 30 30 9A 0E"] = "AF-S VR Nikkor 600mm f/4G ED";
lenses["99 40 29 62 2C 3C 9B 0E"] = "AF-S DX VR Zoom-Nikkor 16-85mm f/3.5-5.6G ED";
lenses["9A 40 2D 53 2C 3C 9C 0E"] = "AF-S DX VR Zoom-Nikkor 18-55mm f/3.5-5.6G";
lenses["9B 00 4C 4C 24 24 9D 06"] = "PC-E Micro Nikkor 45mm f/2.8D ED";
lenses["9B 54 4C 4C 24 24 9D 02"] = "PC-E Micro Nikkor 45mm f/2.8D ED";
lenses["9C 54 56 56 24 24 9E 06"] = "AF-S Micro Nikkor 60mm f/2.8G ED";
lenses["9D 00 62 62 24 24 9F 06"] = "PC-E Micro Nikkor 85mm f/2.8D";
lenses["9D 54 62 62 24 24 9F 02"] = "PC-E Micro Nikkor 85mm f/2.8D";
lenses["9E 40 2D 6A 2C 3C A0 0E"] = "AF-S DX VR Zoom-Nikkor 18-105mm f/3.5-5.6G ED";
lenses["9F 58 44 44 14 14 A1 06"] = "AF-S DX Nikkor 35mm f/1.8G";
lenses["A0 54 50 50 0C 0C A2 06"] = "AF-S Nikkor 50mm f/1.4G";
lenses["A1 40 18 37 2C 34 A3 06"] = "AF-S DX Nikkor 10-24mm f/3.5-4.5G ED";
lenses["A1 41 19 31 2C 2C 4B 06"] = "Sigma 10-20mm F3.5 EX DC HSM";
lenses["A2 48 5C 80 24 24 A4 0E"] = "AF-S Nikkor 70-200mm f/2.8G ED VR II";
lenses["A5 40 2D 88 2C 40 4B 0E"] = "Sigma 18-250mm F3.5-6.3 DC OS HSM";
lenses["A6 48 37 5C 24 24 4B 06"] = "Sigma 24-70mm F2.8 IF EX DG HSM";
lenses["B6 48 37 56 24 24 1C 02"] = "Sigma 24-60mm F2.8 EX DG";
lenses["CD 3D 2D 70 2E 3C 4B 0E"] = "Sigma 18-125mm F3.8-5.6 DC OS HSM";
lenses["CE 34 76 A0 38 40 4B 0E"] = "Sigma 150-500mm F5-6.3 DG OS APO HSM";
lenses["CF 38 6E 98 34 3C 4B 0E"] = "Sigma APO 120-400mm F4.5-5.6 DG OS HSM";
lenses["DC 48 19 19 24 24 4B 06"] = "Sigma 10mm F2.8 EX DC HSM Fisheye";
lenses["DE 54 50 50 0C 0C 4B 06"] = "Sigma 50mm F1.4 EX DG HSM";
lenses["E0 3C 5C 8E 30 3C 4B 06"] = "Sigma 70-300mm F4-5.6 APO DG Macro HSM";
lenses["E1 58 37 37 14 14 1C 02"] = "Sigma 24mm F1.8 EX DG Aspherical Macro";
lenses["E5 54 6A 6A 24 24 35 02"] = "Sigma Macro 105mm F2.8 EX DG";
lenses["E9 54 37 5C 24 24 1C 02"] = "Sigma 24-70mm F2.8 EX DG Macro";
lenses["ED 40 2D 80 2C 40 4B 0E"] = "Sigma 18-200mm F3.5-6.3 DC OS HSM";
lenses["EE 48 5C 80 24 24 4B 06"] = "Sigma 70-200mm F2.8 EX APO DG Macro HSM II";
lenses["F0 38 1F 37 34 3C 4B 06"] = "Sigma 12-24mm F4.5-5.6 EX DG Aspherical HSM";
lenses["F3 54 2B 50 24 24 84 0E"] = "Tamron SP AF 17-50mm F/2.8 XR Di II VC LD Aspherical (IF) (B005)";
lenses["F4 54 56 56 18 18 84 06"] = "Tamron SP AF 60mm f/2.0 Di II Macro 1:1 (G005)";
lenses["F5 40 2C 8A 2C 40 40 0E"] = "Tamron AF 18-270mm f/3.5-6.3 Di II VC LD Aspherical (IF) Macro (B003)";
lenses["F5 48 76 76 24 24 4B 06"] = "Sigma 150mm F2.8 EX DG APO Macro HSM";
lenses["F6 3F 18 37 2C 34 84 06"] = "Tamron SP AF 10-24mm f/3.5-4.5 Di II LD Aspherical (IF) (B001)";
lenses["F7 53 5C 80 24 24 84 06"] = "Tamron SP AF 70-200mm f/2.8 Di LD (IF) Macro (A001)";
lenses["F8 54 3E 3E 0C 0C 4B 06"] = "Sigma 30mm F1.4 EX DC HSM";
lenses["F8 55 64 64 24 24 84 06"] = "Tamron SP AF 90mm f/2.8 Di Macro 1:1 (272NII)";
lenses["F9 3C 19 31 30 3C 4B 06"] = "Sigma 10-20mm F4-5.6 EX DC HSM";
lenses["F9 40 3C 8E 2C 40 40 0E"] = "Tamron AF 28-300mm f/3.5-6.3 XR Di VC LD Aspherical (IF) Macro (A20)";
lenses["FA 54 3C 5E 24 24 84 06"] = "Tamron SP AF 28-75mm f/2.8 XR Di LD Aspherical (IF) Macro (A09NII)";
lenses["FB 54 8E 8E 24 24 4B 02"] = "Sigma APO 300mm F2.8 EX DG HSM";
lenses["FD 47 50 76 24 24 4B 06"] = "Sigma 50-150mm F2.8 EX APO DC HSM II";
lenses["FE 47 00 00 24 24 4B 06"] = "Sigma 4.5mm F2.8 EX DC Circular Fisheye HSM";
}
virtual std::string toString (Tag* t) {

39
rtexif/pentaxattribs.cc
View File

@ -37,6 +37,7 @@ class PAQualityInterpreter : public ChoiceInterpreter {
choices[2] = "Best";
choices[3] = "TIFF";
choices[4] = "RAW";
choices[5] = "Premium";
}
};
PAQualityInterpreter paQualityInterpreter;
@ -54,6 +55,7 @@ class PAPictureModeInterpreter : public ChoiceInterpreter {
public:
PAPictureModeInterpreter () {
choices[0] = "Program";
choices[1] = "Shutter Speed Priority";
choices[2] = "Program AE";
choices[3] = "Manual";
choices[5] = "Portrait";
@ -71,8 +73,10 @@ class PAPictureModeInterpreter : public ChoiceInterpreter {
choices[30] = "Self Portrait";
choices[31] = "Illustrations";
choices[33] = "Digital Filter";
choices[35] = "Night Scene Portrait";
choices[37] = "Museum";
choices[38] = "Food";
choices[39] = "Underwater";
choices[40] = "Green Mode";
choices[49] = "Light Pet";
choices[50] = "Dark Pet";
@ -82,8 +86,10 @@ class PAPictureModeInterpreter : public ChoiceInterpreter {
choices[55] = "Natural Skin Tone";
choices[56] = "Synchro Sound Record";
choices[58] = "Frame Composite";
choices[59] = "Report";
choices[60] = "Kids";
choices[61] = "Blur Reduction";
choices[65] = "Half-length Portrait";
}
};
PAPictureModeInterpreter paPictureModeInterpreter;
@ -116,9 +122,11 @@ class PAFocusModeInterpreter : public ChoiceInterpreter {
choices[1] = "Macro";
choices[2] = "Infinity";
choices[3] = "Manual";
choices[4] = "Super Macro";
choices[5] = "Pan Focus";
choices[16] = "AF-S";
choices[17] = "AF-C";
choices[18] = "AF-A";
}
};
PAFocusModeInterpreter paFocusModeInterpreter;
@ -137,6 +145,8 @@ class PAAFPointInterpreter : public ChoiceInterpreter {
choices[9] = "Lower-left";
choices[10] = "Bottom";
choices[11] = "Lower-right";
choices[65532] = "Face Recognition AF";
choices[65533] = "Automatic Tracking AF";
choices[65534] = "Fixed Center";
choices[65535] = "Auto";
}
@ -330,6 +340,7 @@ class PALensTypeInterpreter : public ChoiceInterpreter {
choices[256*3+ 41] = "smc PENTAX-F MACRO 50mm F2.8 or Sigma 50mm F2,8 MACRO";
choices[256*3+ 44] = "Tamron 35-90mm F4 AF or various SIGMA models";
choices[256*3+ 46] = "SIGMA APO 70-200mm F2.8 EX";
choices[256*3+ 50] = "smc PENTAX-FA 28-70 F4 AL";
choices[256*3+ 51] = "SIGMA 28mm F1.8 EX DG ASPHERICAL MACRO";
choices[256*3+ 52] = "smc PENTAX-FA 28-200mm F3.8-5.6 AL[IF]";
choices[256*3+ 53] = "smc PENTAX-FA 28-80mm F3.5-5.6 AL";
@ -350,6 +361,7 @@ class PALensTypeInterpreter : public ChoiceInterpreter {
choices[256*4+ 16] = "TAMRON AF 80-210mm F4-5.6 (178D)";
choices[256*4+ 19] = "TAMRON SP AF 90mm F2.8 (172E)";
choices[256*4+ 20] = "smc PENTAX-FA 28-80mm F3.5-5.6";
choices[256*4+ 21] = "Cosina AF 100-300mm F5.6-6.7";
choices[256*4+ 22] = "TOKINA 28-80mm F3.5-5.6";
choices[256*4+ 23] = "smc PENTAX-FA 20-35mm F4 AL";
choices[256*4+ 24] = "smc PENTAX-FA 77mm F1.8 Limited";
@ -373,6 +385,13 @@ class PALensTypeInterpreter : public ChoiceInterpreter {
choices[256*4+ 49] = "TAMRON SP AF 28-75mm F2.8 XR Di (A09)";
choices[256*4+ 51] = "smc PENTAX-D FA 50mm F2.8 MACRO";
choices[256*4+ 52] = "smc PENTAX-D FA 100mm F2.8 MACRO";
choices[256*4+ 75] = "TAMRON SP AF 70-200 F2.8 Di LD [IF] Macro (A001)";
choices[256*4+ 229] = "smc PENTAX-DA 18-55mm F3.5-5.6 AL II";
choices[256*4+ 230] = "TAMRON SP AF 17-50mm F2.8 XR Di II";
choices[256*4+ 231] = "smc PENTAX-DA 18-250mm F3.5-6.3 ED AL [IF]";
choices[256*4+ 237] = "Samsung/Schneider D-XENOGON 10-17mm F3.5-4.5";
choices[256*4+ 239] = "Samsung D-XENON 12-24mm F4 ED AL [IF]";
choices[256*4+ 243] = "smc PENTAX-DA 70mm F2.4 Limited";
choices[256*4+ 244] = "smc PENTAX-DA 21mm F3.2 AL Limited";
choices[256*4+ 245] = "Schneider D-XENON 50-200mm";
choices[256*4+ 246] = "Schneider D-XENON 18-55mm";
@ -400,6 +419,7 @@ class PALensTypeInterpreter : public ChoiceInterpreter {
choices[256*5+ 14] = "smc PENTAX-FA* 250-600mm F5.6 ED[IF]";
choices[256*5+ 15] = "smc PENTAX-FA 28-105mm F4-5.6";
choices[256*5+ 16] = "smc PENTAX-FA 100-300mm F4.5-5.6";
choices[256*5+ 98] = "smc PENTAX-FA 100-300mm F4.5-5.6";
choices[256*6+ 1] = "smc PENTAX-FA* 85mm F1.4 [IF]";
choices[256*6+ 2] = "smc PENTAX-FA* 200mm F2.8 ED[IF]";
choices[256*6+ 3] = "smc PENTAX-FA* 300mm F2.8 ED[IF]";
@ -413,25 +433,34 @@ class PALensTypeInterpreter : public ChoiceInterpreter {
choices[256*6+ 13] = "smc PENTAX-FA* 400mm F5.6 ED[IF]";
choices[256*6+ 14] = "smc PENTAX-FA* MACRO 200mm F4 ED[IF]";
choices[256*7+ 0] = "smc PENTAX-DA 21mm F3.2 AL Limited";
choices[256*7+ 75] = "TAMRON SP AF 70-200mm F2.8 Di LD [IF] Macro (A001)";
choices[256*7+ 217] = "smc PENTAX-DA 50-200mm F4-5.6 ED WR";
choices[256*7+ 218] = "smc PENTAX-DA 18-55mm F3.5-5.6 AL WR";
choices[256*7+ 220] = "TAMRON SP AF 10-24mm F3.5-4.5 Di II LD Aspherical [IF]";
choices[256*7+ 222] = "smc PENTAX-DA 18-55mm F3.5-5.6 AL II";
choices[256*7+ 223] = "Samsung D-XENON 18-55mm F3.5-5.6 II";
choices[256*7+ 224] = "smc PENTAX-DA 15mm F4 ED AL Limited";
choices[256*7+ 225] = "Samsung D-XENON 18-250mm F3.5-6.3";
choices[256*7+ 229] = "smc PENTAX-DA 18-55mm F3.5-5.6 AL II";
choices[256*7+ 230] = "TAMRON AF 17-50mm F2.8 XR Di-II LD (Model A16)";
choices[256*7+ 231] = "smc PENTAX-DA 18-250mm F3.5-6.3 ED AL [IF]";
choices[256*7+ 233] = "smc PENTAX-DA 35mm F2.8 Macro Limited";
choices[256*7+ 234] = "smc PENTAX-DA* 300mm F4 ED [IF] SDM (SDM unused)";
choices[256*7+ 235] = "smc PENTAX-DA* 200mm F2.8 ED [IF] SDM (SDM unused)";
choices[256*7+ 236] = "smc PENTAX-DA 55-300mm F4-5.8 ED";
choices[256*7+ 238] = "TAMRON AF 18-250mm F3.5-6.3 Di II LD Aspherical [IF] MACRO";
choices[256*7+ 241] = "smc PENTAX-DA* 50-135mm F2.8 ED [IF] SDM (SDM unused)";
choices[256*7+ 242] = "smc PENTAX-DA* 16-50mm F2.8 ED AL [IF] SDM (SDM unused)";
choices[256*7+ 243] = "smc PENTAX-DA 70mm F2.4 Limited";
choices[256*7+ 244] = "smc PENTAX-DA 21mm F3.2 AL Limited";
choices[256*8+ 235] = "smc PENTAX-DA* 200mm F2.8 ED [IF] SDM";
choices[256*8+ 241] = "smc PENTAX-DA* 50-135mm F2.8 ED [IF] SDM";
choices[256*8+ 242] = "smc PENTAX-DA* 16-50mm F2.8 ED AL [IF] SDM";
choices[256*8+ 226] = "smc PENTAX-DA* 55mm F1.4 SDM";
choices[256*8+ 227] = "smc PENTAX DA* 60-250mm F4 [IF] SDM";
choices[256*8+ 232] = "smc PENTAX-DA 17-70mm F4 AL [IF] SDM";
choices[256*8+ 234] = "smc PENTAX-DA* 300mm F4 ED [IF] SDM";
choices[256*8+ 235] = "smc PENTAX-DA* 200mm F2.8 ED [IF] SDM";
choices[256*8+ 241] = "smc PENTAX-DA* 50-135mm F2.8 ED [IF] SDM";
choices[256*8+ 242] = "smc PENTAX-DA* 16-50mm F2.8 ED AL [IF] SDM";
choices[256*8+ 255] = "Sigma 70-200mm F2.8 EX DG Macro HSM II";
choices[256*8+ 255] = "Sigma 70-200mm F2.8 EX DG Macro HSM II or 150-500mm F5-6.3 DG OS";
}
virtual std::string toString (Tag* t) {
return choices[256*t->toInt(0,BYTE) + t->toInt(1,BYTE)];

45
rtexif/sonyminoltaattribs.cc
View File

@ -72,6 +72,12 @@ class SADynamicRangeOptimizerInterpreter : public ChoiceInterpreter {
choices[0] = "Off";
choices[1] = "Standard";
choices[2] = "Advanced";
choices[3] = "Auto";
choices[8] = "Advanced Lv1";
choices[9] = "Advanced Lv2";
choices[10] = "Advanced Lv3";
choices[11] = "Advanced Lv4";
choices[12] = "Advanced Lv5";
}
};
SADynamicRangeOptimizerInterpreter saDynamicRangeOptimizerInterpreter;
@ -88,6 +94,12 @@ class SAColorModeInterpreter : public ChoiceInterpreter {
choices[6] = "B&W";
choices[7] = "Adobe RGB";
choices[12] = "Neutral";
choices[100]= "Neutral";
choices[101]= "Clear";
choices[102]= "Deep";
choices[103]= "Light";
choices[104]= "Night View";
choices[105]= "Autumn Leaves";
}
};
SAColorModeInterpreter saColorModeInterpreter;
@ -102,6 +114,9 @@ class SAExposureModeInterpreter : public ChoiceInterpreter {
choices[8] = "Shutter Priority";
choices[9] = "Night Scene";
choices[15] = "Manual";
choices[34] = "Panorama";
choices[35] = "Handheld Twilight";
choices[36] = "Anti Motion Blur";
}
};
SAExposureModeInterpreter saExposureModeInterpreter;
@ -172,13 +187,27 @@ class SALensIDInterpreter : public ChoiceInterpreter {
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[128] = "Tamron Lens (various models)";
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[255] = "Tamron AF 70-300mm f/4-5.6 Di LD MACRO 1:2";
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]";
@ -196,9 +225,9 @@ class SALensIDInterpreter : public ChoiceInterpreter {
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";
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 New";
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";
@ -238,6 +267,7 @@ class SALensIDInterpreter : public ChoiceInterpreter {
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";
@ -259,6 +289,7 @@ class SALensIDInterpreter : public ChoiceInterpreter {
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";
@ -297,8 +328,9 @@ class SALensIDInterpreter : public ChoiceInterpreter {
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 I";
choices[45851] = "Tamron - SP AF 300 F2.8 LD IF";
}
};
SALensIDInterpreter saLensIDInterpreter;
@ -324,6 +356,9 @@ class MAQualityInterpreter : public ChoiceInterpreter {
choices[3] = "Standard";
choices[4] = "Economy";
choices[5] = "Extra fine";
choices[6] = "RAW + JPEG";
choices[7] = "cRAW";
choices[8] = "cRAW + JPEG";
}
};
MAQualityInterpreter maQualityInterpreter;

10
rtgui/CMakeLists.txt
View File

@ -98,16 +98,18 @@ set_target_properties (rth PROPERTIES COMPILE_FLAGS "-O3" OUTPUT_NAME rt)
target_link_libraries (rth rtengine ${JPEG_LIBRARIES} ${PNG_LIBRARIES} ${ZLIB_LIBRARIES} ${TIFF_LIBRARIES} ${EXTRA_LIB} ${GOBJECT_LIBRARIES} ${GTHREAD_LIBRARIES}
${GLIB2_LIBRARIES} ${GLIBMM_LIBRARIES} ${GTK_LIBRARIES} ${GTKMM_LIBRARIES} ${GIO_LIBRARIES} ${GIOMM_LIBRARIES} ${LCMS_LIBRARIES} ${IPTCDATA_LIBRARIES})
SET (INSTALL_SOURCE_PATH "${CMAKE_BINARY_DIR}/rtgui")
IF (WIN32)
install (FILES rth.exe DESTINATION ${CMAKE_CURRENT_SOURCE_DIR}/../release
install (FILES ${INSTALL_SOURCE_PATH}/rth.exe DESTINATION ${CMAKE_CURRENT_SOURCE_DIR}/../release
PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ GROUP_EXECUTE GROUP_READ WORLD_EXECUTE WORLD_READ)
install (FILES ../rawzor_win/rwz_sdk_s.dll DESTINATION ${CMAKE_CURRENT_SOURCE_DIR}/../release
install (FILES ${INSTALL_SOURCE_PATH}/../rawzor_win/rwz_sdk_s.dll DESTINATION ${CMAKE_CURRENT_SOURCE_DIR}/../release
PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ GROUP_EXECUTE GROUP_READ WORLD_EXECUTE WORLD_READ)
install (FILES ../options.win DESTINATION ${CMAKE_CURRENT_SOURCE_DIR}/../release
install (FILES ${INSTALL_SOURCE_PATH}/../options.win DESTINATION ${CMAKE_CURRENT_SOURCE_DIR}/../release
PERMISSIONS OWNER_WRITE OWNER_READ GROUP_READ WORLD_READ
RENAME options)
ELSE (WIN32)
install (FILES rt DESTINATION ${CMAKE_CURRENT_SOURCE_DIR}/../release
install (FILES ${INSTALL_SOURCE_PATH}/rt DESTINATION ${CMAKE_CURRENT_SOURCE_DIR}/../release
PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ GROUP_EXECUTE GROUP_READ WORLD_EXECUTE WORLD_READ)
install (FILES ../options.lin DESTINATION ${CMAKE_CURRENT_SOURCE_DIR}/../release
PERMISSIONS OWNER_WRITE OWNER_READ GROUP_READ WORLD_READ

3
rtgui/rtwindow.cc
View File

@ -139,6 +139,9 @@ void RTWindow::remEditorPanel (EditorPanel* ep) {
fpanel->refreshEditedState (filesEdited);
mainNB->remove_page (*ep);
if (mainNB->get_current_page () == mainNB->page_num (*bpanel))
mainNB->set_current_page (mainNB->page_num (*fpanel));
}
// TODO: ask what to do: close & apply, close & apply selection, close & revert, cancel
}