astyle all modified files in retinex branch

This commit is contained in:
Beep6581
2015-10-17 14:45:24 +02:00
parent 7e6d0d45f4
commit 7ca8de08ab
15 changed files with 324 additions and 268 deletions

View File

@@ -1053,7 +1053,7 @@ void ParamsEdited::combine (rtengine::procparams::ProcParams& toEdit, const rten
if (retinex.lhcurve) {
toEdit.retinex.lhcurve = mods.retinex.lhcurve;
}
if (retinex.transmissionCurve) {
toEdit.retinex.transmissionCurve = mods.retinex.transmissionCurve;
}
@@ -1109,10 +1109,10 @@ void ParamsEdited::combine (rtengine::procparams::ProcParams& toEdit, const rten
// if (retinex.grbl) {
// toEdit.retinex.grbl = mods.retinex.grbl;
// }
if (retinex.gain) {
toEdit.retinex.gain = dontforceSet && options.baBehav[ADDSET_RETI_GAIN] ? toEdit.retinex.gain + mods.retinex.gain : mods.retinex.gain;
}
}
if (retinex.offs) {
toEdit.retinex.offs = dontforceSet && options.baBehav[ADDSET_RETI_OFFS] ? toEdit.retinex.offs + mods.retinex.offs : mods.retinex.offs;