From: cristy <urban-warrior@git.imagemagick.org>
Date: Tue, 18 Dec 2012 01:57:11 +0000 (+0000)
Subject: (no commit message)
X-Git-Tag: 7.0.1-0~4567
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=4ca6a97c9a2f5940fc29f5c89df993b144c99944;p=imagemagick

---

diff --git a/MagickCore/colormap.c b/MagickCore/colormap.c
index a93c5d3cc..d47953b07 100644
--- a/MagickCore/colormap.c
+++ b/MagickCore/colormap.c
@@ -206,8 +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,2048) shared(status) \
-    dynamic_number_threads(image,image,image->rows,1)
+  #pragma omp parallel for schedule(static,image->rows/2) shared(status)
 #endif
   for (y=0; y < (ssize_t) image->rows; y++)
   {
diff --git a/MagickCore/composite.c b/MagickCore/composite.c
index 0f127deb5..a96121af0 100644
--- a/MagickCore/composite.c
+++ b/MagickCore/composite.c
@@ -2455,8 +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,2048) shared(status) \
-    dynamic_number_threads(texture_image,image,image->rows,1)
+  #pragma omp parallel for schedule(static,image->rows/2) shared(status)
 #endif
   for (y=0; y < (ssize_t) image->rows; y++)
   {
diff --git a/MagickCore/decorate.c b/MagickCore/decorate.c
index a63282493..98c0b8b86 100644
--- a/MagickCore/decorate.c
+++ b/MagickCore/decorate.c
@@ -384,8 +384,8 @@ 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,2048) shared(progress,status) \
-    dynamic_number_threads(image,image,image->rows,1)
+  #pragma omp parallel for schedule(static,image->rows/2) \
+    shared(progress,status)
 #endif
   for (y=0; y < (ssize_t) image->rows; y++)
   {
@@ -663,6 +663,11 @@ MagickExport MagickBooleanType RaiseImage(Image *image,
     foreground,
     background;
 
+#if defined(MAGICKCORE_OPENMP_SUPPORT)
+  size_t
+    height;
+#endif
+
   ssize_t
     y;
 
@@ -691,8 +696,8 @@ MagickExport MagickBooleanType RaiseImage(Image *image,
   progress=0;
   image_view=AcquireAuthenticCacheView(image,exception);
 #if defined(MAGICKCORE_OPENMP_SUPPORT)
-  #pragma omp parallel for schedule(static,2048) shared(progress,status) \
-    dynamic_number_threads(image,image,raise_info->height,1)
+  #pragma omp parallel for schedule(static,raise_info->height/2) \
+    shared(progress,status)
 #endif
   for (y=0; y < (ssize_t) raise_info->height; y++)
   {
@@ -799,8 +804,8 @@ MagickExport MagickBooleanType RaiseImage(Image *image,
       }
   }
 #if defined(MAGICKCORE_OPENMP_SUPPORT)
-  #pragma omp parallel for schedule(static,2048) shared(progress,status) \
-    dynamic_number_threads(image,image,image->rows-2*raise_info->height,1)
+  height=image->rows-2*raise_info->height;
+  #pragma omp parallel for schedule(static,height/2) shared(progress,status) 
 #endif
   for (y=(ssize_t) raise_info->height; y < (ssize_t) (image->rows-raise_info->height); y++)
   {
@@ -885,8 +890,8 @@ MagickExport MagickBooleanType RaiseImage(Image *image,
       }
   }
 #if defined(MAGICKCORE_OPENMP_SUPPORT)
-  #pragma omp parallel for schedule(static,2048) shared(progress,status) \
-    dynamic_number_threads(image,image,raise_info->height,1)
+  height=image->rows-2*raise_info->height;
+  #pragma omp parallel for schedule(static,height/2) shared(progress,status)
 #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 844954343..ff4ca5cac 100644
--- a/MagickCore/resize.c
+++ b/MagickCore/resize.c
@@ -2799,6 +2799,9 @@ 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,sample_image->rows/2) shared(status)
+#endif
   for (y=0; y < (ssize_t) sample_image->rows; y++)
   {
     register const Quantum
@@ -2866,6 +2869,9 @@ 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 bff54ffaf..a19d77521 100644
--- a/MagickCore/shear.c
+++ b/MagickCore/shear.c
@@ -1027,8 +1027,8 @@ 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,2048) shared(progress,status) \
-        dynamic_number_threads(image,image,image->rows/tile_height,1)
+      #pragma omp parallel for schedule(static,image->rows/tile_height/2) \
+        shared(progress,status)
 #endif
       for (tile_y=0; tile_y < (ssize_t) image->rows; tile_y+=(ssize_t) tile_height)
       {
@@ -1152,8 +1152,8 @@ MagickExport Image *IntegralRotateImage(const Image *image,size_t rotations,
         Rotate 180 degrees.
       */
 #if defined(MAGICKCORE_OPENMP_SUPPORT)
-      #pragma omp parallel for schedule(static,2048) shared(progress,status) \
-        dynamic_number_threads(image,image,image->rows,1)
+      #pragma omp parallel for schedule(static,image->rows/2) \
+        shared(progress,status)
 #endif
       for (y=0; y < (ssize_t) image->rows; y++)
       {
@@ -1250,8 +1250,8 @@ 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,2048) shared(progress,status) \
-        dynamic_number_threads(image,image,image->rows/tile_height,1)
+      #pragma omp parallel for schedule(static,image->rows/tile_height/2) \
+        shared(progress,status)
 #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 2fa5958ea..852319325 100644
--- a/MagickCore/transform.c
+++ b/MagickCore/transform.c
@@ -115,6 +115,11 @@ MagickExport Image *ChopImage(const Image *image,const RectangleInfo *chop_info,
   RectangleInfo
     extent;
 
+#if defined(MAGICKCORE_OPENMP_SUPPORT)
+  size_t
+    height;
+#endif
+
   ssize_t
     y;
 
@@ -160,8 +165,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,2048) shared(progress,status) \
-    dynamic_number_threads(image,chop_image,extent.y,1)
+  #pragma omp parallel for schedule(static,extent.y/2) shared(progress,status)
 #endif
   for (y=0; y < (ssize_t) extent.y; y++)
   {
@@ -231,8 +235,8 @@ MagickExport Image *ChopImage(const Image *image,const RectangleInfo *chop_info,
     Extract chop image.
   */
 #if defined(MAGICKCORE_OPENMP_SUPPORT)
-  #pragma omp parallel for schedule(static,2048) shared(progress,status) \
-    dynamic_number_threads(image,image,image->rows-(extent.y+extent.height),1)
+  height=image->rows-(extent.y+extent.height);
+  #pragma omp parallel for schedule(static,height/2) shared(progress,status)
 #endif
   for (y=0; y < (ssize_t) (image->rows-(extent.y+extent.height)); y++)
   {
@@ -589,8 +593,8 @@ 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,2048) shared(progress,status) \
-    dynamic_number_threads(image,crop_image,crop_image->rows,1)
+  #pragma omp parallel for schedule(static,crop_image->rows/2) \
+    shared(progress,status)
 #endif
   for (y=0; y < (ssize_t) crop_image->rows; y++)
   {
@@ -1159,8 +1163,8 @@ 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,2048) shared(progress,status) \
-    dynamic_number_threads(image,flip_image,flip_image->rows,1)
+  #pragma omp parallel for schedule(static,flip_image->rows/2) \
+    shared(progress,status)
 #endif
   for (y=0; y < (ssize_t) flip_image->rows; y++)
   {
@@ -1306,8 +1310,8 @@ 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,2048) shared(progress,status) \
-    dynamic_number_threads(image,flop_image,flop_image->rows,1)
+  #pragma omp parallel for schedule(static,flop_image->rows/2) \
+    shared(progress,status)
 #endif
   for (y=0; y < (ssize_t) flop_image->rows; y++)
   {