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

Small improvment and format code improccoordinator wb

Browse Source
This commit is contained in:
Desmis
2020-03-02 18:07:41 +01:00
parent dbeccefd44
commit 32165f9f7d
1 changed files with 22 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
rtengine/improccoordinator.cc
View File

@@ -441,36 +441,36 @@ void ImProcCoordinator::updatePreviewImage(int todo, bool panningRelatedChange)
currWBitc = imgsrc->getWB(); currWBitc = imgsrc->getWB();
double tempref = currWBitc.getTemp() * (1. + params->wb.tempBias); double tempref = currWBitc.getTemp() * (1. + params->wb.tempBias);
double greenref = currWBitc.getGreen(); double greenref = currWBitc.getGreen();
if (settings->verbose) { if (settings->verbose && params->wb.method == "autitcgreen") {
printf("tempref=%f greref=%f\n", tempref, greenref); printf("tempref=%f greref=%f\n", tempref, greenref);
} }
imgsrc->getAutoWBMultipliersitc(tempref, greenref, tempitc, greenitc, studgood, 0, 0, fh, fw, 0, 0, fh, fw, rm, gm, bm, params->wb, params->icm, params->raw); imgsrc->getAutoWBMultipliersitc(tempref, greenref, tempitc, greenitc, studgood, 0, 0, fh, fw, 0, 0, fh, fw, rm, gm, bm, params->wb, params->icm, params->raw);
if (params->wb.method == "autitcgreen") {
params->wb.temperature = tempitc;
params->wb.green = greenitc;
currWB = ColorTemp(params->wb.temperature, params->wb.green, 1., params->wb.method);
currWB.getMultipliers(rm, gm, bm);
}
if (rm != -1.) {
double bias = params->wb.tempBias;
if (params->wb.method == "autitcgreen") { if (params->wb.method == "autitcgreen") {
bias = 0.; params->wb.temperature = tempitc;
params->wb.green = greenitc;
currWB = ColorTemp(params->wb.temperature, params->wb.green, 1., params->wb.method);
currWB.getMultipliers(rm, gm, bm);
} }
autoWB.update(rm, gm, bm, params->wb.equal, bias); if (rm != -1.) {
lastAwbEqual = params->wb.equal; double bias = params->wb.tempBias;
lastAwbTempBias = params->wb.tempBias;
lastAwbauto = params->wb.method; if (params->wb.method == "autitcgreen") {
} else { bias = 0.;
lastAwbEqual = -1.; }
lastAwbTempBias = 0.0;
lastAwbauto = ""; autoWB.update(rm, gm, bm, params->wb.equal, bias);
autoWB.useDefaults(params->wb.equal); lastAwbEqual = params->wb.equal;
} lastAwbTempBias = params->wb.tempBias;
lastAwbauto = params->wb.method;
} else {
lastAwbEqual = -1.;
lastAwbTempBias = 0.0;
lastAwbauto = "";
autoWB.useDefaults(params->wb.equal);
}
} }
@@ -483,7 +483,6 @@ void ImProcCoordinator::updatePreviewImage(int todo, bool panningRelatedChange)
params->wb.green = currWB.getGreen(); params->wb.green = currWB.getGreen();
} }
// if (params->wb.method == "Auto" && awbListener && params->wb.enabled) {
if (autowb && awbListener && params->wb.method == "autitcgreen") { if (autowb && awbListener && params->wb.method == "autitcgreen") {
awbListener->WBChanged(params->wb.temperature, params->wb.green, studgood); awbListener->WBChanged(params->wb.temperature, params->wb.green, studgood);
} }