From: cristy <urban-warrior@git.imagemagick.org>
Date: Mon, 17 Dec 2012 17:30:47 +0000 (+0000)
Subject: (no commit message)
X-Git-Tag: 7.0.1-0~4571
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b3cc404a343971959d21610b7a0666890ce799e9;p=imagemagick

---

diff --git a/MagickCore/colormap.c b/MagickCore/colormap.c
index 3a6bede52..a93c5d3cc 100644
--- a/MagickCore/colormap.c
+++ b/MagickCore/colormap.c
@@ -206,7 +206,7 @@ MagickExport MagickBooleanType CycleColormapImage(Image *image,
   status=MagickTrue;
   image_view=AcquireAuthenticCacheView(image,exception);
 #if defined(MAGICKCORE_OPENMP_SUPPORT)
-  #pragma omp parallel for schedule(static,8192) shared(status) \
+  #pragma omp parallel for schedule(static,2048) shared(status) \
     dynamic_number_threads(image,image,image->rows,1)
 #endif
   for (y=0; y < (ssize_t) image->rows; y++)
diff --git a/MagickCore/composite.c b/MagickCore/composite.c
index b7fc94dfa..0f127deb5 100644
--- a/MagickCore/composite.c
+++ b/MagickCore/composite.c
@@ -2455,7 +2455,7 @@ MagickExport MagickBooleanType TextureImage(Image *image,const Image *texture,
   texture_view=AcquireVirtualCacheView(texture_image,exception);
   image_view=AcquireAuthenticCacheView(image,exception);
 #if defined(MAGICKCORE_OPENMP_SUPPORT)
-  #pragma omp parallel for schedule(static,8192) shared(status) \
+  #pragma omp parallel for schedule(static,2048) shared(status) \
     dynamic_number_threads(texture_image,image,image->rows,1)
 #endif
   for (y=0; y < (ssize_t) image->rows; y++)
diff --git a/MagickCore/decorate.c b/MagickCore/decorate.c
index a6907f852..a63282493 100644
--- a/MagickCore/decorate.c
+++ b/MagickCore/decorate.c
@@ -384,7 +384,7 @@ MagickExport Image *FrameImage(const Image *image,const FrameInfo *frame_info,
     Draw sides of ornamental border.
   */
 #if defined(MAGICKCORE_OPENMP_SUPPORT)
-  #pragma omp parallel for schedule(static,8192) shared(progress,status) \
+  #pragma omp parallel for schedule(static,2048) shared(progress,status) \
     dynamic_number_threads(image,image,image->rows,1)
 #endif
   for (y=0; y < (ssize_t) image->rows; y++)
@@ -691,7 +691,7 @@ MagickExport MagickBooleanType RaiseImage(Image *image,
   progress=0;
   image_view=AcquireAuthenticCacheView(image,exception);
 #if defined(MAGICKCORE_OPENMP_SUPPORT)
-  #pragma omp parallel for schedule(static,8192) shared(progress,status) \
+  #pragma omp parallel for schedule(static,2048) shared(progress,status) \
     dynamic_number_threads(image,image,raise_info->height,1)
 #endif
   for (y=0; y < (ssize_t) raise_info->height; y++)
@@ -799,7 +799,7 @@ MagickExport MagickBooleanType RaiseImage(Image *image,
       }
   }
 #if defined(MAGICKCORE_OPENMP_SUPPORT)
-  #pragma omp parallel for schedule(static,8192) shared(progress,status) \
+  #pragma omp parallel for schedule(static,2048) shared(progress,status) \
     dynamic_number_threads(image,image,image->rows-2*raise_info->height,1)
 #endif
   for (y=(ssize_t) raise_info->height; y < (ssize_t) (image->rows-raise_info->height); y++)
@@ -885,7 +885,7 @@ MagickExport MagickBooleanType RaiseImage(Image *image,
       }
   }
 #if defined(MAGICKCORE_OPENMP_SUPPORT)
-  #pragma omp parallel for schedule(static,8192) shared(progress,status) \
+  #pragma omp parallel for schedule(static,2048) shared(progress,status) \
     dynamic_number_threads(image,image,raise_info->height,1)
 #endif
   for (y=(ssize_t) (image->rows-raise_info->height); y < (ssize_t) image->rows; y++)
diff --git a/MagickCore/resize.c b/MagickCore/resize.c
index ce8c3ca9b..844954343 100644
--- a/MagickCore/resize.c
+++ b/MagickCore/resize.c
@@ -2799,10 +2799,6 @@ MagickExport Image *SampleImage(const Image *image,const size_t columns,
   progress=0;
   image_view=AcquireVirtualCacheView(image,exception);
   sample_view=AcquireAuthenticCacheView(sample_image,exception);
-#if defined(MAGICKCORE_OPENMP_SUPPORT)
-  #pragma omp parallel for schedule(static,8192) shared(progress,status) \
-    dynamic_number_threads(image,sample_image,sample_image->rows,1)
-#endif
   for (y=0; y < (ssize_t) sample_image->rows; y++)
   {
     register const Quantum
@@ -2870,9 +2866,6 @@ MagickExport Image *SampleImage(const Image *image,const size_t columns,
         MagickBooleanType
           proceed;
 
-#if defined(MAGICKCORE_OPENMP_SUPPORT)
-        #pragma omp critical (MagickCore_SampleImage)
-#endif
         proceed=SetImageProgress(image,SampleImageTag,progress++,image->rows);
         if( IfMagickFalse(proceed) )
           status=MagickFalse;
diff --git a/MagickCore/shear.c b/MagickCore/shear.c
index 928e914b4..8bd0281c2 100644
--- a/MagickCore/shear.c
+++ b/MagickCore/shear.c
@@ -1152,7 +1152,7 @@ MagickExport Image *IntegralRotateImage(const Image *image,size_t rotations,
         Rotate 180 degrees.
       */
 #if defined(MAGICKCORE_OPENMP_SUPPORT)
-      #pragma omp parallel for schedule(static,8192) shared(progress,status) \
+      #pragma omp parallel for schedule(static,2048) shared(progress,status) \
         dynamic_number_threads(image,image,image->rows,1)
 #endif
       for (y=0; y < (ssize_t) image->rows; y++)
@@ -1250,7 +1250,7 @@ MagickExport Image *IntegralRotateImage(const Image *image,size_t rotations,
       GetPixelCacheTileSize(image,&tile_width,&tile_height);
       tile_width=image->columns;
 #if defined(MAGICKCORE_OPENMP_SUPPORT)
-      #pragma omp parallel for schedule(static,8192) shared(progress,status) \
+      #pragma omp parallel for schedule(static,2048) shared(progress,status) \
         dynamic_number_threads(image,image,image->rows/tile_height,1)
 #endif
       for (tile_y=0; tile_y < (ssize_t) image->rows; tile_y+=(ssize_t) tile_height)
diff --git a/MagickCore/transform.c b/MagickCore/transform.c
index f55976c7c..2fa5958ea 100644
--- a/MagickCore/transform.c
+++ b/MagickCore/transform.c
@@ -160,7 +160,7 @@ MagickExport Image *ChopImage(const Image *image,const RectangleInfo *chop_info,
   image_view=AcquireVirtualCacheView(image,exception);
   chop_view=AcquireAuthenticCacheView(chop_image,exception);
 #if defined(MAGICKCORE_OPENMP_SUPPORT)
-  #pragma omp parallel for schedule(static,8192) shared(progress,status) \
+  #pragma omp parallel for schedule(static,2048) shared(progress,status) \
     dynamic_number_threads(image,chop_image,extent.y,1)
 #endif
   for (y=0; y < (ssize_t) extent.y; y++)
@@ -231,7 +231,7 @@ MagickExport Image *ChopImage(const Image *image,const RectangleInfo *chop_info,
     Extract chop image.
   */
 #if defined(MAGICKCORE_OPENMP_SUPPORT)
-  #pragma omp parallel for schedule(static,8192) shared(progress,status) \
+  #pragma omp parallel for schedule(static,2048) shared(progress,status) \
     dynamic_number_threads(image,image,image->rows-(extent.y+extent.height),1)
 #endif
   for (y=0; y < (ssize_t) (image->rows-(extent.y+extent.height)); y++)
@@ -589,7 +589,7 @@ MagickExport Image *CropImage(const Image *image,const RectangleInfo *geometry,
   image_view=AcquireVirtualCacheView(image,exception);
   crop_view=AcquireAuthenticCacheView(crop_image,exception);
 #if defined(MAGICKCORE_OPENMP_SUPPORT)
-  #pragma omp parallel for schedule(static,8192) shared(progress,status) \
+  #pragma omp parallel for schedule(static,2048) shared(progress,status) \
     dynamic_number_threads(image,crop_image,crop_image->rows,1)
 #endif
   for (y=0; y < (ssize_t) crop_image->rows; y++)
@@ -1159,7 +1159,7 @@ MagickExport Image *FlipImage(const Image *image,ExceptionInfo *exception)
   image_view=AcquireVirtualCacheView(image,exception);
   flip_view=AcquireAuthenticCacheView(flip_image,exception);
 #if defined(MAGICKCORE_OPENMP_SUPPORT)
-  #pragma omp parallel for schedule(static,8192) shared(progress,status) \
+  #pragma omp parallel for schedule(static,2048) shared(progress,status) \
     dynamic_number_threads(image,flip_image,flip_image->rows,1)
 #endif
   for (y=0; y < (ssize_t) flip_image->rows; y++)
@@ -1306,7 +1306,7 @@ MagickExport Image *FlopImage(const Image *image,ExceptionInfo *exception)
   image_view=AcquireVirtualCacheView(image,exception);
   flop_view=AcquireAuthenticCacheView(flop_image,exception);
 #if defined(MAGICKCORE_OPENMP_SUPPORT)
-  #pragma omp parallel for schedule(static,8192) shared(progress,status) \
+  #pragma omp parallel for schedule(static,2048) shared(progress,status) \
     dynamic_number_threads(image,flop_image,flop_image->rows,1)
 #endif
   for (y=0; y < (ssize_t) flop_image->rows; y++)