Solving issue 2197: "Pentax K-3 support"

rtengine/imagedata.cc

@@ -118,7 +118,7 @@ void ImageData::extractInfo () {
      make = root->getTag ("Make")->valueToString ();
      // same dcraw treatment
      static const char *corp[] =
-       { "Canon", "NIKON", "EPSON", "KODAK", "Kodak", "OLYMPUS", "PENTAX",
+       { "Canon", "NIKON", "EPSON", "KODAK", "Kodak", "OLYMPUS", "PENTAX", "RICOH",
          "MINOLTA", "Minolta", "Konica", "CASIO", "Sinar", "Phase One",
          "SAMSUNG", "Mamiya", "MOTOROLA", "Leaf" };
      for (size_t i=0; i < (sizeof(corp)/sizeof(*corp)); i++)
@@ -304,7 +304,7 @@ void ImageData::extractInfo () {
                 }
             }
         }
-        else if (mnote && !make.compare (0, 6, "PENTAX")) {
+        else if (mnote && (!make.compare (0, 6, "PENTAX") || (!make.compare (0, 5, "RICOH") && !model.compare (0, 6, "PENTAX")))) {
             if (mnote->getTag ("LensType"))
                 lens = mnote->getTag ("LensType")->valueToString ();
 

rtexif/pentaxattribs.cc

@@ -52,6 +52,40 @@ class PAOnOffInterpreter : public ChoiceInterpreter {
 };
 PAOnOffInterpreter paOnOffInterpreter;
 
+class PAShakeReductionInterpreter : public ChoiceInterpreter {
+    public:
+        PAShakeReductionInterpreter () {
+            choices[  0] = "Off";
+            choices[  1] = "On";
+            choices[  4] = "On (4)";
+            choices[  5] = "On but Disabled";
+            choices[  6] = "On (Video)";
+            choices[  7] = "On (7)";
+            choices[ 15] = "On (15)";
+            choices[ 39] = "On (mode 2)";
+            choices[135] = "On (135)";
+            choices[167] = "On (mode 1)";
+        }
+};
+PAShakeReductionInterpreter paShakeReductionInterpreter;
+
+class PAShakeReduction2Interpreter : public ChoiceInterpreter {
+    public:
+        PAShakeReduction2Interpreter () {
+            choices[ 0] = "Off";
+            choices[ 1] = "On";
+            choices[ 4] = "Off (AA simulation off)";
+            choices[ 5] = "On but Disabled";
+            choices[ 6] = "On (Video)";
+            choices[ 7] = "On (AA simulation off)";
+            choices[12] = "Off (AA simulation type 1)";
+            choices[15] = "On (AA simulation type 1)";
+            choices[20] = "Off (AA simulation type 2)";
+            choices[23] = "On (AA simulation type 2)";
+        }
+};
+PAShakeReduction2Interpreter paShakeReduction2Interpreter;
+
 class PAPictureModeInterpreter : public ChoiceInterpreter {
     public:
         PAPictureModeInterpreter () {
@@ -106,6 +140,73 @@ class PAPictureModeInterpreter : public ChoiceInterpreter {
 };
 PAPictureModeInterpreter paPictureModeInterpreter;
 
+class PASceneModeInterpreter : public ChoiceInterpreter {
+    public:
+        PASceneModeInterpreter () {
+            choices[ 0] = "Off";
+            choices[ 1] = "HDR";
+            choices[ 4] = "Auto PICT";
+            choices[ 5] = "Portrait";
+            choices[ 6] = "Landscape";
+            choices[ 7] = "Macro";
+            choices[ 8] = "Sport";
+            choices[ 9] = "Night Scene Portrait";
+            choices[10] = "No Flash";
+            choices[11] = "Night Scene";
+            choices[12] = "Surf & Snow";
+            choices[14] = "Sunset";
+            choices[15] = "Kids";
+            choices[16] = "Pet";
+            choices[17] = "Candlelight";
+            choices[18] = "Museum";
+            choices[20] = "Food";
+            choices[21] = "Stage Lighting";
+            choices[22] = "Night Snap";
+            choices[25] = "Night Scene HDR";
+            choices[26] = "Blue Sky";
+            choices[27] = "Forest";
+            choices[29] = "Backlight Silhouette";
+        }
+};
+PASceneModeInterpreter paSceneModeInterpreter;
+
+class PAAEProgramModeInterpreter : public ChoiceInterpreter {
+    public:
+        PAAEProgramModeInterpreter () {
+            choices[  0] = "M, P or TAv";
+            choices[  1] = "Av, B or X";
+            choices[  2] = "Tv";
+            choices[  3] = "Sv or Green Mode";
+            choices[  8] = "Hi-speed Program";
+            choices[ 11] = "Hi-speed Program (P-Shift)";
+            choices[ 16] = "DOF Program";
+            choices[ 19] = "DOF Program (P-Shift)";
+            choices[ 24] = "MTF Program";
+            choices[ 27] = "MTF Program (P-Shift)";
+            choices[ 35] = "Standard";
+            choices[ 43] = "Portrait";
+            choices[ 51] = "Landscape";
+            choices[ 59] = "Macro";
+            choices[ 67] = "Sport";
+            choices[ 75] = "Night Scene Portrait";
+            choices[ 83] = "No Flash";
+            choices[ 91] = "Night Scene";
+            choices[ 99] = "Surf & Snow";
+            choices[104] = "Night Snap";
+            choices[107] = "Text";
+            choices[115] = "Sunset";
+            choices[123] = "Kids";
+            choices[131] = "Pet";
+            choices[139] = "Candlelight";
+            choices[144] = "SCN";
+            choices[147] = "Museum";
+            choices[160] = "Program";
+            choices[184] = "Shallow DOF Program";
+            choices[216] = "HDR";
+        }
+};
+PAAEProgramModeInterpreter paAEProgramModeInterpreter;
+
 class PAFlashModeInterpreter : public ChoiceInterpreter {
     public:
         PAFlashModeInterpreter () {
@@ -291,11 +392,14 @@ class PAWhiteBalanceInterpreter : public ChoiceInterpreter {
             choices[3] = "Fluorescent";
             choices[4] = "Tungsten";
             choices[5] = "Manual";
-            choices[6] = "DaylightFluorescent";
-            choices[7] = "DaywhiteFluorescent";
-            choices[8] = "WhiteFluorescent";
+            choices[6] = "Daylight Fluorescent";
+            choices[7] = "Day White Fluorescent";
+            choices[8] = "White Fluorescent";
             choices[9] = "Flash";
             choices[10] = "Cloudy";
+            choices[11] = "Warm White Fluorescent";
+            choices[14] = "Multi Auto";
+            choices[15] = "Color Temperature Enhancement";
             choices[17] = "Kelvin";
             choices[65534] = "Unknown";
             choices[65535] = "User Selected";
@@ -439,18 +543,28 @@ public:
 	PADriveModeInterpreter(){
 		choices[0]    = "Single-frame";
 		choices[1]    = "Continuous";
-		choices[2] = "Continuous (Hi)";
+		choices[2]    = "Continuous (Lo)";
 		choices[3]    = "Burst";
+		choices[4]    = "Continuous (Medium)";
 		choices[255]  = "Video";
 		choices1[0]   = "No Timer";
 		choices1[1]   = "Self-timer (12 s)";
 		choices1[2]   = "Self-timer (2 s)";
+		choices1[15]  = "Video";
+		choices1[16]  = "Mirror Lock-up";
 		choices1[255] = "n/a";
 		choices2[0]   = "Shutter Button";
 		choices2[1]   = "Remote Control (3 s delay)";
 		choices2[2]   = "Remote Control";
+		choices2[4]   = "Remote Continuous Shooting";
 		choices3[0]   = "Single Exposure";
 		choices3[1]   = "Multiple Exposure";
+		choices3[15]  = "Interval Movie";
+		choices3[16]  = "HDR";
+		choices3[32]  = "HDR Strong 1";
+		choices3[48]  = "HDR Strong 2";
+		choices3[64]  = "HDR Strong 3";
+		choices3[224] = "HDR Auto";
 		choices3[255] = "Video";
 	}
     virtual std::string toString (Tag* t) {
@@ -807,6 +921,162 @@ public:
 };
 PAHighISONoiseInterpreter paHighISONoiseInterpreter;
 
+class PAMonochromeFilterEffectInterpreter: public ChoiceInterpreter {
+public:
+	PAMonochromeFilterEffectInterpreter(){
+		choices[1] = "Green";
+		choices[2] = "Yellow";
+		choices[3] = "Orange";
+		choices[4] = "Red";
+		choices[5] = "Magenta";
+		choices[6] = "Blue";
+		choices[7] = "Cyan";
+		choices[8] = "Infrared";
+		choices[65535] = "None";
+	}
+};
+PAMonochromeFilterEffectInterpreter paMonochromeFilterEffectInterpreter;
+
+class PAMonochromeToningInterpreter: public ChoiceInterpreter {
+public:
+	PAMonochromeToningInterpreter(){
+		choices[0] = "-4";
+		choices[1] = "-3";
+		choices[2] = "-2";
+		choices[3] = "-1";
+		choices[4] = "0";
+		choices[5] = "1";
+		choices[6] = "2";
+		choices[7] = "3";
+		choices[8] = "4";
+		choices[65535] = "None";
+	}
+};
+PAMonochromeToningInterpreter paMonochromeToningInterpreter;
+
+class PAShadowCorrectionInterpreter: public ChoiceInterpreter {
+public:
+	PAShadowCorrectionInterpreter(){
+		choices[        0 ] = "Off";
+		choices[        1 ] = "On";
+		choices[        2 ] = "Auto 2";
+		choices[ 1<<8 | 1 ] = "Weak";
+		choices[ 1<<8 | 2 ] = "Normal";
+		choices[ 1<<8 | 3 ] = "Strong";
+		choices[ 2<<8 | 4 ] = "Auto";
+	}
+
+	virtual std::string toString (Tag* t) {
+		int idx = 0;
+		if (t->getCount() == 1)
+			idx = t->toInt(0,BYTE);
+		else if (t->getCount() == 2)
+			idx = t->toInt(0,BYTE) << 8 | t->toInt(1,BYTE);
+
+		std::map<int,std::string>::iterator r  = choices.find (idx);
+		std::ostringstream s;
+		s << ((r !=choices.end())? r->second : "n/a");
+		return s.str();
+	}
+};
+PAShadowCorrectionInterpreter paShadowCorrectionInterpreter;
+
+class PAISOAutoParametersInterpreter: public ChoiceInterpreter {
+public:
+	PAISOAutoParametersInterpreter(){
+		choices[1] = "Slow";
+		choices[2] = "Standard";
+		choices[3] = "Fast";
+	}
+	virtual std::string toString (Tag* t) {
+		std::map<int,std::string>::iterator r  = choices.find (t->toInt(0,BYTE));
+		std::ostringstream s;
+		s << ((r !=choices.end())? r->second : "n/a");
+		return s.str();
+	}
+};
+PAISOAutoParametersInterpreter paISOAutoParametersInterpreter;
+
+class PABleachBypassToningInterpreter: public ChoiceInterpreter {
+public:
+	PABleachBypassToningInterpreter(){
+		choices[1] = "Green";
+		choices[2] = "Yellow";
+		choices[3] = "Orange";
+		choices[4] = "Red";
+		choices[5] = "Magenta";
+		choices[6] = "Purple";
+		choices[7] = "Blue";
+		choices[8] = "Cyan";
+		choices[65535] = "Off";
+	}
+};
+PABleachBypassToningInterpreter paBleachBypassToningInterpreter;
+
+class PABlurControlInterpreter: public ChoiceInterpreter {
+public:
+	PABlurControlInterpreter(){
+		choices[0] = "Off";
+		choices[1] = "Low";
+		choices[2] = "Medium";
+		choices[3] = "High";
+	}
+	virtual std::string toString (Tag* t) {
+		std::map<int,std::string>::iterator r  = choices.find (t->toInt(0,BYTE));
+		std::ostringstream s;
+		s << ((r !=choices.end())? r->second : "n/a");
+		return s.str();
+	}
+};
+PABlurControlInterpreter paBlurControlInterpreter;
+
+class PAHDRInterpreter: public ChoiceInterpreter {
+	std::map<int,std::string> choices1;
+	std::map<int,std::string> choices2;
+public:
+	PAHDRInterpreter(){
+		choices[0]    = "Off";
+		choices[1]    = "HDR Auto";
+		choices[2]    = "HDR 1";
+		choices[3]    = "HDR 2";
+		choices[4]    = "HDR 3";
+
+		choices1[0]   = "Auto-align Off";
+		choices1[1]   = "Auto-align On";
+
+		choices2[0]   = "n/a";
+		choices2[1]   = "1 EV";
+		choices2[2]   = "2 EV";
+		choices2[4]   = "3 EV";
+	}
+	virtual std::string toString (Tag* t) {
+		std::map<int,std::string>::iterator r  = choices.find  (t->toInt(0,BYTE));
+		std::map<int,std::string>::iterator r1 = choices1.find (t->toInt(1,BYTE));
+		std::map<int,std::string>::iterator r2 = choices2.find (t->toInt(2,BYTE));
+		std::ostringstream s;
+		s << ((r !=choices.end() )?  r->second : "") << std::endl;
+		s << ((r1!=choices1.end())? r1->second : "") << std::endl;
+		s << ((r2!=choices2.end())? r2->second : "");
+		return s.str();
+	}
+};
+PAHDRInterpreter paHDRInterpreter;
+
+class PACrossProcessInterpreter: public ChoiceInterpreter {
+public:
+	PACrossProcessInterpreter(){
+		choices[ 0] = "Off";
+		choices[ 1] = "Randow";
+		choices[ 2] = "Preset 1";
+		choices[ 3] = "Preset 2";
+		choices[ 4] = "Preset 3";
+		choices[33] = "Favorite 1";
+		choices[34] = "Favorite 2";
+		choices[35] = "Favorite 3";
+	}
+};
+PACrossProcessInterpreter paCrossProcessInterpreter;
+
 class PAPowerSourceInterpreter: public ChoiceInterpreter {
 public:
 	PAPowerSourceInterpreter(){
@@ -849,6 +1119,26 @@ public:
 };
 PALensInfoQInterpreter paLensInfoQInterpreter;
 
+class PAFlashExposureCompInterpreter: public Interpreter {
+public:
+    PAFlashExposureCompInterpreter(){}
+    virtual std::string toString (Tag* t){
+        int a;
+        if (t->getCount() == 1) a = t->toInt(0, SLONG) / 256; // int32u
+        else                    a = t->toInt(0, SBYTE) / 6;   // int8u[2]
+        char buffer[10];
+        sprintf (buffer, "%d", a );
+        return buffer;
+    }
+    virtual double toDouble (Tag* t, int ofs){
+        int a;
+        if (t->getCount() == 1) a = t->toInt(0, SLONG) / 256; // int32u
+        else                    a = t->toInt(0, SBYTE) / 6;   // int8u[2]
+        return double(a);
+    }
+};
+PAFlashExposureCompInterpreter paFlashExposureCompInterpreter;
+
 class PAFocalLengthInterpreter: public Interpreter {
 public:
     PAFocalLengthInterpreter(){}
@@ -895,6 +1185,23 @@ public:
 };
 PALensDataFocalLengthInterpreter paLensDataFocalLengthInterpreter;
 
+class PAISOfInterpreter: public Interpreter {
+    public:
+       PAISOfInterpreter(){}
+       virtual std::string toString (Tag* t){
+           int a = t->toInt(0,BYTE);
+           char buffer[32];
+           double v = 100.*exp(double(a-32)*log(2.)/8.);
+           sprintf (buffer, "%.1f", v );
+           return buffer;
+       }
+       virtual double toDouble (Tag* t, int ofs){
+           int a = t->toInt(0,BYTE);
+           return 100.*exp(double(a-32)*log(2.)/8.);
+       }
+};
+PAISOfInterpreter paISOfInterpreter;
+
 class PAMaxApertureInterpreter: public Interpreter {
     public:
        PAMaxApertureInterpreter(){}
@@ -921,6 +1228,74 @@ class PAMaxApertureInterpreter: public Interpreter {
 };
 PAMaxApertureInterpreter paMaxApertureInterpreter;
 
+class PAAEXvInterpreter: public Interpreter {
+    public:
+       PAAEXvInterpreter(){}
+       virtual std::string toString (Tag* t){
+           int a = t->toInt(0,BYTE);
+           char buffer[32];
+           double v = double(a-64)/8.;
+           sprintf (buffer, "%.1f", v );
+           return buffer;
+       }
+       virtual double toDouble (Tag* t, int ofs){
+           int a = t->toInt(0,BYTE);
+           return double(a-64)/8.;
+       }
+};
+PAAEXvInterpreter paAEXvInterpreter;
+
+class PAAEBXvInterpreter: public Interpreter {
+    public:
+       PAAEBXvInterpreter(){}
+       virtual std::string toString (Tag* t){
+           int a = t->toInt(0,SBYTE);
+           char buffer[32];
+           double v = double(a)/8.;
+           sprintf (buffer, "%.1f", v );
+           return buffer;
+       }
+       virtual double toDouble (Tag* t, int ofs){
+           int a = t->toInt(0,SBYTE);
+           return double(a)/8.;
+       }
+};
+PAAEBXvInterpreter paAEBXvInterpreter;
+
+class PAApertureInterpreter: public Interpreter {
+    public:
+       PAApertureInterpreter(){}
+       virtual std::string toString (Tag* t){
+           int a = t->toInt(0,BYTE);
+           char buffer[32];
+           double v = exp((double(a)-68.)*log(2.)/16.);
+           sprintf (buffer, "%.1f", v );
+           return buffer;
+       }
+       virtual double toDouble (Tag* t, int ofs){
+           int a = t->toInt(0,BYTE);
+           return exp((double(a)-68.)*log(2.)/16.);
+       }
+};
+PAApertureInterpreter paApertureInterpreter;
+
+class PAExposureTimeInterpreter: public Interpreter {
+    public:
+       PAExposureTimeInterpreter(){}
+       virtual std::string toString (Tag* t){
+           int a = t->toInt(0,BYTE);
+           char buffer[32];
+           double v = 24.*exp(-(double(a)-32.)*log(2.)/8.);
+           sprintf (buffer, "%.6f", v );
+           return buffer;
+       }
+       virtual double toDouble (Tag* t, int ofs){
+           int a = t->toInt(0,BYTE);
+           return 24.*exp(-(double(a)-32.)*log(2.)/8.);
+       }
+};
+PAExposureTimeInterpreter paExposureTimeInterpreter;
+
 class PANominalMinApertureInterpreter: public Interpreter {
 public:
     PANominalMinApertureInterpreter(){}
@@ -1311,7 +1686,7 @@ const TagAttrib pentaxAttribs[] = {
  {0, AC_WRITE,  0, 0, 0x0047, AUTO, "CameraTemperature", &stdInterpreter},
  {0, AC_WRITE,  0, 0, 0x0048, AUTO, "AELock", &paOnOffInterpreter},
  {0, AC_WRITE,  0, 0, 0x0049, AUTO, "NoiseReduction", &paOnOffInterpreter},
- {0, AC_WRITE,  0, 0, 0x004d, AUTO, "FlashExposureComp", &stdInterpreter},
+ {0, AC_WRITE,  0, 0, 0x004d, AUTO, "FlashExposureComp", &paFlashExposureCompInterpreter},
  {0, AC_WRITE,  0, 0, 0x004f, AUTO, "ImageTone", &stdInterpreter},
  {0, AC_WRITE,  0, 0, 0x0050, AUTO, "ColorTemperature", &stdInterpreter},
  {0, AC_WRITE,  0, pentaxSRInfoAttribs, 0x005c, AUTO, "ShakeReductionInfo", &stdInterpreter},
@@ -1319,6 +1694,19 @@ const TagAttrib pentaxAttribs[] = {
  {0, AC_WRITE,  0, 0, 0x0069, AUTO, "DynamicRangeExpansion", &paOnOffInterpreter},
  {0, AC_WRITE,  0, 0, 0x0071, AUTO, "HighISONoiseReduction", &paHighISONoiseInterpreter},
  {0, AC_WRITE,  0, 0, 0x0072, AUTO, "AFAdjustment", &stdInterpreter},
+ {0, AC_WRITE,  0, 0, 0x0073, AUTO, "MonochromeFilterEffect", &paMonochromeFilterEffectInterpreter},
+ {0, AC_WRITE,  0, 0, 0x0074, AUTO, "MonochromeToning", &paMonochromeToningInterpreter},
+ {0, AC_WRITE,  0, 0, 0x0076, AUTO, "FaceDetect", &stdInterpreter},
+ {0, AC_WRITE,  0, 0, 0x0077, AUTO, "FaceDetectFrameSize", &stdInterpreter},
+ {0, AC_WRITE,  0, 0, 0x0079, AUTO, "ShadowCorrection", &paShadowCorrectionInterpreter},
+ {0, AC_WRITE,  0, 0, 0x007a, AUTO, "ISOAutoParameters", &paISOAutoParametersInterpreter},
+ {0, AC_WRITE,  0, 0, 0x007b, AUTO, "CrossProcess", &paCrossProcessInterpreter},
+ {0, AC_WRITE,  0, pentaxLensCorrAttribs, 0x007d, AUTO, "LensCorr", &stdInterpreter},
+ {0, AC_WRITE,  0, 0, 0x007f, AUTO, "BleachBypassToning", &paBleachBypassToningInterpreter},
+ {0, AC_WRITE,  0, 0, 0x0082, AUTO, "BlurControl", &paBlurControlInterpreter},
+ {0, AC_WRITE,  0, 0, 0x0085, AUTO, "HDR", &paHDRInterpreter},
+ {0, AC_WRITE,  0, 0, 0x0088, AUTO, "NeutralDensityFilter", &paOnOffInterpreter},
+ {0, AC_WRITE,  0, 0, 0x008b, AUTO, "ISO", &stdInterpreter},
  {0, AC_WRITE,  0, 0, 0x0200, AUTO, "BlackPoint", &stdInterpreter},
  {0, AC_WRITE,  0, 0, 0x0201, AUTO, "WhitePoint", &stdInterpreter},
  {0, AC_WRITE,  0, 0, 0x0203, AUTO, "ColorMatrixA", &stdInterpreter},
@@ -1352,11 +1740,16 @@ const TagAttrib pentaxAttribs[] = {
 
 const TagAttrib pentaxSRInfoAttribs[] = {
  {0, AC_WRITE, 0, 0,  0, AUTO, "SRResult", &paSRResultInterpreter},
- {0, AC_WRITE, 0, 0,  1, AUTO, "ShakeReduction", &paOnOffInterpreter},
+ {0, AC_WRITE, 0, 0,  1, AUTO, "ShakeReduction", &paShakeReductionInterpreter},
  {0, AC_WRITE, 0, 0,  2, AUTO, "SRHalfPressTime", &stdInterpreter},
  {0, AC_WRITE, 0, 0,  3, AUTO, "SRFocalLength", &stdInterpreter},
  {-1, AC_DONTWRITE, 0,  0, 0, AUTO, "", NULL}};
 
+const TagAttrib pentaxSRInfo2Attribs[] = {
+ {0, AC_WRITE, 0, 0,  0, AUTO, "SRResult", &paSRResultInterpreter},    // assuming it's the same interpreter, but that's not sure
+ {0, AC_WRITE, 0, 0,  1, AUTO, "ShakeReduction", &paShakeReduction2Interpreter},
+ {-1, AC_DONTWRITE, 0,  0, 0, AUTO, "", NULL}};
+
 const TagAttrib pentaxLensDataAttribs[] = {
  {0, AC_WRITE, 0, 0, 9,  AUTO, "FocalLength", &paLensDataFocalLengthInterpreter},
  {0, AC_WRITE, 0, 0, 10, AUTO, "NominalMaxAperture", &paNominalMaxApertureInterpreter},
@@ -1369,6 +1762,12 @@ const TagAttrib pentaxLensInfoQAttribs[] = {
  {0, AC_WRITE, 0, 0, 42, AUTO, "LensInfo", &paLensInfoQInterpreter},
  {-1, AC_DONTWRITE, 0,  0, 0, AUTO, "", NULL}};
 
+const TagAttrib pentaxLensCorrAttribs[] = {
+ {0, AC_WRITE, 0, 0, 0, AUTO, "DistortionCorrection", &paOnOffInterpreter},
+ {0, AC_WRITE, 0, 0, 1, AUTO, "ChromaticAberrationCorrection", &paOnOffInterpreter},
+ {0, AC_WRITE, 0, 0, 2, AUTO, "VignettingCorrection", &paOnOffInterpreter},
+ {-1, AC_DONTWRITE, 0,  0, 0, AUTO, "", NULL}};
+
 const TagAttrib pentaxCameraSettingsAttribs[] = {
  {0, AC_WRITE, 0, 0,  0, AUTO, "PictureMode2", &paPictureMode2Interpreter},
  {0, AC_WRITE, 0, 0,  1, AUTO, "ProgramLine", &paProgramLineInterpreter},
@@ -1386,18 +1785,43 @@ const TagAttrib pentaxCameraSettingsAttribs[] = {
  {-1, AC_DONTWRITE, 0,  0, 0, AUTO, "", NULL}};
 
 const TagAttrib pentaxAEInfoAttribs[] = {
- {0, AC_WRITE, 0, 0,  0, AUTO, "AEExposureTime", &stdInterpreter},
- {0, AC_WRITE, 0, 0,  1, AUTO, "AEAperture", &stdInterpreter},
- {0, AC_WRITE, 0, 0,  2, AUTO, "AE_ISO", &stdInterpreter},
- {0, AC_WRITE, 0, 0,  3, AUTO, "AEXv", &stdInterpreter},
- {0, AC_WRITE, 0, 0,  4, AUTO, "AEBXv", &stdInterpreter},
- {0, AC_WRITE, 0, 0,  5, AUTO, "AEMinExposureTime", &stdInterpreter},
- {0, AC_WRITE, 0, 0,  6, AUTO, "AEProgramMode", &stdInterpreter},
- {0, AC_WRITE, 0, 0,  9, AUTO, "AEMaxAperture", &stdInterpreter},
- {0, AC_WRITE, 0, 0, 10, AUTO, "AEMaxAperture2", &stdInterpreter},
- {0, AC_WRITE, 0, 0, 11, AUTO, "AEMinAperture", &stdInterpreter},
+ {0, AC_WRITE, 0, 0,  0, AUTO, "AEExposureTime", &paExposureTimeInterpreter},
+ {0, AC_WRITE, 0, 0,  1, AUTO, "AEAperture", &paApertureInterpreter},
+ {0, AC_WRITE, 0, 0,  2, AUTO, "AE_ISO", &paISOfInterpreter},
+ {0, AC_WRITE, 0, 0,  3, AUTO, "AEXv", &paAEXvInterpreter},
+ {0, AC_WRITE, 0, 0,  4,SBYTE, "AEBXv", &paAEBXvInterpreter},
+ {0, AC_WRITE, 0, 0,  5, AUTO, "AEMinExposureTime", &paExposureTimeInterpreter},
+ {0, AC_WRITE, 0, 0,  6, AUTO, "AEProgramMode", &paAEProgramModeInterpreter},
+ {0, AC_WRITE, 0, 0,  9, AUTO, "AEMaxAperture", &paApertureInterpreter},
+ {0, AC_WRITE, 0, 0, 10, AUTO, "AEMaxAperture2", &paApertureInterpreter},
+ {0, AC_WRITE, 0, 0, 11, AUTO, "AEMinAperture", &paApertureInterpreter},
  {0, AC_WRITE, 0, 0, 12, AUTO, "AEMeteringMode", &stdInterpreter},
- {0, AC_WRITE, 0, 0, 14, AUTO, "FlashExposureCompSet", &stdInterpreter},
+ {0, AC_WRITE, 0, 0, 14,SBYTE, "FlashExposureCompSet", &stdInterpreter},
+ {-1, AC_DONTWRITE, 0,  0, 0, AUTO, "", NULL}};
+
+const TagAttrib pentaxAEInfo2Attribs[] = {
+ {0, AC_WRITE, 0, 0,  2, AUTO, "AEExposureTime", &paExposureTimeInterpreter},
+ {0, AC_WRITE, 0, 0,  3, AUTO, "AEAperture", &paApertureInterpreter},
+ {0, AC_WRITE, 0, 0,  4, AUTO, "AE_ISO", &paISOfInterpreter},
+ {0, AC_WRITE, 0, 0,  5, AUTO, "AEXv", &paAEXvInterpreter},
+ {0, AC_WRITE, 0, 0,  6,SBYTE, "AEBXv", &paAEBXvInterpreter},
+ {0, AC_WRITE, 0, 0,  8,SBYTE, "AEError", &stdInterpreter},
+ //{0, AC_WRITE, 0, 0, 11, AUTO, "AEApertureSteps", &},
+ {0, AC_WRITE, 0, 0, 15, AUTO, "SceneMode", &paSceneModeInterpreter},
+ {0, AC_WRITE, 0, 0, 16, AUTO, "AEMaxAperture", &paApertureInterpreter},
+ {0, AC_WRITE, 0, 0, 17, AUTO, "AEMaxAperture2", &paApertureInterpreter},
+ {0, AC_WRITE, 0, 0, 18, AUTO, "AEMinAperture", &paApertureInterpreter},
+ {0, AC_WRITE, 0, 0, 19, AUTO, "AEMinExposureTime", &paExposureTimeInterpreter},
+ {-1, AC_DONTWRITE, 0,  0, 0, AUTO, "", NULL}};
+
+const TagAttrib pentaxAEInfo3Attribs[] = {
+ {0, AC_WRITE, 0, 0, 16, AUTO, "AEExposureTime", &paExposureTimeInterpreter},
+ {0, AC_WRITE, 0, 0, 17, AUTO, "AEAperture", &paApertureInterpreter},
+ {0, AC_WRITE, 0, 0, 18, AUTO, "AE_ISO", &paISOfInterpreter},
+ {0, AC_WRITE, 0, 0, 28, AUTO, "AEMaxAperture", &paApertureInterpreter},
+ {0, AC_WRITE, 0, 0, 29, AUTO, "AEMaxAperture2", &paApertureInterpreter},
+ {0, AC_WRITE, 0, 0, 30, AUTO, "AEMinAperture", &paApertureInterpreter},
+ {0, AC_WRITE, 0, 0, 31, AUTO, "AEMinExposureTime", &paExposureTimeInterpreter},
  {-1, AC_DONTWRITE, 0,  0, 0, AUTO, "", NULL}};
 
 const TagAttrib pentaxFlashInfoAttribs[] = {

rtexif/rtexif.cc

@@ -737,11 +737,10 @@ Tag::Tag (TagDirectory* p, FILE* f, int base)
               default:
                   goto defsubdirs;
               }
-          }else if (!strncmp(make, "PENTAX", 6)) {
+          }else if ((!strncmp(make, "PENTAX", 6)) || (!strncmp(make, "RICOH", 5) && !strncmp(model, "PENTAX", 6))) { // Either the former Pentax brand or the RICOH brand + PENTAX model"
               switch( tag ){
-              case 0x005c:
+              case 0x007d:
               case 0x0205:
-              case 0x0206:
               case 0x0208:
               case 0x0216:
                   directory = new TagDirectory*[2];
@@ -755,6 +754,36 @@ Tag::Tag (TagDirectory* p, FILE* f, int base)
                   directory[0] = new TagDirectoryTable (parent, f, valuesize,0,LONG , attrib->subdirAttribs, order);
                   makerNoteKind = TABLESUBDIR;
                   break;
+              case 0x005c:
+                  directory = new TagDirectory*[2];
+                  directory[1] = NULL;
+                  if (count == 4)       // SRInfo
+                      directory[0] = new TagDirectoryTable (parent, f, valuesize,0,BYTE , pentaxSRInfoAttribs, order);
+                  else if (count == 2)  // SRInfo2
+                      directory[0] = new TagDirectoryTable (parent, f, valuesize,0,BYTE , pentaxSRInfo2Attribs, order);
+                  else {
+                      // Unknown SRInfo
+                      delete directory;
+                      directory = NULL;
+                  }
+                  makerNoteKind = TABLESUBDIR;
+                  break;
+              case 0x0206:
+                  directory = new TagDirectory*[2];
+                  directory[1] = NULL;
+                  if (count == 21)       // AEInfo2
+                      directory[0] = new TagDirectoryTable (parent, f, valuesize,0,BYTE , pentaxAEInfo2Attribs, order);
+                  else if (count == 48)  // AEInfo3
+                      directory[0] = new TagDirectoryTable (parent, f, valuesize,0,BYTE , pentaxAEInfo3Attribs, order);
+                  else if (count <= 25)  // AEInfo
+                      directory[0] = new TagDirectoryTable (parent, f, valuesize,0,BYTE , pentaxAEInfoAttribs, order);
+                  else {
+                      // Unknown AEInfo
+                      delete directory;
+                      directory = NULL;
+                  }
+                  makerNoteKind = TABLESUBDIR;
+                  break;
               case 0x0207:
               {   // There are 2 format pentaxLensDataAttribs
                   int offsetFirst = 4;  // LensInfo2
@@ -766,6 +795,9 @@ Tag::Tag (TagDirectory* p, FILE* f, int base)
                       offsetFirst = 12;  // LensInfo4
                   else if( strstr(model, "K-01") || strstr(model, "K-30"))
                       offsetFirst = 15;  // LensInfo5
+                  else if(!strncmp(make, "RICOH", 5)) { // all PENTAX camera model produced under the RICOH era uses LensInfo5, for now...
+                      offsetFirst = 15;  // LensInfo5 too
+                  }
                   directory = new TagDirectory*[2];
                   directory[1] = NULL;
                   directory[0] = new TagDirectoryTable (parent, f, valuesize,offsetFirst,BYTE , attrib->subdirAttribs, order);
@@ -919,6 +951,14 @@ bool Tag::parseMakerNote(FILE* f, int base, ByteOrder bom )
         directory = new TagDirectory*[2];
         directory[0] = new TagDirectory (parent, f, base, pentaxAttribs, bom);
         directory[1] = NULL;
+    } else if ( (make.find( "RICOH" ) != std::string::npos ) && (model.find("PENTAX") != std::string::npos) ) {
+        makerNoteKind = HEADERIFD;
+        valuesize = 10;
+        value = new unsigned char[10];
+        fread (value, 1, 10, f);
+        directory = new TagDirectory*[2];
+        directory[0] = new TagDirectory (parent, f, ftell (f)-10, pentaxAttribs, bom);
+        directory[1] = NULL;
     } else if ( make.find( "FUJIFILM" ) != std::string::npos ) {
         makerNoteKind = FUJI;
         valuesize = 12;
@@ -1050,6 +1090,8 @@ int Tag::toInt (int ofs, TagType astype) {
   if (astype == INVALID)
     astype = type;
   switch (astype) {
+    //case SBYTE: return (signed char)(value[ofs]);
+    case SBYTE: return int((reinterpret_cast<signed char*>(value))[ofs]);
     case BYTE:  return value[ofs];
     case ASCII: return 0;
     case SSHORT:return (int)int2_to_signed(sget2 (value+ofs, getOrder()));
@@ -1073,6 +1115,7 @@ double Tag::toDouble (int ofs) {
 
   double ud, dd;
   switch (type) {
+    case SBYTE: return (double)(int((reinterpret_cast<signed char*>(value))[ofs]));
     case BYTE:  return (double)((int)value[ofs]);
     case ASCII: return 0.0;
     case SSHORT:return (double)int2_to_signed(sget2 (value+ofs, getOrder()));

rtexif/rtexif.h

@@ -34,7 +34,7 @@ class CacheImageData;
 
 namespace rtexif {
 
-enum TagType {INVALID=0, BYTE=1, ASCII=2, SHORT=3, LONG=4, RATIONAL=5, UNDEFINED=7, SSHORT=8, SLONG=9, SRATIONAL=10, FLOAT=11, DOUBLE=12, OLYUNDEF=13, AUTO=98, SUBDIR=99};
+enum TagType {INVALID=0, BYTE=1, ASCII=2, SHORT=3, LONG=4, RATIONAL=5, SBYTE=6, UNDEFINED=7, SSHORT=8, SLONG=9, SRATIONAL=10, FLOAT=11, DOUBLE=12, OLYUNDEF=13, AUTO=98, SUBDIR=99};
 enum ActionCode {
     AC_DONTWRITE,  // don't write it to the output
     AC_WRITE,      // write it to the output
@@ -191,11 +191,12 @@ class Tag {
     int                  getCount       () const { return count; }
     TagType              getType        () const { return (attrib && attrib->type > INVALID && attrib->type < AUTO) ? attrib->type : type; }
     unsigned char*       getValue       () const { return value; }
+    signed char*         getSignedValue () const { return reinterpret_cast<signed char*>(value); }
     const TagAttrib*     getAttrib      () const { return attrib; }
     inline ByteOrder     getOrder       () const { return parent ? parent->getOrder() : INTEL; }
     inline TagDirectory* getParent      () const { return parent; }
     int                  getValueSize   () const { return valuesize; }
-    bool                 getOwnMemory() const { return allocOwnMemory; }
+    bool                 getOwnMemory   () const { return allocOwnMemory; }
 
     // read/write value
     int     toInt         (int ofs=0, TagType astype=INVALID);
@@ -270,6 +271,7 @@ class Interpreter {
         virtual double toDouble(Tag* t, int ofs=0) {
             double ud, dd;
             switch (t->getType()) {
+                case SBYTE: return double(int(t->getSignedValue()[ofs]));
                 case BYTE:  return (double)((int)t->getValue()[ofs]);
                 case ASCII: return 0.0;
                 case SSHORT:return (double)int2_to_signed(sget2 (t->getValue()+ofs, t->getOrder()));
@@ -289,6 +291,7 @@ class Interpreter {
             if (astype == INVALID || astype==AUTO)
                 astype = t->getType();
             switch (astype) {
+                case SBYTE: return int(t->getSignedValue()[ofs]);
                 case BYTE:  return t->getValue()[ofs];
                 case ASCII: return 0;
                 case SSHORT:return (int)int2_to_signed(sget2 (t->getValue()+ofs, t->getOrder()));
@@ -440,10 +443,14 @@ extern const TagAttrib canonAttribs[];
 extern const TagAttrib pentaxAttribs[];
 extern const TagAttrib pentaxLensDataAttribs[];
 extern const TagAttrib pentaxLensInfoQAttribs[];
+extern const TagAttrib pentaxLensCorrAttribs[];
 extern const TagAttrib pentaxAEInfoAttribs[];
+extern const TagAttrib pentaxAEInfo2Attribs[];
+extern const TagAttrib pentaxAEInfo3Attribs[];
 extern const TagAttrib pentaxCameraSettingsAttribs[];
 extern const TagAttrib pentaxFlashInfoAttribs[];
 extern const TagAttrib pentaxSRInfoAttribs[];
+extern const TagAttrib pentaxSRInfo2Attribs[];
 extern const TagAttrib pentaxBatteryInfoAttribs[];
 extern const TagAttrib pentaxCameraInfoAttribs[];
 extern const TagAttrib fujiAttribs[];