From 306e0478d742f1e826b37e0027b5fe69aebbeb88 Mon Sep 17 00:00:00 2001 From: heckflosse Date: Wed, 13 Jun 2018 14:28:31 +0200 Subject: [PATCH] deconvolution amount was ignored if contrast threshold == 0, fixed --- rtengine/ipsharpen.cc | 2 +- rtengine/rt_algo.cc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/rtengine/ipsharpen.cc b/rtengine/ipsharpen.cc index 89f497c8e..eaf0db732 100644 --- a/rtengine/ipsharpen.cc +++ b/rtengine/ipsharpen.cc @@ -222,7 +222,7 @@ void ImProcFunctions::sharpening (LabImage* lab, const SharpeningParams &sharpen if(showMask) { // calculate contrast based blend factors to reduce sharpening in regions with low contrast JaggedArray blend(W, H); - buildBlendMask(lab->L, blend, W, H, sharpenParam.contrast / 100.f); + buildBlendMask(lab->L, blend, W, H, sharpenParam.contrast / 100.f, sharpenParam.method == "rld" ? sharpenParam.deconvamount / 100.0 : 1.f); #ifdef _OPENMP #pragma omp parallel for #endif diff --git a/rtengine/rt_algo.cc b/rtengine/rt_algo.cc index 21c8eac12..cff145de8 100644 --- a/rtengine/rt_algo.cc +++ b/rtengine/rt_algo.cc @@ -193,7 +193,7 @@ void buildBlendMask(float** luminance, rtengine::JaggedArray &blend, int if(contrastThreshold == 0.f) { for(int j = 0; j < H; ++j) { for(int i = 0; i < W; ++i) { - blend[j][i] = 1.f; + blend[j][i] = amount; } } } else {