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

White balance shows wrong method when opening a file which was set to Auto in 5.8, #5668

Browse Source
This commit is contained in:
Ingo Weyrich 2020-02-26 18:32:32 +01:00
parent 4863c7a372
commit 13e2bc4152
1 changed files with 3 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
rtengine/procparams.cc
View File

@ -4167,23 +4167,9 @@ int ProcParams::load(const Glib::ustring& fname, ParamsEdited* pedited)
} }
if (keyFile.has_group("White Balance")) { if (keyFile.has_group("White Balance")) {
assignFromKeyfile(keyFile, "White Balance", "Enabled", pedited, wb.enabled, pedited->wb.enabled); assignFromKeyfile(keyFile, "White Balance", "Enabled", pedited, wb.enabled, pedited->wb.enabled);
if (keyFile.has_key("White Balance", "Setting")) { assignFromKeyfile(keyFile, "White Balance", "Setting", pedited, wb.method, pedited->wb.method);
// if(ppVersion < 349) { if (wb.method == "Auto") {
Glib::ustring prov = keyFile.get_string("White Balance", "Setting"); wb.method = "autold";
// printf("Prov=%s\n", prov.c_str());
if(prov == "Auto") {
printf("OK Auto\n");
prov = "autold";
wb.method = prov;
keyFile.set_string("White Balance", "Setting",wb.method );
if (pedited) {
pedited->wb.method = true;
}
assignFromKeyfile(keyFile, "White Balance", "Setting", pedited, wb.method, pedited->wb.method);
} else {
assignFromKeyfile(keyFile, "White Balance", "Setting", pedited, wb.method, pedited->wb.method);
}
} }
assignFromKeyfile(keyFile, "White Balance", "Temperature", pedited, wb.temperature, pedited->wb.temperature); assignFromKeyfile(keyFile, "White Balance", "Temperature", pedited, wb.temperature, pedited->wb.temperature);
assignFromKeyfile(keyFile, "White Balance", "Green", pedited, wb.green, pedited->wb.green); assignFromKeyfile(keyFile, "White Balance", "Green", pedited, wb.green, pedited->wb.green);