...

diff --git a/MagickCore/colormap.c b/MagickCore/colormap.c
index 6a38f8d6f4f32dc620d8b384232d64c5a53d86a5..d55012ba064bf4328bd8a39c5b9f3d649270da46 100644 (file)
--- a/MagickCore/colormap.c
+++ b/MagickCore/colormap.c
@@ -321,10 +321,6 @@ MagickExport MagickBooleanType SortColormapByIntensity(Image *image,
   /*
     Assign index values to colormap entries.
   */
-#if defined(MAGICKCORE_OPENMP_SUPPORT)
-  #pragma omp parallel for schedule(static,4) shared(status) \
-    magick_number_threads(image,image,image->rows,1)
-#endif
   for (i=0; i < (ssize_t) image->colors; i++)
     image->colormap[i].alpha=(double) i;
   /*
@@ -335,9 +331,6 @@ MagickExport MagickBooleanType SortColormapByIntensity(Image *image,
   /*
     Update image colormap indexes to sorted colormap order.
   */
-#if defined(MAGICKCORE_OPENMP_SUPPORT)
-  #pragma omp parallel for schedule(static,4) shared(status)
-#endif
   for (i=0; i < (ssize_t) image->colors; i++)
     pixels[(ssize_t) image->colormap[i].alpha]=(unsigned short) i;
   status=MagickTrue;

diff --git a/MagickCore/colorspace.c b/MagickCore/colorspace.c
index 6b52497882913e6bb90812f487c6c0674595a479..0f73f9b139d1224f889bec760a03cd3d61f1fdd4 100644 (file)
--- a/MagickCore/colorspace.c
+++ b/MagickCore/colorspace.c
@@ -622,8 +622,7 @@ static MagickBooleanType sRGBTransformImage(Image *image,
       black=pow(10.0,(reference_black-reference_white)*(gamma/density)*0.002/
         film_gamma);
 #if defined(MAGICKCORE_OPENMP_SUPPORT)
-      #pragma omp parallel for schedule(static,4) \
-        magick_number_threads(image,image,image->rows,1)
+      #pragma omp parallel for schedule(static,4)
 #endif
       for (i=0; i <= (ssize_t) MaxMap; i++)
         logmap[i]=ScaleMapToQuantum((double) (MaxMap*(reference_white+
@@ -788,8 +787,7 @@ static MagickBooleanType sRGBTransformImage(Image *image,
       primary_info.y=(double) (MaxMap+1.0)/2.0;
       primary_info.z=(double) (MaxMap+1.0)/2.0;
 #if defined(MAGICKCORE_OPENMP_SUPPORT)
-      #pragma omp parallel for schedule(static,4) \
-        magick_number_threads(image,image,image->rows,1)
+      #pragma omp parallel for schedule(static,4)
 #endif
       for (i=0; i <= (ssize_t) MaxMap; i++)
       {
@@ -820,8 +818,7 @@ static MagickBooleanType sRGBTransformImage(Image *image,
       primary_info.y=(double) (MaxMap+1.0)/2.0;
       primary_info.z=(double) (MaxMap+1.0)/2.0;
 #if defined(MAGICKCORE_OPENMP_SUPPORT)
-      #pragma omp parallel for schedule(static,4) \
-        magick_number_threads(image,image,image->rows,1)
+      #pragma omp parallel for schedule(static,4)
 #endif
       for (i=0; i <= (ssize_t) MaxMap; i++)
       {
@@ -852,8 +849,7 @@ static MagickBooleanType sRGBTransformImage(Image *image,
       primary_info.y=(double) (MaxMap+1.0)/2.0;
       primary_info.z=(double) (MaxMap+1.0)/2.0;
 #if defined(MAGICKCORE_OPENMP_SUPPORT)
-      #pragma omp parallel for schedule(static,4) \
-        magick_number_threads(image,image,image->rows,1)
+      #pragma omp parallel for schedule(static,4)
 #endif
       for (i=0; i <= (ssize_t) MaxMap; i++)
       {
@@ -914,8 +910,7 @@ static MagickBooleanType sRGBTransformImage(Image *image,
         Linear conversion tables.
       */
 #if defined(MAGICKCORE_OPENMP_SUPPORT)
-      #pragma omp parallel for schedule(static,4) \
-        magick_number_threads(image,image,image->rows,1)
+      #pragma omp parallel for schedule(static,4)
 #endif
       for (i=0; i <= (ssize_t) MaxMap; i++)
       {
@@ -2271,8 +2266,7 @@ static MagickBooleanType TransformsRGBImage(Image *image,
         through QuantumRange.
       */
 #if defined(MAGICKCORE_OPENMP_SUPPORT)
-      #pragma omp parallel for schedule(static,4) \
-        magick_number_threads(image,image,image->rows,1)
+      #pragma omp parallel for schedule(static,4)
 #endif
       for (i=0; i <= (ssize_t) MaxMap; i++)
       {

diff --git a/MagickCore/compare.c b/MagickCore/compare.c
index 831abce02cc905c1a8a3acb7bbb2ee8cde22c4cf..3b9147762ee07ef7d36575ceaa6778ca775f6e69 100644 (file)
--- a/MagickCore/compare.c
+++ b/MagickCore/compare.c
@@ -2222,7 +2222,7 @@ MagickExport Image *SimilarityImage(const Image *image,const Image *reference,
 #if defined(MAGICKCORE_OPENMP_SUPPORT)
   #pragma omp parallel for schedule(static,4) \
     shared(progress,status,similarity_metric) \
-    magick_number_threads(image,image,image->rows,1)
+    magick_number_threads(image,image,image->rows-reference->rows+1,1)
 #endif
   for (y=0; y < (ssize_t) (image->rows-reference->rows+1); y++)
   {

diff --git a/MagickCore/decorate.c b/MagickCore/decorate.c
index 32c27754f969c0d82054f7d9c0d40406871edbab..7a2253909210673faf3415e2b5c3778d7a7682f1 100644 (file)
--- a/MagickCore/decorate.c
+++ b/MagickCore/decorate.c
@@ -658,7 +658,7 @@ MagickExport MagickBooleanType RaiseImage(Image *image,
   image_view=AcquireAuthenticCacheView(image,exception);
 #if defined(MAGICKCORE_OPENMP_SUPPORT)
   #pragma omp parallel for schedule(static,4) shared(progress,status) \
-    magick_number_threads(image,image,image->rows,1)
+    magick_number_threads(image,image,raise_info->height,1)
 #endif
   for (y=0; y < (ssize_t) raise_info->height; y++)
   {
@@ -748,7 +748,7 @@ MagickExport MagickBooleanType RaiseImage(Image *image,
   }
 #if defined(MAGICKCORE_OPENMP_SUPPORT)
   #pragma omp parallel for schedule(static,4) shared(progress,status) \
-    magick_number_threads(image,image,image->rows,1)
+    magick_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++)
   {
@@ -822,7 +822,7 @@ MagickExport MagickBooleanType RaiseImage(Image *image,
   }
 #if defined(MAGICKCORE_OPENMP_SUPPORT)
   #pragma omp parallel for schedule(static,4) shared(progress,status) \
-    magick_number_threads(image,image,image->rows,1)
+    magick_number_threads(image,image,image->rows-raise_info->height,1)
 #endif
   for (y=(ssize_t) (image->rows-raise_info->height); y < (ssize_t) image->rows; y++)
   {

diff --git a/MagickCore/draw.c b/MagickCore/draw.c
index 6e4a9af29e618b9a9eaa46ba0c5f7823d189d31a..a3a93a756b688d14c606c94a1c17320c987417d6 100644 (file)
--- a/MagickCore/draw.c
+++ b/MagickCore/draw.c
@@ -3426,7 +3426,7 @@ MagickExport MagickBooleanType DrawGradientImage(Image *image,
   image_view=AcquireAuthenticCacheView(image,exception);
 #if defined(MAGICKCORE_OPENMP_SUPPORT)
   #pragma omp parallel for schedule(static,4) shared(status) \
-    magick_number_threads(image,image,image->rows,1)
+    magick_number_threads(image,image,bounding_box.height-bounding_box.y,1)
 #endif
   for (y=bounding_box.y; y < (ssize_t) bounding_box.height; y++)
   {
@@ -4042,7 +4042,7 @@ RestoreMSCWarning
       stop_y=(ssize_t) floor(bounds.y2+0.5);
 #if defined(MAGICKCORE_OPENMP_SUPPORT)
       #pragma omp parallel for schedule(static,4) shared(status) \
-        magick_number_threads(image,image,image->rows,1)
+        magick_number_threads(image,image,stop_y-start_y+1,1)
 #endif
       for (y=start_y; y <= stop_y; y++)
       {
@@ -4105,7 +4105,7 @@ RestoreMSCWarning
   stop_y=(ssize_t) floor(bounds.y2+0.5);
 #if defined(MAGICKCORE_OPENMP_SUPPORT)
   #pragma omp parallel for schedule(static,4) shared(status) \
-    magick_number_threads(image,image,image->rows,1)
+    magick_number_threads(image,image,stop_y-start_y+1,1)
 #endif
   for (y=start_y; y <= stop_y; y++)
   {

diff --git a/MagickCore/effect.c b/MagickCore/effect.c
index ffd18458f0ff11419e39a794afe726d143e1980d..aae4fceb20e76c7b757176a36b1cfc23248cac93 100644 (file)
--- a/MagickCore/effect.c
+++ b/MagickCore/effect.c
@@ -898,7 +898,7 @@ static void Hull(const Image *image,const ssize_t x_offset,
   r=p+(y_offset*(columns+2)+x_offset);
 #if defined(MAGICKCORE_OPENMP_SUPPORT)
   #pragma omp parallel for schedule(static,4) \
-    magick_number_threads(image,image,image->rows,1)
+    magick_number_threads(image,image,rows,1)
 #endif
   for (y=0; y < (ssize_t) rows; y++)
   {
@@ -935,7 +935,7 @@ static void Hull(const Image *image,const ssize_t x_offset,
   s=q-(y_offset*(columns+2)+x_offset);
 #if defined(MAGICKCORE_OPENMP_SUPPORT)
   #pragma omp parallel for schedule(static,4) \
-    magick_number_threads(image,image,image->rows,1)
+    magick_number_threads(image,image,rows,1)
 #endif
   for (y=0; y < (ssize_t) rows; y++)
   {
@@ -1497,7 +1497,7 @@ MagickExport Image *KuwaharaImage(const Image *image,const double radius,
   kuwahara_view=AcquireAuthenticCacheView(kuwahara_image,exception);
 #if defined(MAGICKCORE_OPENMP_SUPPORT)
   #pragma omp parallel for schedule(static,4) shared(progress,status) \
-    magick_number_threads(image,kuwahara_image,image->rows,1)
+    magick_number_threads(image,kuwahara_image,gaussian_image->rows,1)
 #endif
   for (y=0; y < (ssize_t) gaussian_image->rows; y++)
   {

diff --git a/MagickCore/image.c b/MagickCore/image.c
index 28a7cea27658eb4d94def4c01f6307d49f4dc829..3e650d6f48be0db45e9bf31a4e1ed352c4051e98 100644 (file)
--- a/MagickCore/image.c
+++ b/MagickCore/image.c
@@ -3106,7 +3106,7 @@ MagickExport MagickBooleanType SetImageMask(Image *image,const PixelMask type,
   image_view=AcquireAuthenticCacheView(image,exception);
 #if defined(MAGICKCORE_OPENMP_SUPPORT)
   #pragma omp parallel for schedule(static,4) shared(status) \
-    magick_number_threads(mask,image,1,1)
+    magick_number_threads(mask,image,image->rows,1)
 #endif
   for (y=0; y < (ssize_t) image->rows; y++)
   {

diff --git a/MagickCore/quantize.c b/MagickCore/quantize.c
index 98b4601406bea941fcbe70e62063f018ab75c4a1..53259efca6210101f95e39d98404becd0fbf4269 100644 (file)
--- a/MagickCore/quantize.c
+++ b/MagickCore/quantize.c
@@ -2373,7 +2373,7 @@ MagickExport MagickBooleanType PosterizeImage(Image *image,const size_t levels,
   if (image->storage_class == PseudoClass)
 #if defined(MAGICKCORE_OPENMP_SUPPORT)
     #pragma omp parallel for schedule(static,4) shared(progress,status) \
-      magick_number_threads(image,image,image->rows,1)
+      magick_number_threads(image,image,image->colors,1)
 #endif
     for (i=0; i < (ssize_t) image->colors; i++)
     {

diff --git a/MagickCore/shear.c b/MagickCore/shear.c
index fdb4c273e944a598ebeb2c8c5d85a0545c41a94a..845f2169e43bd29035592c68bd9f565a718330d6 100644 (file)
--- a/MagickCore/shear.c
+++ b/MagickCore/shear.c
@@ -291,7 +291,7 @@ static void RadonProjection(const Image *image,MatrixInfo *source_matrixs,
   }
 #if defined(MAGICKCORE_OPENMP_SUPPORT)
   #pragma omp parallel for schedule(static,4) \
-    magick_number_threads(image,image,image->rows,1)
+    magick_number_threads(image,image,GetMatrixColumns(p),1)
 #endif
   for (x=0; x < (ssize_t) GetMatrixColumns(p); x++)
   {
@@ -765,7 +765,7 @@ MagickExport Image *IntegralRotateImage(const Image *image,size_t rotations,
       tile_width=image->columns;
 #if defined(MAGICKCORE_OPENMP_SUPPORT)
       #pragma omp parallel for schedule(static,4) shared(status) \
-        magick_number_threads(image,image,image->rows,1)
+        magick_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)
       {
@@ -979,7 +979,7 @@ MagickExport Image *IntegralRotateImage(const Image *image,size_t rotations,
       tile_width=image->columns;
 #if defined(MAGICKCORE_OPENMP_SUPPORT)
       #pragma omp parallel for schedule(static,4) shared(status) \
-        magick_number_threads(image,image,image->rows,1)
+        magick_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)
       {