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

Added missing paramsedited entries for pr-sharpening contrast threshold

Browse Source
This commit is contained in:
heckflosse
2018-05-22 14:31:35 +02:00
parent 6f6dafe214
commit 69af2a6b4c
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
rtgui/paramsedited.cc
View File

@@ -157,6 +157,7 @@ void ParamsEdited::set (bool v)
sharpening.deconviter = v; sharpening.deconviter = v;
sharpening.deconvdamping = v; sharpening.deconvdamping = v;
prsharpening.enabled = v; prsharpening.enabled = v;
prsharpening.contrast = v;
prsharpening.radius = v; prsharpening.radius = v;
prsharpening.amount = v; prsharpening.amount = v;
prsharpening.threshold = v; prsharpening.threshold = v;
@@ -711,6 +712,7 @@ void ParamsEdited::initFrom (const std::vector<rtengine::procparams::ProcParams>
sharpening.deconviter = sharpening.deconviter && p.sharpening.deconviter == other.sharpening.deconviter; sharpening.deconviter = sharpening.deconviter && p.sharpening.deconviter == other.sharpening.deconviter;
sharpening.deconvdamping = sharpening.deconvdamping && p.sharpening.deconvdamping == other.sharpening.deconvdamping; sharpening.deconvdamping = sharpening.deconvdamping && p.sharpening.deconvdamping == other.sharpening.deconvdamping;
prsharpening.enabled = prsharpening.enabled && p.prsharpening.enabled == other.prsharpening.enabled; prsharpening.enabled = prsharpening.enabled && p.prsharpening.enabled == other.prsharpening.enabled;
prsharpening.contrast = prsharpening.contrast && p.prsharpening.contrast == other.prsharpening.contrast;
prsharpening.radius = prsharpening.radius && p.prsharpening.radius == other.prsharpening.radius; prsharpening.radius = prsharpening.radius && p.prsharpening.radius == other.prsharpening.radius;
prsharpening.amount = prsharpening.amount && p.prsharpening.amount == other.prsharpening.amount; prsharpening.amount = prsharpening.amount && p.prsharpening.amount == other.prsharpening.amount;
prsharpening.threshold = prsharpening.threshold && p.prsharpening.threshold == other.prsharpening.threshold; prsharpening.threshold = prsharpening.threshold && p.prsharpening.threshold == other.prsharpening.threshold;
@@ -1640,6 +1642,10 @@ void ParamsEdited::combine (rtengine::procparams::ProcParams& toEdit, const rten
toEdit.prsharpening.enabled = mods.prsharpening.enabled; toEdit.prsharpening.enabled = mods.prsharpening.enabled;
} }
if (prsharpening.contrast) {
toEdit.prsharpening.contrast = dontforceSet && options.baBehav[ADDSET_SHARP_CONTRAST] ? toEdit.prsharpening.contrast + mods.prsharpening.contrast : mods.prsharpening.contrast;
}
if (prsharpening.radius) { if (prsharpening.radius) {
toEdit.prsharpening.radius = dontforceSet && options.baBehav[ADDSET_SHARP_RADIUS] ? toEdit.prsharpening.radius + mods.prsharpening.radius : mods.prsharpening.radius; toEdit.prsharpening.radius = dontforceSet && options.baBehav[ADDSET_SHARP_RADIUS] ? toEdit.prsharpening.radius + mods.prsharpening.radius : mods.prsharpening.radius;
} }