From c84aebb427cc78cdf4911ccefef640bb6b98f587 Mon Sep 17 00:00:00 2001 From: heckflosse Date: Wed, 20 Dec 2017 22:19:36 +0100 Subject: [PATCH] localcontrast: removed timing code, don't multithread when multiThread is set to false --- rtengine/iplocalcontrast.cc | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/rtengine/iplocalcontrast.cc b/rtengine/iplocalcontrast.cc index 0445746a4..24739fb6b 100644 --- a/rtengine/iplocalcontrast.cc +++ b/rtengine/iplocalcontrast.cc @@ -27,18 +27,13 @@ #endif #include "improcfun.h" -#include "settings.h" #include "gauss.h" -#include "boxblur.h" #include "array2D.h" -#define BENCHMARK -#include "StopWatch.h" namespace rtengine { void ImProcFunctions::localContrast(LabImage *lab) { - BENCHFUN if (!params->localContrast.enabled) { return; } @@ -52,12 +47,12 @@ void ImProcFunctions::localContrast(LabImage *lab) const float sigma = params->localContrast.radius / scale; #ifdef _OPENMP - #pragma omp parallel + #pragma omp parallel if(multiThread) #endif gaussianBlur(lab->L, buf, width, height, sigma); #ifdef _OPENMP - #pragma omp parallel for + #pragma omp parallel for if(multiThread) #endif for (int y = 0; y < height; ++y) { for (int x = 0; x < width; ++x) {