From 78778cb08fcd4ff146f08b3c7b5c72375742b174 Mon Sep 17 00:00:00 2001 From: cristy Date: Tue, 17 Jan 2012 14:48:47 +0000 Subject: [PATCH] --- MagickCore/decorate.c | 2 +- MagickCore/draw.c | 8 ++++---- MagickCore/effect.c | 6 +++--- MagickCore/enhance.c | 2 +- MagickCore/fx.c | 2 +- MagickCore/resize.c | 4 ++-- MagickCore/segment.c | 4 ++-- MagickCore/shear.c | 4 ++-- MagickCore/threshold.c | 14 +++++++------- coders/hald.c | 7 +++++-- 10 files changed, 28 insertions(+), 25 deletions(-) diff --git a/MagickCore/decorate.c b/MagickCore/decorate.c index a3f717f35..e8a7dd0ff 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,1) shared(progress,status) + #pragma omp parallel for schedule(static,8) shared(progress,status) #endif for (y=0; y < (ssize_t) image->rows; y++) { diff --git a/MagickCore/draw.c b/MagickCore/draw.c index c3b17127b..a51202830 100644 --- a/MagickCore/draw.c +++ b/MagickCore/draw.c @@ -1156,7 +1156,7 @@ MagickExport MagickBooleanType DrawAffineImage(Image *image, image_view=AcquireCacheView(image); source_view=AcquireCacheView(source); #if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp parallel for schedule(static,4) shared(status) + #pragma omp parallel for schedule(static) shared(status) #endif for (y=(ssize_t) ceil(edge.y1-0.5); y <= (ssize_t) floor(edge.y2+0.5); y++) { @@ -3243,7 +3243,7 @@ MagickExport MagickBooleanType DrawGradientImage(Image *image, GetPixelInfo(image,&zero); image_view=AcquireCacheView(image); #if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp parallel for schedule(static,4) shared(status) + #pragma omp parallel for schedule(static) shared(status) #endif for (y=bounding_box.y; y < (ssize_t) bounding_box.height; y++) { @@ -3850,7 +3850,7 @@ static MagickBooleanType DrawPolygonPrimitive(Image *image, Draw point. */ #if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp parallel for schedule(static,4) shared(status) + #pragma omp parallel for schedule(static) shared(status) #endif for (y=(ssize_t) ceil(bounds.y1-0.5); y <= (ssize_t) floor(bounds.y2+0.5); y++) { @@ -3904,7 +3904,7 @@ static MagickBooleanType DrawPolygonPrimitive(Image *image, if (image->matte == MagickFalse) (void) SetImageAlphaChannel(image,OpaqueAlphaChannel,exception); #if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp parallel for schedule(static,4) shared(status) + #pragma omp parallel for schedule(static) shared(status) #endif for (y=(ssize_t) ceil(bounds.y1-0.5); y <= (ssize_t) floor(bounds.y2+0.5); y++) { diff --git a/MagickCore/effect.c b/MagickCore/effect.c index f5ba66925..8148dd607 100644 --- a/MagickCore/effect.c +++ b/MagickCore/effect.c @@ -1304,7 +1304,7 @@ MagickExport Image *ConvolveImage(const Image *image, image_view=AcquireCacheView(image); convolve_view=AcquireCacheView(convolve_image); #if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp parallel for schedule(static,4) shared(progress,status) + #pragma omp parallel for schedule(guided) shared(progress,status) #endif for (y=0; y < (ssize_t) image->rows; y++) { @@ -1485,7 +1485,7 @@ static void Hull(const ssize_t x_offset,const ssize_t y_offset, q=g+(columns+2); r=p+(y_offset*(columns+2)+x_offset); #if defined(HAVE_OPENMP) - #pragma omp parallel for schedule(static) + #pragma omp parallel for schedule(guided) #endif for (y=0; y < (ssize_t) rows; y++) { @@ -3787,7 +3787,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,1) shared(progress,status) + #pragma omp parallel for schedule(static,8) shared(progress,status) #endif for (y=0; y < (ssize_t) image->rows; y++) { diff --git a/MagickCore/enhance.c b/MagickCore/enhance.c index 9253fed1c..30b46f9e6 100644 --- a/MagickCore/enhance.c +++ b/MagickCore/enhance.c @@ -1344,7 +1344,7 @@ MagickExport Image *EnhanceImage(const Image *image,ExceptionInfo *exception) image_view=AcquireCacheView(image); enhance_view=AcquireCacheView(enhance_image); #if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp parallel for schedule(static,4) shared(progress,status) + #pragma omp parallel for schedule(guided) shared(progress,status) #endif for (y=0; y < (ssize_t) image->rows; y++) { diff --git a/MagickCore/fx.c b/MagickCore/fx.c index 670af0d28..53832a9f3 100644 --- a/MagickCore/fx.c +++ b/MagickCore/fx.c @@ -5061,7 +5061,7 @@ MagickExport Image *SwirlImage(const Image *image,double degrees, image_view=AcquireCacheView(image); swirl_view=AcquireCacheView(swirl_image); #if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp parallel for schedule(static,4) shared(progress,status) + #pragma omp parallel for schedule(static,8) shared(progress,status) #endif for (y=0; y < (ssize_t) image->rows; y++) { diff --git a/MagickCore/resize.c b/MagickCore/resize.c index 2dc2cfe09..3a1ab7705 100644 --- a/MagickCore/resize.c +++ b/MagickCore/resize.c @@ -2114,7 +2114,7 @@ static MagickBooleanType HorizontalFilter(const ResizeFilter *resize_filter, image_view=AcquireCacheView(image); resize_view=AcquireCacheView(resize_image); #if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp parallel for shared(status) + #pragma omp parallel for schedule(guided) shared(status) #endif for (x=0; x < (ssize_t) resize_image->columns; x++) { @@ -2326,7 +2326,7 @@ static MagickBooleanType VerticalFilter(const ResizeFilter *resize_filter, image_view=AcquireCacheView(image); resize_view=AcquireCacheView(resize_image); #if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp parallel for shared(status) + #pragma omp parallel for schedule(guided) shared(status) #endif for (y=0; y < (ssize_t) resize_image->rows; y++) { diff --git a/MagickCore/segment.c b/MagickCore/segment.c index 1af173421..de5bc44e8 100644 --- a/MagickCore/segment.c +++ b/MagickCore/segment.c @@ -403,8 +403,8 @@ static MagickBooleanType Classify(Image *image,short **extrema, #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp critical (MagickCore_Classify) #endif - proceed=SetImageProgress(image,SegmentImageTag,progress++, - 2*image->rows); + proceed=SetImageProgress(image,SegmentImageTag,progress++,2* + image->rows); if (proceed == MagickFalse) status=MagickFalse; } diff --git a/MagickCore/shear.c b/MagickCore/shear.c index 219d058d9..082f85a37 100644 --- a/MagickCore/shear.c +++ b/MagickCore/shear.c @@ -1427,7 +1427,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(dynamic) shared(progress,status) #endif for (y=0; y < (ssize_t) height; y++) { @@ -1642,7 +1642,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(dynamic) shared(progress,status) #endif for (x=0; x < (ssize_t) width; x++) { diff --git a/MagickCore/threshold.c b/MagickCore/threshold.c index 44190c0cb..ac754e5e6 100644 --- a/MagickCore/threshold.c +++ b/MagickCore/threshold.c @@ -204,7 +204,7 @@ MagickExport Image *AdaptiveThresholdImage(const Image *image, image_view=AcquireCacheView(image); threshold_view=AcquireCacheView(threshold_image); #if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp parallel for schedule(static,4) shared(progress,status) + #pragma omp parallel for schedule(guided) shared(progress,status) #endif for (y=0; y < (ssize_t) image->rows; y++) { @@ -384,7 +384,7 @@ MagickExport MagickBooleanType BilevelImage(Image *image,const double threshold, 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,8) shared(progress,status) #endif for (y=0; y < (ssize_t) image->rows; y++) { @@ -530,7 +530,7 @@ MagickExport MagickBooleanType BlackThresholdImage(Image *image, 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,8) shared(progress,status) #endif for (y=0; y < (ssize_t) image->rows; y++) { @@ -678,7 +678,7 @@ MagickExport MagickBooleanType ClampImage(Image *image,ExceptionInfo *exception) 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,8) shared(progress,status) #endif for (y=0; y < (ssize_t) image->rows; y++) { @@ -1296,7 +1296,7 @@ MagickExport MagickBooleanType OrderedPosterizeImage(Image *image, 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,8) shared(progress,status) #endif for (y=0; y < (ssize_t) image->rows; y++) { @@ -1465,7 +1465,7 @@ MagickExport MagickBooleanType RandomThresholdImage(Image *image, random_info=AcquireRandomInfoThreadSet(); 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,8) shared(progress,status) #endif for (y=0; y < (ssize_t) image->rows; y++) { @@ -1627,7 +1627,7 @@ MagickExport MagickBooleanType WhiteThresholdImage(Image *image, 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,8) shared(progress,status) #endif for (y=0; y < (ssize_t) image->rows; y++) { diff --git a/coders/hald.c b/coders/hald.c index 969beb7b9..34c310f94 100644 --- a/coders/hald.c +++ b/coders/hald.c @@ -123,6 +123,9 @@ static Image *ReadHALDImage(const ImageInfo *image_info, cube_size=level*level; image->columns=(size_t) (level*cube_size); image->rows=(size_t) (level*cube_size); +#if defined(MAGICKCORE_OPENMP_SUPPORT) + #pragma omp parallel for schedule(static,8) shared(status) +#endif for (y=0; y < (ssize_t) image->rows; y+=(ssize_t) level) { ssize_t @@ -148,8 +151,8 @@ static Image *ReadHALDImage(const ImageInfo *image_info, for (red=0; red < (ssize_t) cube_size; red++) { SetPixelRed(image,ClampToQuantum(QuantumRange*red/(cube_size-1.0)),q); - SetPixelGreen(image,ClampToQuantum(QuantumRange*green/ - (cube_size-1.0)),q); + SetPixelGreen(image,ClampToQuantum(QuantumRange*green/(cube_size-1.0)), + q); SetPixelBlue(image,ClampToQuantum(QuantumRange*blue/(cube_size-1.0)),q); SetPixelAlpha(image,OpaqueAlpha,q); q+=GetPixelChannels(image); -- 2.40.0