merge with dev

This commit is contained in:
Desmis
2018-03-20 18:21:51 +01:00
34 changed files with 1509 additions and 2218 deletions

View File

@@ -552,7 +552,6 @@ void Options::setDefaults ()
rtSettings.gamutICC = true;
rtSettings.gamutLch = true;
rtSettings.amchroma = 40;//between 20 and 140 low values increase effect..and also artifacts, high values reduces
rtSettings.artifact_cbdl = 4.;
rtSettings.level0_cbdl = 0;
rtSettings.level123_cbdl = 30;
//locallab
@@ -1448,9 +1447,6 @@ void Options::readFromFile (Glib::ustring fname)
rtSettings.viewinggreySc = keyFile.get_integer ("Color Management", "greySc");
}
*/
if (keyFile.has_key ("Color Management", "CBDLArtif")) {
rtSettings.artifact_cbdl = keyFile.get_double ("Color Management", "CBDLArtif");
}
if (keyFile.has_key ("Color Management", "CBDLlevel0")) {
rtSettings.level0_cbdl = keyFile.get_double ("Color Management", "CBDLlevel0");
@@ -2055,7 +2051,6 @@ void Options::saveToFile (Glib::ustring fname)
keyFile.set_integer ("Color Management", "CRI", rtSettings.CRI_color);
keyFile.set_integer ("Color Management", "DenoiseLabgamma", rtSettings.denoiselabgamma);
//keyFile.set_boolean ("Color Management", "Ciebadpixgauss", rtSettings.ciebadpixgauss);
keyFile.set_double ("Color Management", "CBDLArtif", rtSettings.artifact_cbdl);
keyFile.set_double ("Color Management", "CBDLlevel0", rtSettings.level0_cbdl);
keyFile.set_double ("Color Management", "CBDLlevel123", rtSettings.level123_cbdl);
//keyFile.set_double ("Color Management", "Colortoningab", rtSettings.colortoningab);