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

Merge from trunk to version ed52f4f469 "Updated make-app-bundle script to use new template for file name"

Browse Source
This commit is contained in:
askvortsov
2010-10-01 10:36:31 -07:00
parent d6d6d6ae23
commit bcd42c3fc2
68 changed files with 2285 additions and 756 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
rtengine/procparams.cc
View File

@@ -172,7 +172,13 @@ void ProcParams::setDefaults () {
{
equalizer.c[i] = 0;
}
dirpyrequalizer.enabled = false;
for(int i = 0; i < 4; i ++)
{
dirpyrequalizer.mult[i] = 1.0;
}
dirpyrequalizer.mult[4] = 0.0;
exif.clear ();
iptc.clear ();
@@ -338,6 +344,15 @@ int ProcParams::save (Glib::ustring fname) const {
ss << "C" << i;
keyFile.set_integer("Equalizer", ss.str(), equalizer.c[i]);
}
// save directional pyramid equalizer parameters
keyFile.set_boolean ("Directional Pyramid Equalizer", "Enabled", dirpyrequalizer.enabled);
for(int i = 0; i < 5; i++)
{
std::stringstream ss;
ss << "Mult" << i;
keyFile.set_double("Directional Pyramid Equalizer", ss.str(), dirpyrequalizer.mult[i]);
}
// save exif change list
for (int i=0; i<(int)exif.size(); i++)
@@ -589,6 +604,17 @@ if (keyFile.has_group ("Equalizer")) {
if(keyFile.has_key ("Equalizer", ss.str())) equalizer.c[i] = keyFile.get_integer ("Equalizer", ss.str());
}
}
// 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 < 5; i ++)
{
std::stringstream ss;
ss << "Mult" << i;
if(keyFile.has_key ("Directional Pyramid Equalizer", ss.str())) dirpyrequalizer.mult[i] = keyFile.get_double ("Directional Pyramid Equalizer", ss.str());
}
}
// load exif change settings
if (keyFile.has_group ("Exif")) {
@@ -633,6 +659,17 @@ bool operator==(const EqualizerParams & a, const EqualizerParams & b) {
}
return true;
}
bool operator==(const DirPyrEqualizerParams & a, const DirPyrEqualizerParams & b) {
if(a.enabled != b.enabled)
return false;
for(int i = 0; i < 5; i++) {
if(a.mult[i] != b.mult[i])
return false;
}
return true;
}
bool operator==(const ExifPair& a, const ExifPair& b) {
@@ -739,6 +776,7 @@ bool ProcParams::operator== (const ProcParams& other) {
&& icm.working == other.icm.working
&& icm.output == other.icm.output
&& equalizer == other.equalizer
&& dirpyrequalizer == other.dirpyrequalizer
&& exif==other.exif
&& iptc==other.iptc;
}