exposure before interpolation from branch default

This commit is contained in:
jdc
2011-01-07 07:06:46 +01:00
parent de5b09080e
commit 291a0f5cac
14 changed files with 391 additions and 46 deletions

View File

@@ -210,7 +210,11 @@ void ProcParams::setDefaults () {
raw.dmethod = RAWParams::methodstring[RAWParams::hphd];;
raw.dcb_iterations=2;
raw.dcb_enhance=false;
//exposition
raw.expos=1.0;
raw.preser=0.0;
//raw.expos_correc=false;
// expos
exif.clear ();
iptc.clear ();
@@ -435,6 +439,11 @@ int ProcParams::save (Glib::ustring fname) const {
keyFile.set_string ("RAW", "Method", raw.dmethod );
keyFile.set_integer ("RAW", "DCBIterations", raw.dcb_iterations );
keyFile.set_boolean ("RAW", "DCBEnhance", raw.dcb_enhance );
//exposure
keyFile.set_double ("RAW", "PreExposure", raw.expos );
keyFile.set_double ("RAW", "PrePreserv", raw.preser );
// exposition
// save exif change list
for (int i=0; i<(int)exif.size(); i++)
@@ -752,6 +761,10 @@ if (keyFile.has_group ("RAW")) {
if (keyFile.has_key ("RAW", "Method")) raw.dmethod = keyFile.get_string ("RAW", "Method");
if (keyFile.has_key ("RAW", "DCBIterations")) raw.dcb_iterations = keyFile.get_integer("RAW", "DCBIterations");
if (keyFile.has_key ("RAW", "DCBEnhance")) raw.dcb_enhance =keyFile.get_boolean("RAW", "DCBEnhance");
if (keyFile.has_key ("RAW", "PreExposure")) raw.expos =keyFile.get_double("RAW", "PreExposure");
if (keyFile.has_key ("RAW", "PrePreserv")) raw.preser =keyFile.get_double("RAW", "PrePreserv");
}
// load exif change settings
@@ -951,7 +964,9 @@ bool ProcParams::operator== (const ProcParams& other) {
&& dirpyrequalizer == other.dirpyrequalizer
&& hsvequalizer == other.hsvequalizer
&& exif==other.exif
&& iptc==other.iptc;
&& iptc==other.iptc
&& raw.expos==other.raw.expos // exposi
&& raw.preser==other.raw.preser;
}
bool ProcParams::operator!= (const ProcParams& other) {