Fix issue #3411 + revert some code to the old one for better readability

This commit is contained in:
Hombre
2016-09-03 00:49:35 +02:00
parent bdf4665c16
commit a69c631f22
7 changed files with 31 additions and 93 deletions

View File

@@ -2216,8 +2216,6 @@ void ParamsEdited::combine (rtengine::procparams::ProcParams& toEdit, const rten
toEdit.icm.outputBPC = mods.icm.outputBPC;
}
//if (icm.gampos) toEdit.icm.gampos = mods.icm.gampos;
//if (icm.slpos) toEdit.icm.slpos = mods.icm.slpos;
if (icm.gampos) {
toEdit.icm.gampos = dontforceSet && options.baBehav[ADDSET_FREE_OUPUT_GAMMA] ? toEdit.icm.gampos + mods.icm.gampos : mods.icm.gampos;
}