From 69af2a6b4c22dcdc87d1cf20ac4c8357d468993b Mon Sep 17 00:00:00 2001 From: heckflosse Date: Tue, 22 May 2018 14:31:35 +0200 Subject: [PATCH] Added missing paramsedited entries for pr-sharpening contrast threshold --- rtgui/paramsedited.cc | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/rtgui/paramsedited.cc b/rtgui/paramsedited.cc index 258410773..0eebe2e41 100644 --- a/rtgui/paramsedited.cc +++ b/rtgui/paramsedited.cc @@ -157,6 +157,7 @@ void ParamsEdited::set (bool v) sharpening.deconviter = v; sharpening.deconvdamping = v; prsharpening.enabled = v; + prsharpening.contrast = v; prsharpening.radius = v; prsharpening.amount = v; prsharpening.threshold = v; @@ -711,6 +712,7 @@ void ParamsEdited::initFrom (const std::vector sharpening.deconviter = sharpening.deconviter && p.sharpening.deconviter == other.sharpening.deconviter; sharpening.deconvdamping = sharpening.deconvdamping && p.sharpening.deconvdamping == other.sharpening.deconvdamping; 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.amount = prsharpening.amount && p.prsharpening.amount == other.prsharpening.amount; 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; } + if (prsharpening.contrast) { + toEdit.prsharpening.contrast = dontforceSet && options.baBehav[ADDSET_SHARP_CONTRAST] ? toEdit.prsharpening.contrast + mods.prsharpening.contrast : mods.prsharpening.contrast; + } + if (prsharpening.radius) { toEdit.prsharpening.radius = dontforceSet && options.baBehav[ADDSET_SHARP_RADIUS] ? toEdit.prsharpening.radius + mods.prsharpening.radius : mods.prsharpening.radius; }