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

Merged master into gtk3 with some manually fixed merge conflicts caused by formatting changes.

Browse Source
This commit is contained in:
Beep6581
2016-04-30 16:29:13 +02:00
parent 59a9d2dc2f c8db56643a
commit a47043d6cd
8 changed files with 50 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
rtgui/options.cc
View File

@@ -643,6 +643,7 @@ void Options::setDefaults ()
rtSettings.bruce = "Bruce";
rtSettings.beta = "BetaRGB";
rtSettings.best = "BestRGB";
rtSettings.rec2020 = "Rec2020";
rtSettings.verbose = false;
rtSettings.gamutICC = true;
rtSettings.gamutLch = true;
@@ -1537,6 +1538,10 @@ int Options::readFromFile (Glib::ustring fname)
rtSettings.best = keyFile.get_string ("Color Management", "Best");
}
if ( keyFile.has_key ("Color Management", "Rec2020")) {
rtSettings.rec2020 = keyFile.get_string ("Color Management", "Rec2020");
}
if ( keyFile.has_key ("Color Management", "Bruce")) {
rtSettings.bruce = keyFile.get_string ("Color Management", "Bruce");
}
@@ -2029,6 +2034,7 @@ int Options::saveToFile (Glib::ustring fname)
keyFile.set_string ("Color Management", "sRGB10", rtSettings.srgb10);
keyFile.set_string ("Color Management", "Beta", rtSettings.beta);
keyFile.set_string ("Color Management", "Best", rtSettings.best);
keyFile.set_string ("Color Management", "Rec2020", rtSettings.rec2020);
keyFile.set_string ("Color Management", "Bruce", rtSettings.bruce);
keyFile.set_integer ("Color Management", "WhiteBalanceSpotSize", whiteBalanceSpotSize);
keyFile.set_boolean ("Color Management", "GamutICC", rtSettings.gamutICC);