From 58e332475fcf131842a91816a340ee46cfcb148a Mon Sep 17 00:00:00 2001 From: heckflosse Date: Mon, 17 Dec 2018 13:07:46 +0100 Subject: [PATCH] Don't allocate blurbuffer when blur is disabled, #5075 --- rtengine/ipsharpen.cc | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/rtengine/ipsharpen.cc b/rtengine/ipsharpen.cc index d722ddfdf..1d699bb87 100644 --- a/rtengine/ipsharpen.cc +++ b/rtengine/ipsharpen.cc @@ -178,9 +178,11 @@ BENCHFUN JaggedArray blend(W, H); float contrast = sharpenParam.contrast / 100.f; buildBlendMask(luminance, blend, W, H, contrast, sharpenParam.deconvamount / 100.f); - JaggedArray blur(W, H); + JaggedArray* blurbuffer = nullptr; if (sharpenParam.blurradius >= 0.25f) { + blurbuffer = new JaggedArray(W, H); + JaggedArray &blur = *blurbuffer; #ifdef _OPENMP #pragma omp parallel #endif @@ -227,6 +229,7 @@ BENCHFUN } if (sharpenParam.blurradius >= 0.25f) { + JaggedArray &blur = *blurbuffer; #ifdef _OPENMP #pragma omp for #endif @@ -237,6 +240,7 @@ BENCHFUN } } } // end parallel + delete blurbuffer; } void ImProcFunctions::sharpening (LabImage* lab, const SharpeningParams &sharpenParam, bool showMask)