From ecd6dd161dfefd2b14a11c3d907bdeb648f5e201 Mon Sep 17 00:00:00 2001 From: cristy Date: Thu, 12 Feb 2015 23:08:58 +0000 Subject: [PATCH] --- MagickCore/fx.c | 4 +--- MagickCore/statistic.c | 9 +++------ MagickCore/threshold.c | 4 +--- 3 files changed, 5 insertions(+), 12 deletions(-) diff --git a/MagickCore/fx.c b/MagickCore/fx.c index 51a16bf26..aeefbffc5 100644 --- a/MagickCore/fx.c +++ b/MagickCore/fx.c @@ -4441,11 +4441,9 @@ MagickExport Image *SketchImage(const Image *image,const double radius, return((Image *) NULL); status=MagickTrue; random_info=AcquireRandomInfoThreadSet(); -#if defined(MAGICKCORE_OPENMP_SUPPORT) - key=GetRandomSecretKey(random_info[0]); -#endif random_view=AcquireAuthenticCacheView(random_image,exception); #if defined(MAGICKCORE_OPENMP_SUPPORT) + key=GetRandomSecretKey(random_info[0]); #pragma omp parallel for schedule(static,4) shared(status) \ magick_threads(random_image,random_image,random_image->rows,key == ~0UL) #endif diff --git a/MagickCore/statistic.c b/MagickCore/statistic.c index 6d2a45ca3..4b7e0787b 100644 --- a/MagickCore/statistic.c +++ b/MagickCore/statistic.c @@ -482,13 +482,11 @@ MagickExport Image *EvaluateImages(const Image *images, status=MagickTrue; progress=0; random_info=AcquireRandomInfoThreadSet(); -#if defined(MAGICKCORE_OPENMP_SUPPORT) - key=GetRandomSecretKey(random_info[0]); -#endif evaluate_view=AcquireAuthenticCacheView(image,exception); if (op == MedianEvaluateOperator) { #if defined(MAGICKCORE_OPENMP_SUPPORT) + key=GetRandomSecretKey(random_info[0]); #pragma omp parallel for schedule(static,4) shared(progress,status) \ magick_threads(image,images,image->rows,key == ~0UL) #endif @@ -590,6 +588,7 @@ MagickExport Image *EvaluateImages(const Image *images, else { #if defined(MAGICKCORE_OPENMP_SUPPORT) + key=GetRandomSecretKey(random_info[0]); #pragma omp parallel for schedule(static,4) shared(progress,status) \ magick_threads(image,images,image->rows,key == ~0UL) #endif @@ -789,11 +788,9 @@ MagickExport MagickBooleanType EvaluateImage(Image *image, status=MagickTrue; progress=0; random_info=AcquireRandomInfoThreadSet(); -#if defined(MAGICKCORE_OPENMP_SUPPORT) - key=GetRandomSecretKey(random_info[0]); -#endif image_view=AcquireAuthenticCacheView(image,exception); #if defined(MAGICKCORE_OPENMP_SUPPORT) + key=GetRandomSecretKey(random_info[0]); #pragma omp parallel for schedule(static,4) shared(progress,status) \ magick_threads(image,image,image->rows,key == ~0UL) #endif diff --git a/MagickCore/threshold.c b/MagickCore/threshold.c index ed27bf3fd..c01fee7b4 100644 --- a/MagickCore/threshold.c +++ b/MagickCore/threshold.c @@ -1684,11 +1684,9 @@ MagickExport MagickBooleanType RandomThresholdImage(Image *image, status=MagickTrue; progress=0; random_info=AcquireRandomInfoThreadSet(); -#if defined(MAGICKCORE_OPENMP_SUPPORT) - key=GetRandomSecretKey(random_info[0]); -#endif image_view=AcquireAuthenticCacheView(image,exception); #if defined(MAGICKCORE_OPENMP_SUPPORT) + key=GetRandomSecretKey(random_info[0]); #pragma omp parallel for schedule(static,4) shared(progress,status) \ magick_threads(image,image,image->rows,key == ~0UL) #endif -- 2.40.0