]> granicus.if.org Git - imagemagick/commitdiff
(no commit message)
authorcristy <urban-warrior@git.imagemagick.org>
Thu, 12 Feb 2015 23:08:58 +0000 (23:08 +0000)
committercristy <urban-warrior@git.imagemagick.org>
Thu, 12 Feb 2015 23:08:58 +0000 (23:08 +0000)
MagickCore/fx.c
MagickCore/statistic.c
MagickCore/threshold.c

index 51a16bf26e1f339e8263b9e0cc7ba186e1112ee7..aeefbffc588e5265a80cd6ab27273f65336906a9 100644 (file)
@@ -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
index 6d2a45ca35750307204893d04d810a6ba593bf8c..4b7e0787bae5b343778b6944f80f3f2d5688cc1f 100644 (file)
@@ -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
index ed27bf3fd748ca6535eee8dad7f85846708b0566..c01fee7b4a9922af2aeb960242eecb5d67f228e8 100644 (file)
@@ -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