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

Fixed bug in Output profile and add illuminant choice to Icc V4

Browse Source
This commit is contained in:
Desmis
2018-04-17 17:22:22 +02:00
parent b5898e0a54
commit 49340d5c76
10 changed files with 215 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
rtgui/paramsedited.cc
View File

@@ -391,6 +391,7 @@ void ParamsEdited::set(bool v)
icm.slpos = v;
icm.wprimari = v;
icm.wprofile = v;
icm.wtemp = v;
raw.bayersensor.method = v;
raw.bayersensor.imageNum = v;
raw.bayersensor.ccSteps = v;
@@ -957,6 +958,7 @@ void ParamsEdited::initFrom(const std::vector<rtengine::procparams::ProcParams>&
icm.slpos = icm.slpos && p.icm.slpos == other.icm.slpos;
icm.wprimari = icm.wprimari && p.icm.wprimari == other.icm.wprimari;
icm.wprofile = icm.wprofile && p.icm.wprofile == other.icm.wprofile;
icm.wtemp = icm.wtemp && p.icm.wtemp == other.icm.wtemp;
raw.bayersensor.method = raw.bayersensor.method && p.raw.bayersensor.method == other.raw.bayersensor.method;
raw.bayersensor.imageNum = raw.bayersensor.imageNum && p.raw.bayersensor.imageNum == other.raw.bayersensor.imageNum;
raw.bayersensor.ccSteps = raw.bayersensor.ccSteps && p.raw.bayersensor.ccSteps == other.raw.bayersensor.ccSteps;
@@ -2488,6 +2490,10 @@ void ParamsEdited::combine(rtengine::procparams::ProcParams& toEdit, const rteng
toEdit.icm.wprofile = mods.icm.wprofile;
}
if (icm.wtemp) {
toEdit.icm.wtemp = mods.icm.wtemp;
}
if (icm.freegamma) {
toEdit.icm.freegamma = mods.icm.freegamma;
}