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

Merge branch 'dev' into metadata-exiv2

Browse Source
This commit is contained in:
Lawrence Lee
2023-03-22 23:01:40 -07:00
parent 1e6cc85fe2 f84d67f524
commit 0729deec4b
43 changed files with 1185 additions and 333 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
rtengine/simpleprocess.cc
View File

@@ -270,7 +270,7 @@ private:
}
// set the color temperature
currWB = ColorTemp(params.wb.temperature, params.wb.green, params.wb.equal, params.wb.method);
currWB = ColorTemp(params.wb.temperature, params.wb.green, params.wb.equal, params.wb.method, params.wb.observer);
if (!params.wb.enabled) {
currWB = ColorTemp();
@@ -279,7 +279,7 @@ private:
} else if (params.wb.method == "autold") {
double rm, gm, bm;
imgsrc->getAutoWBMultipliers(rm, gm, bm);
currWB.update(rm, gm, bm, params.wb.equal, params.wb.tempBias);
currWB.update(rm, gm, bm, params.wb.equal, params.wb.observer, params.wb.tempBias);
}
calclum = nullptr ;
@@ -782,7 +782,7 @@ private:
if (params.toneCurve.histmatching) {
if (!params.toneCurve.fromHistMatching) {
imgsrc->getAutoMatchedToneCurve(params.icm, params.toneCurve.curve);
imgsrc->getAutoMatchedToneCurve(params.icm, params.wb.observer, params.toneCurve.curve);
}
if (params.toneCurve.autoexp) {