(no commit message)

diff --git a/MagickCore/composite.c b/MagickCore/composite.c
index 43fde4f648ceb2cd082613f6df6a90560dd8c8c8..34f2d3b32bdca0d89e024f3d6c8c2326b3907509 100644 (file)
--- a/MagickCore/composite.c
+++ b/MagickCore/composite.c
@@ -2292,7 +2292,7 @@ MagickExport MagickBooleanType TextureImage(Image *image,
         Tile texture onto the image background.
       */
 #if defined(MAGICKCORE_OPENMP_SUPPORT)
-      #pragma omp parallel for schedule(static,4) shared(status) omp_throttle(1)
+      #pragma omp parallel for schedule(static,1) shared(status)
 #endif
       for (y=0; y < (ssize_t) image->rows; y+=(ssize_t) texture_image->rows)
       {
@@ -2340,7 +2340,7 @@ MagickExport MagickBooleanType TextureImage(Image *image,
   image_view=AcquireCacheView(image);
   texture_view=AcquireCacheView(texture_image);
 #if defined(MAGICKCORE_OPENMP_SUPPORT)
-  #pragma omp parallel for schedule(static,4) shared(status) omp_throttle(1)
+  #pragma omp parallel for schedule(static,1) shared(status)
 #endif
   for (y=0; y < (ssize_t) image->rows; y++)
   {

diff --git a/MagickCore/decorate.c b/MagickCore/decorate.c
index 238c49d97907c71a705ea13c4973b0e9e9b29507..a3f717f352909b97174c2c13216a1024fc87d76e 100644 (file)
--- a/MagickCore/decorate.c
+++ b/MagickCore/decorate.c
@@ -379,7 +379,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,4) shared(progress,status) omp_throttle(1)
+  #pragma omp parallel for schedule(static,1) shared(progress,status)
 #endif
   for (y=0; y < (ssize_t) image->rows; y++)
   {
@@ -679,7 +679,7 @@ MagickExport MagickBooleanType RaiseImage(Image *image,
   progress=0;
   image_view=AcquireCacheView(image);
 #if defined(MAGICKCORE_OPENMP_SUPPORT) 
-  #pragma omp parallel for schedule(static,4) shared(progress,status) omp_throttle(1)
+  #pragma omp parallel for schedule(static,1) shared(progress,status)
 #endif
   for (y=0; y < (ssize_t) raise_info->height; y++)
   {
@@ -768,7 +768,7 @@ MagickExport MagickBooleanType RaiseImage(Image *image,
       }
   }
 #if defined(MAGICKCORE_OPENMP_SUPPORT)
-  #pragma omp parallel for schedule(static,4) shared(progress,status) omp_throttle(1)
+  #pragma omp parallel for schedule(static,1) shared(progress,status)
 #endif
   for (y=(ssize_t) raise_info->height; y < (ssize_t) (image->rows-raise_info->height); y++)
   {
@@ -840,7 +840,7 @@ MagickExport MagickBooleanType RaiseImage(Image *image,
       }
   }
 #if defined(MAGICKCORE_OPENMP_SUPPORT) 
-  #pragma omp parallel for schedule(static,4) shared(progress,status) omp_throttle(1)
+  #pragma omp parallel for schedule(static,1) shared(progress,status)
 #endif
   for (y=(ssize_t) (image->rows-raise_info->height); y < (ssize_t) image->rows; y++)
   {

diff --git a/MagickCore/effect.c b/MagickCore/effect.c
index 59b7ece158a82ef3633cca8a7180c0e66b8a0bd6..af697670067e2cf6f873283c37c80387dd5b8378 100644 (file)
--- a/MagickCore/effect.c
+++ b/MagickCore/effect.c
@@ -2166,7 +2166,7 @@ MagickExport Image *MotionBlurImage(const Image *image,const double radius,
   image_view=AcquireCacheView(image);
   blur_view=AcquireCacheView(blur_image);
 #if defined(MAGICKCORE_OPENMP_SUPPORT)
-  #pragma omp parallel for schedule(static,4) shared(progress,status) omp_throttle(1)
+  #pragma omp parallel for schedule(static,1) shared(progress,status)
 #endif
   for (y=0; y < (ssize_t) image->rows; y++)
   {
@@ -3794,7 +3794,7 @@ MagickExport Image *SpreadImage(const Image *image,const double radius,
   image_view=AcquireCacheView(image);
   spread_view=AcquireCacheView(spread_image);
 #if defined(MAGICKCORE_OPENMP_SUPPORT)
-  #pragma omp parallel for schedule(static,4) shared(progress,status) omp_throttle(1)
+  #pragma omp parallel for schedule(static,1) shared(progress,status)
 #endif
   for (y=0; y < (ssize_t) image->rows; y++)
   {

diff --git a/MagickCore/image.c b/MagickCore/image.c
index 9d82914d7e6635327d503fbe4a0ef43130881617..d2cacbdadd14b0a3155bc2be3c5e998660330ae5 100644 (file)
--- a/MagickCore/image.c
+++ b/MagickCore/image.c
@@ -516,7 +516,7 @@ MagickExport Image *AppendImages(const Image *images,
       y_offset-=geometry.y;
     image_view=AcquireCacheView(image);
 #if defined(MAGICKCORE_OPENMP_SUPPORT)
-    #pragma omp parallel for schedule(static,4) shared(status) omp_throttle(1)
+    #pragma omp parallel for schedule(static,1) shared(status)
 #endif
     for (y=0; y < (ssize_t) image->rows; y++)
     {
@@ -2265,7 +2265,7 @@ MagickExport Image *SeparateImage(const Image *image,
   image_view=AcquireCacheView(image);
   separate_view=AcquireCacheView(separate_image);
 #if defined(MAGICKCORE_OPENMP_SUPPORT)
-  #pragma omp parallel for schedule(static,4) shared(progress,status) omp_throttle(1)
+  #pragma omp parallel for schedule(static,1) shared(progress,status)
 #endif
   for (y=0; y < (ssize_t) image->rows; y++)
   {

diff --git a/MagickCore/resize.c b/MagickCore/resize.c
index 7119a8fa4e6f3f003e8ff5ece4dcd175be75ff90..2dc2cfe0934a56c89606f0e8a06db5a3173921e7 100644 (file)
--- a/MagickCore/resize.c
+++ b/MagickCore/resize.c
@@ -1202,7 +1202,7 @@ MagickExport Image *AdaptiveResizeImage(const Image *image,
   image_view=AcquireCacheView(image);
   resize_view=AcquireCacheView(resize_image);
 #if defined(MAGICKCORE_OPENMP_SUPPORT)
-  #pragma omp parallel for schedule(static,4) shared(progress,status) omp_throttle(1)
+  #pragma omp parallel for schedule(static,1) shared(progress,status)
 #endif
   for (y=0; y < (ssize_t) resize_image->rows; y++)
   {
@@ -2676,7 +2676,7 @@ MagickExport Image *SampleImage(const Image *image,const size_t columns,
   image_view=AcquireCacheView(image);
   sample_view=AcquireCacheView(sample_image);
 #if defined(MAGICKCORE_OPENMP_SUPPORT)
-  #pragma omp parallel for schedule(static,4) shared(progress,status) omp_throttle(1)
+  #pragma omp parallel for schedule(static,1) shared(progress,status)
 #endif
   for (y=0; y < (ssize_t) sample_image->rows; y++)
   {

diff --git a/MagickCore/shear.c b/MagickCore/shear.c
index a610332a19c0e9bbec0a1794b3740e46feb963aa..c0d4a394d308186643d63f6a7d3c06c3fc6fff07 100644 (file)
--- a/MagickCore/shear.c
+++ b/MagickCore/shear.c
@@ -1023,7 +1023,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,4) shared(progress, status) omp_throttle(1)
+      #pragma omp parallel for schedule(static,1) shared(progress,status)
 #endif
       for (tile_y=0; tile_y < (ssize_t) image->rows; tile_y+=(ssize_t) tile_height)
       {
@@ -1141,7 +1141,7 @@ MagickExport Image *IntegralRotateImage(const Image *image,size_t rotations,
         Rotate 180 degrees.
       */
 #if defined(MAGICKCORE_OPENMP_SUPPORT)
-      #pragma omp parallel for schedule(static,4) shared(progress,status) omp_throttle(1)
+      #pragma omp parallel for schedule(static,1) shared(progress,status)
 #endif
       for (y=0; y < (ssize_t) image->rows; y++)
       {
@@ -1233,7 +1233,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,4) shared(progress,status) omp_throttle(1)
+      #pragma omp parallel for schedule(static,1) shared(progress,status)
 #endif
       for (tile_y=0; tile_y < (ssize_t) image->rows; tile_y+=(ssize_t) tile_height)
       {
@@ -1429,7 +1429,7 @@ static MagickBooleanType XShearImage(Image *image,const MagickRealType degrees,
   progress=0;
   image_view=AcquireCacheView(image);
 #if defined(MAGICKCORE_OPENMP_SUPPORT)
-  #pragma omp parallel for schedule(static,4) shared(progress, status)
+  #pragma omp parallel for schedule(static,4) shared(progress,status)
 #endif
   for (y=0; y < (ssize_t) height; y++)
   {
@@ -1644,7 +1644,7 @@ static MagickBooleanType YShearImage(Image *image,const MagickRealType degrees,
   background=image->background_color;
   image_view=AcquireCacheView(image);
 #if defined(MAGICKCORE_OPENMP_SUPPORT)
-  #pragma omp parallel for schedule(static,4) shared(progress, status)
+  #pragma omp parallel for schedule(static,4) shared(progress,status)
 #endif
   for (x=0; x < (ssize_t) width; x++)
   {

diff --git a/MagickCore/statistic.c b/MagickCore/statistic.c
index 59e5dae13b489b50095bd76c6f811ca36a845686..dcc27cbdaf45de96042ecfc3fcf3a54bfddaabeb 100644 (file)
--- a/MagickCore/statistic.c
+++ b/MagickCore/statistic.c
@@ -1276,7 +1276,7 @@ MagickExport MagickBooleanType GetImageKurtosis(const Image *image,
   sum_fourth_power=0.0;
   image_view=AcquireCacheView(image);
 #if defined(MAGICKCORE_OPENMP_SUPPORT)
-  #pragma omp parallel for schedule(static) shared(status) omp_throttle(1)
+  #pragma omp parallel for schedule(static,1) shared(status)
 #endif
   for (y=0; y < (ssize_t) image->rows; y++)
   {
@@ -1399,7 +1399,7 @@ MagickExport MagickBooleanType GetImageRange(const Image *image,double *minima,
   *minima=MagickHuge;
   image_view=AcquireCacheView(image);
 #if defined(MAGICKCORE_OPENMP_SUPPORT)
-  #pragma omp parallel for schedule(static) shared(status) omp_throttle(1)
+  #pragma omp parallel for schedule(static,1) shared(status)
 #endif
   for (y=0; y < (ssize_t) image->rows; y++)
   {

diff --git a/MagickCore/transform.c b/MagickCore/transform.c
index c151b6ce08260dacc60a24279fdacb0fc83dff8a..74ef72ea638e6d9ed29ba6e6ef1bea83ca89f203 100644 (file)
--- a/MagickCore/transform.c
+++ b/MagickCore/transform.c
@@ -160,7 +160,7 @@ MagickExport Image *ChopImage(const Image *image,const RectangleInfo *chop_info,
   image_view=AcquireCacheView(image);
   chop_view=AcquireCacheView(chop_image);
 #if defined(MAGICKCORE_OPENMP_SUPPORT)
-  #pragma omp parallel for schedule(static,4) shared(progress,status) omp_throttle(1)
+  #pragma omp parallel for schedule(static,1) shared(progress,status)
 #endif
   for (y=0; y < (ssize_t) extent.y; y++)
   {
@@ -230,7 +230,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,4) shared(progress,status) omp_throttle(1)
+  #pragma omp parallel for schedule(static,1) shared(progress,status)
 #endif
   for (y=0; y < (ssize_t) (image->rows-(extent.y+extent.height)); y++)
   {
@@ -585,7 +585,7 @@ MagickExport Image *CropImage(const Image *image,const RectangleInfo *geometry,
   image_view=AcquireCacheView(image);
   crop_view=AcquireCacheView(crop_image);
 #if defined(MAGICKCORE_OPENMP_SUPPORT)
-  #pragma omp parallel for schedule(static,4) shared(progress,status) omp_throttle(1)
+  #pragma omp parallel for schedule(static,1) shared(progress,status)
 #endif
   for (y=0; y < (ssize_t) crop_image->rows; y++)
   {
@@ -1140,7 +1140,7 @@ MagickExport Image *FlipImage(const Image *image,ExceptionInfo *exception)
   image_view=AcquireCacheView(image);
   flip_view=AcquireCacheView(flip_image);
 #if defined(MAGICKCORE_OPENMP_SUPPORT)
-  #pragma omp parallel for schedule(static,4) shared(progress,status) omp_throttle(1)
+  #pragma omp parallel for schedule(static,1) shared(progress,status)
 #endif
   for (y=0; y < (ssize_t) flip_image->rows; y++)
   {
@@ -1280,7 +1280,7 @@ MagickExport Image *FlopImage(const Image *image,ExceptionInfo *exception)
   image_view=AcquireCacheView(image);
   flop_view=AcquireCacheView(flop_image);
 #if defined(MAGICKCORE_OPENMP_SUPPORT)
-  #pragma omp parallel for schedule(static,4) shared(progress,status) omp_throttle(1)
+  #pragma omp parallel for schedule(static,1) shared(progress,status)
 #endif
   for (y=0; y < (ssize_t) flop_image->rows; y++)
   {