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

Don't allocate blurbuffer when blur is disabled, #5075

Browse Source
This commit is contained in:
heckflosse
2018-12-17 13:07:46 +01:00
parent 4a46da1b34
commit 58e332475f
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
rtengine/ipsharpen.cc
View File

@@ -178,9 +178,11 @@ BENCHFUN
JaggedArray<float> blend(W, H); JaggedArray<float> blend(W, H);
float contrast = sharpenParam.contrast / 100.f; float contrast = sharpenParam.contrast / 100.f;
buildBlendMask(luminance, blend, W, H, contrast, sharpenParam.deconvamount / 100.f); buildBlendMask(luminance, blend, W, H, contrast, sharpenParam.deconvamount / 100.f);
JaggedArray<float> blur(W, H); JaggedArray<float>* blurbuffer = nullptr;
if (sharpenParam.blurradius >= 0.25f) { if (sharpenParam.blurradius >= 0.25f) {
blurbuffer = new JaggedArray<float>(W, H);
JaggedArray<float> &blur = *blurbuffer;
#ifdef _OPENMP #ifdef _OPENMP
#pragma omp parallel #pragma omp parallel
#endif #endif
@@ -227,6 +229,7 @@ BENCHFUN
} }
if (sharpenParam.blurradius >= 0.25f) { if (sharpenParam.blurradius >= 0.25f) {
JaggedArray<float> &blur = *blurbuffer;
#ifdef _OPENMP #ifdef _OPENMP
#pragma omp for #pragma omp for
#endif #endif
@@ -237,6 +240,7 @@ BENCHFUN
} }
} }
} // end parallel } // end parallel
delete blurbuffer;
} }
void ImProcFunctions::sharpening (LabImage* lab, const SharpeningParams &sharpenParam, bool showMask) void ImProcFunctions::sharpening (LabImage* lab, const SharpeningParams &sharpenParam, bool showMask)