From: Cristy Date: Tue, 13 Dec 2016 11:21:36 +0000 (-0500) Subject: ... X-Git-Tag: 7.0.4-0~6 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=735cb1600ce096984b338076b2fa2384cbed30eb;p=imagemagick ... --- diff --git a/MagickCore/compare.c b/MagickCore/compare.c index 37f760b86..0e844825f 100644 --- a/MagickCore/compare.c +++ b/MagickCore/compare.c @@ -500,7 +500,7 @@ static MagickBooleanType GetFuzzDistortion(const Image *image, reconstruct_view=AcquireVirtualCacheView(reconstruct_image,exception); #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,4) shared(status) \ - magick_threads(image,image,rows,1) + magick_threads(image,image,rows,1) reduction(+:area) #endif for (y=0; y < (ssize_t) rows; y++) { @@ -560,9 +560,6 @@ static MagickBooleanType GetFuzzDistortion(const Image *image, channel_distortion[i]+=distance*distance; channel_distortion[CompositePixelChannel]+=distance*distance; } -#if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp critical (MagickCore_GetFuzzDistortion) -#endif area++; p+=GetPixelChannels(image); q+=GetPixelChannels(reconstruct_image); @@ -614,7 +611,7 @@ static MagickBooleanType GetMeanAbsoluteDistortion(const Image *image, reconstruct_view=AcquireVirtualCacheView(reconstruct_image,exception); #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,4) shared(status) \ - magick_threads(image,image,rows,1) + magick_threads(image,image,rows,1) reduction(+:area) #endif for (y=0; y < (ssize_t) rows; y++) { @@ -674,9 +671,6 @@ static MagickBooleanType GetMeanAbsoluteDistortion(const Image *image, channel_distortion[i]+=distance; channel_distortion[CompositePixelChannel]+=distance; } -#if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp critical (MagickCore_GetFuzzDistortion) -#endif area++; p+=GetPixelChannels(image); q+=GetPixelChannels(reconstruct_image); @@ -824,7 +818,7 @@ static MagickBooleanType GetMeanSquaredDistortion(const Image *image, reconstruct_view=AcquireVirtualCacheView(reconstruct_image,exception); #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,4) shared(status) \ - magick_threads(image,image,rows,1) + magick_threads(image,image,rows,1) reduction(+:area) #endif for (y=0; y < (ssize_t) rows; y++) { @@ -884,9 +878,6 @@ static MagickBooleanType GetMeanSquaredDistortion(const Image *image, channel_distortion[i]+=distance*distance; channel_distortion[CompositePixelChannel]+=distance*distance; } -#if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp critical (MagickCore_GetFuzzDistortion) -#endif area++; p+=GetPixelChannels(image); q+=GetPixelChannels(reconstruct_image);