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

merge with Dev

Browse Source
This commit is contained in:
Desmis
2017-08-19 08:17:43 +02:00
parent e9eb5a333e 8aed0100cd
commit eb46859301
55 changed files with 2270 additions and 1197 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
rtgui/options.cc
View File

@@ -650,7 +650,7 @@ void Options::setDefaults ()
#endif
// rtSettings.viewingdevice = 0;
// rtSettings.viewingdevicegrey = 3;
rtSettings.viewinggreySc = 1;
// rtSettings.viewinggreySc = 1;
rtSettings.leveldnv = 2;
rtSettings.leveldnti = 0;
rtSettings.leveldnaut = 0;
@@ -1607,11 +1607,11 @@ int Options::readFromFile (Glib::ustring fname)
rtSettings.viewingdevicegrey = keyFile.get_integer ("Color Management", "grey");
}
*/
/*
if (keyFile.has_key ("Color Management", "greySc")) {
rtSettings.viewinggreySc = keyFile.get_integer ("Color Management", "greySc");
}
*/
if (keyFile.has_key ("Color Management", "CBDLArtif")) {
rtSettings.artifact_cbdl = keyFile.get_double ("Color Management", "CBDLArtif");
}
@@ -2195,7 +2195,7 @@ int Options::saveToFile (Glib::ustring fname)
keyFile.set_boolean ("Color Management", "MonitorBPC", rtSettings.monitorBPC);
//keyFile.set_integer ("Color Management", "view", rtSettings.viewingdevice);
//keyFile.set_integer ("Color Management", "grey", rtSettings.viewingdevicegrey);
keyFile.set_integer ("Color Management", "greySc", rtSettings.viewinggreySc);
// keyFile.set_integer ("Color Management", "greySc", rtSettings.viewinggreySc);
keyFile.set_string ("Color Management", "AdobeRGB", rtSettings.adobe);
keyFile.set_string ("Color Management", "ProPhoto", rtSettings.prophoto);