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

Merge branch 'master' into clang-tidy

Browse Source
This commit is contained in:
Flössie
2016-10-18 17:48:50 +02:00
parent f9f4fe9035 cced5756cb
commit 0bbc84b2af
85 changed files with 6870 additions and 2817 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
rtengine/procparams.cc
View File

@@ -927,6 +927,7 @@ void ColorManagementParams::setDefaults()
working = "ProPhoto";
output = "RT_sRGB";
outputIntent = RI_RELATIVE;
outputBPC = true;
gamma = "default";
gampos = 2.22;
slpos = 4.5;
@@ -2662,6 +2663,10 @@ int ProcParams::save (const Glib::ustring &fname, const Glib::ustring &fname2, b
keyFile.set_string ("Color Management", "OutputProfileIntent", intent);
}
if (!pedited || pedited->icm.outputBPC) {
keyFile.set_boolean ("Color Management", "OutputBPC", icm.outputBPC);
}
if (!pedited || pedited->icm.gamma) {
keyFile.set_string ("Color Management", "Gammafree", icm.gamma);
}
@@ -5921,6 +5926,14 @@ int ProcParams::load (const Glib::ustring &fname, ParamsEdited* pedited)
}
}
if (keyFile.has_key ("Color Management", "OutputBPC")) {
icm.outputBPC = keyFile.get_boolean ("Color Management", "OutputBPC");
if (pedited) {
pedited->icm.outputBPC = true;
}
}
if (keyFile.has_key ("Color Management", "Gammafree")) {
icm.gamma = keyFile.get_string ("Color Management", "Gammafree");