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

Merge

Browse Source
This commit is contained in:
ffsup2
2010-10-03 19:52:27 +02:00
parent 23a8834755
commit 7c6de47f9d
39 changed files with 698 additions and 347 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
rtengine/procparams.cc
View File

@@ -175,10 +175,11 @@ void ProcParams::setDefaults () {
equalizer.c[i] = 0;
}
dirpyrequalizer.enabled = false;
for(int i = 0; i < 8; i ++)
for(int i = 0; i < 4; i ++)
{
dirpyrequalizer.mult[i] = 1.0;
}
dirpyrequalizer.mult[4] = 0.0;
raw.df_autoselect = false;
raw.ca_autocorrect = false;
raw.hotdeadpix_filt = false;
@@ -357,7 +358,7 @@ int ProcParams::save (Glib::ustring fname) const {
// save directional pyramid equalizer parameters
keyFile.set_boolean ("Directional Pyramid Equalizer", "Enabled", dirpyrequalizer.enabled);
for(int i = 0; i < 8; i++)
for(int i = 0; i < 5; i++)
{
std::stringstream ss;
ss << "Mult" << i;
@@ -630,7 +631,7 @@ if (keyFile.has_group ("Equalizer")) {
// load directional pyramid equalizer parameters
if (keyFile.has_group ("Directional Pyramid Equalizer")) {
if (keyFile.has_key ("Directional Pyramid Equalizer", "Enabled")) dirpyrequalizer.enabled = keyFile.get_boolean ("Directional Pyramid Equalizer", "Enabled");
for(int i = 0; i < 8; i ++)
for(int i = 0; i < 5; i ++)
{
std::stringstream ss;
ss << "Mult" << i;
@@ -700,7 +701,7 @@ bool operator==(const DirPyrEqualizerParams & a, const DirPyrEqualizerParams & b
if(a.enabled != b.enabled)
return false;
for(int i = 0; i < 8; i++) {
for(int i = 0; i < 5; i++) {
if(a.mult[i] != b.mult[i])
return false;
}