From 13e9836d3f21f7bd5ee9ce8012e912d756bfc05c Mon Sep 17 00:00:00 2001 From: cristy Date: Thu, 12 Jan 2012 02:08:08 +0000 Subject: [PATCH] --- MagickCore/composite.c | 4 ++-- MagickCore/decorate.c | 8 ++++---- MagickCore/effect.c | 4 ++-- MagickCore/image.c | 4 ++-- MagickCore/resize.c | 4 ++-- MagickCore/shear.c | 10 +++++----- MagickCore/statistic.c | 4 ++-- MagickCore/transform.c | 10 +++++----- 8 files changed, 24 insertions(+), 24 deletions(-) diff --git a/MagickCore/composite.c b/MagickCore/composite.c index 43fde4f64..34f2d3b32 100644 --- 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 238c49d97..a3f717f35 100644 --- 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 59b7ece15..af6976700 100644 --- 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 9d82914d7..d2cacbdad 100644 --- 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 7119a8fa4..2dc2cfe09 100644 --- 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 a610332a1..c0d4a394d 100644 --- 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 59e5dae13..dcc27cbda 100644 --- 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 c151b6ce0..74ef72ea6 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=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++) { -- 2.50.1