From 43456b1c096b40e3cd0cdfc3b65cd003874cb7fa Mon Sep 17 00:00:00 2001 From: Cristy Date: Sun, 8 Oct 2017 18:28:40 -0400 Subject: [PATCH] Support magick_number_threads() macro --- MagickCore/attribute.c | 12 +++++----- MagickCore/cache.c | 19 +++++++-------- MagickCore/channel.c | 12 +++++----- MagickCore/colormap.c | 4 ++-- MagickCore/colorspace.c | 46 ++++++++++++++++++------------------- MagickCore/compare.c | 16 ++++++------- MagickCore/composite.c | 10 ++++---- MagickCore/decorate.c | 8 +++---- MagickCore/distort.c | 4 ++-- MagickCore/draw.c | 8 +++---- MagickCore/effect.c | 26 ++++++++++----------- MagickCore/enhance.c | 28 +++++++++++----------- MagickCore/feature.c | 18 +++++++-------- MagickCore/fourier.c | 2 +- MagickCore/fx.c | 30 ++++++++++++------------ MagickCore/image-view.c | 10 ++++---- MagickCore/image.c | 18 +++++++-------- MagickCore/matrix.c | 2 +- MagickCore/morphology.c | 4 ++-- MagickCore/paint.c | 8 +++---- MagickCore/prepress.c | 2 +- MagickCore/profile.c | 2 +- MagickCore/quantize.c | 10 ++++---- MagickCore/resize.c | 10 ++++---- MagickCore/segment.c | 2 +- MagickCore/shear.c | 16 ++++++------- MagickCore/statistic.c | 14 +++++------ MagickCore/thread-private.h | 9 +++++++- MagickCore/threshold.c | 16 ++++++------- MagickCore/transform.c | 22 +++++++++--------- MagickWand/wand-view.c | 10 ++++---- coders/psd.c | 6 ++--- configure | 2 +- 33 files changed, 207 insertions(+), 199 deletions(-) diff --git a/MagickCore/attribute.c b/MagickCore/attribute.c index b9eb8ace1..7e58fe83a 100644 --- a/MagickCore/attribute.c +++ b/MagickCore/attribute.c @@ -175,7 +175,7 @@ MagickExport RectangleInfo GetImageBoundingBox(const Image *image, GetPixelInfo(image,&zero); #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,4) shared(status) \ - magick_threads(image,image,image->rows,1) + magick_chunk_threads(image,image,image->rows,1) #endif for (y=0; y < (ssize_t) image->rows; y++) { @@ -382,7 +382,7 @@ MagickExport size_t GetImageDepth(const Image *image,ExceptionInfo *exception) } #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,4) shared(status) \ - magick_threads(image,image,image->rows,1) + magick_chunk_threads(image,image,image->rows,1) #endif for (y=0; y < (ssize_t) image->rows; y++) { @@ -442,7 +442,7 @@ MagickExport size_t GetImageDepth(const Image *image,ExceptionInfo *exception) */ #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,4) shared(status) \ - magick_threads(image,image,image->rows,1) + magick_chunk_threads(image,image,image->rows,1) #endif for (y=0; y < (ssize_t) image->rows; y++) { @@ -1032,7 +1032,7 @@ MagickExport MagickBooleanType SetImageDepth(Image *image, #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,4) shared(status) \ - magick_threads(image,image,1,1) + magick_number_threads(image,image,2) #endif for (i=0; i < (ssize_t) image->colors; i++) { @@ -1072,7 +1072,7 @@ MagickExport MagickBooleanType SetImageDepth(Image *image, range); #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,4) shared(status) \ - magick_threads(image,image,image->rows,1) + magick_chunk_threads(image,image,image->rows,1) #endif for (y=0; y < (ssize_t) image->rows; y++) { @@ -1137,7 +1137,7 @@ MagickExport MagickBooleanType SetImageDepth(Image *image, */ #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,4) shared(status) \ - magick_threads(image,image,image->rows,1) + magick_chunk_threads(image,image,image->rows,1) #endif for (y=0; y < (ssize_t) image->rows; y++) { diff --git a/MagickCore/cache.c b/MagickCore/cache.c index 0d046dbdc..cf7eb4987 100644 --- a/MagickCore/cache.c +++ b/MagickCore/cache.c @@ -539,12 +539,13 @@ static MagickBooleanType ClonePixelCacheRepository( ExceptionInfo *exception) { #define MaxCacheThreads 2 -#define cache_threads(source,destination) \ - num_threads(((source)->type == DiskCache) || \ - ((destination)->type == DiskCache) || (((source)->rows) < \ - (16*GetMagickResourceLimit(ThreadResource))) ? 1 : \ - GetMagickResourceLimit(ThreadResource) < MaxCacheThreads ? \ - GetMagickResourceLimit(ThreadResource) : MaxCacheThreads) +#define cache_number_threads(source,destination,number_threads) \ + num_threads(( \ + (((source)->type == MemoryCache) || \ + ((source)->type == MapCache)) && \ + (((destination)->type == MemoryCache) || \ + ((destination)->type == MapCache))) ? \ + MagickMax(MagickMin(GetMagickResourceLimit(ThreadResource),number_threads),1) : 1) MagickBooleanType optimize, @@ -610,7 +611,7 @@ static MagickBooleanType ClonePixelCacheRepository( status=MagickTrue; #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,4) shared(status) \ - cache_threads(cache_info,clone_info) + cache_number_threads(cache_info,clone_info,2) #endif for (y=0; y < (ssize_t) cache_info->rows; y++) { @@ -700,7 +701,7 @@ static MagickBooleanType ClonePixelCacheRepository( clone_info->metacontent_extent); #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,4) shared(status) \ - cache_threads(cache_info,clone_info) + cache_number_threads(cache_info,clone_info,2) #endif for (y=0; y < (ssize_t) cache_info->rows; y++) { @@ -4910,7 +4911,7 @@ static MagickBooleanType SetCacheAlphaChannel(Image *image,const Quantum alpha, image_view=AcquireVirtualCacheView(image,exception); /* must be virtual */ #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,4) shared(status) \ - magick_threads(image,image,1,1) + magick_number_threads(image,image,2) #endif for (y=0; y < (ssize_t) image->rows; y++) { diff --git a/MagickCore/channel.c b/MagickCore/channel.c index 158e23aca..dcdae01cd 100644 --- a/MagickCore/channel.c +++ b/MagickCore/channel.c @@ -139,7 +139,7 @@ static MagickBooleanType ChannelImage(Image *destination_image, width=MagickMin(source_image->columns,destination_image->columns); #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,4) shared(status) \ - magick_threads(source_image,source_image,height,1) + magick_chunk_threads(source_image,source_image,height,1) #endif for (y=0; y < (ssize_t) height; y++) { @@ -743,7 +743,7 @@ MagickExport Image *SeparateImage(const Image *image, separate_view=AcquireAuthenticCacheView(separate_image,exception); #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,4) shared(progress,status) \ - magick_threads(image,image,image->rows,1) + magick_chunk_threads(image,image,image->rows,1) #endif for (y=0; y < (ssize_t) image->rows; y++) { @@ -998,7 +998,7 @@ MagickExport MagickBooleanType SetImageAlphaChannel(Image *image, image_view=AcquireAuthenticCacheView(image,exception); #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,4) shared(status) \ - magick_threads(image,image,image->rows,1) + magick_chunk_threads(image,image,image->rows,1) #endif for (y=0; y < (ssize_t) image->rows; y++) { @@ -1063,7 +1063,7 @@ MagickExport MagickBooleanType SetImageAlphaChannel(Image *image, image_view=AcquireAuthenticCacheView(image,exception); #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,4) shared(status) \ - magick_threads(image,image,image->rows,1) + magick_chunk_threads(image,image,image->rows,1) #endif for (y=0; y < (ssize_t) image->rows; y++) { @@ -1123,7 +1123,7 @@ MagickExport MagickBooleanType SetImageAlphaChannel(Image *image, image_view=AcquireAuthenticCacheView(image,exception); #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,4) shared(status) \ - magick_threads(image,image,image->rows,1) + magick_chunk_threads(image,image,image->rows,1) #endif for (y=0; y < (ssize_t) image->rows; y++) { @@ -1221,7 +1221,7 @@ MagickExport MagickBooleanType SetImageAlphaChannel(Image *image, image_view=AcquireAuthenticCacheView(image,exception); #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,4) shared(status) \ - magick_threads(image,image,image->rows,1) + magick_chunk_threads(image,image,image->rows,1) #endif for (y=0; y < (ssize_t) image->rows; y++) { diff --git a/MagickCore/colormap.c b/MagickCore/colormap.c index 5dd595de1..0b315275d 100644 --- a/MagickCore/colormap.c +++ b/MagickCore/colormap.c @@ -198,7 +198,7 @@ MagickExport MagickBooleanType CycleColormapImage(Image *image, image_view=AcquireAuthenticCacheView(image,exception); #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,4) \ - magick_threads(image,image,1,1) + magick_number_threads(image,image,2) #endif for (y=0; y < (ssize_t) image->rows; y++) { @@ -323,7 +323,7 @@ MagickExport MagickBooleanType SortColormapByIntensity(Image *image, */ #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,4) shared(status) \ - magick_threads(image,image,1,1) + magick_number_threads(image,image,2) #endif for (i=0; i < (ssize_t) image->colors; i++) image->colormap[i].alpha=(double) i; diff --git a/MagickCore/colorspace.c b/MagickCore/colorspace.c index f2e65a2ac..707a50add 100644 --- a/MagickCore/colorspace.c +++ b/MagickCore/colorspace.c @@ -282,7 +282,7 @@ static MagickBooleanType sRGBTransformImage(Image *image, image_view=AcquireAuthenticCacheView(image,exception); #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,4) shared(status) \ - magick_threads(image,image,image->rows,1) + magick_chunk_threads(image,image,image->rows,1) #endif for (y=0; y < (ssize_t) image->rows; y++) { @@ -341,7 +341,7 @@ static MagickBooleanType sRGBTransformImage(Image *image, image_view=AcquireAuthenticCacheView(image,exception); #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,4) shared(status) \ - magick_threads(image,image,image->rows,1) + magick_chunk_threads(image,image,image->rows,1) #endif for (y=0; y < (ssize_t) image->rows; y++) { @@ -413,7 +413,7 @@ static MagickBooleanType sRGBTransformImage(Image *image, image_view=AcquireAuthenticCacheView(image,exception); #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,4) shared(status) \ - magick_threads(image,image,image->rows,1) + magick_chunk_threads(image,image,image->rows,1) #endif for (y=0; y < (ssize_t) image->rows; y++) { @@ -623,7 +623,7 @@ static MagickBooleanType sRGBTransformImage(Image *image, film_gamma); #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,4) \ - magick_threads(image,image,1,1) + magick_number_threads(image,image,2) #endif for (i=0; i <= (ssize_t) MaxMap; i++) logmap[i]=ScaleMapToQuantum((double) (MaxMap*(reference_white+ @@ -632,7 +632,7 @@ static MagickBooleanType sRGBTransformImage(Image *image, image_view=AcquireAuthenticCacheView(image,exception); #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,4) shared(status) \ - magick_threads(image,image,image->rows,1) + magick_chunk_threads(image,image,image->rows,1) #endif for (y=0; y < (ssize_t) image->rows; y++) { @@ -699,7 +699,7 @@ static MagickBooleanType sRGBTransformImage(Image *image, image_view=AcquireAuthenticCacheView(image,exception); #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,4) shared(status) \ - magick_threads(image,image,image->rows,1) + magick_chunk_threads(image,image,image->rows,1) #endif for (y=0; y < (ssize_t) image->rows; y++) { @@ -789,7 +789,7 @@ static MagickBooleanType sRGBTransformImage(Image *image, primary_info.z=(double) (MaxMap+1.0)/2.0; #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,4) \ - magick_threads(image,image,1,1) + magick_number_threads(image,image,2) #endif for (i=0; i <= (ssize_t) MaxMap; i++) { @@ -821,7 +821,7 @@ static MagickBooleanType sRGBTransformImage(Image *image, primary_info.z=(double) (MaxMap+1.0)/2.0; #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,4) \ - magick_threads(image,image,1,1) + magick_number_threads(image,image,2) #endif for (i=0; i <= (ssize_t) MaxMap; i++) { @@ -853,7 +853,7 @@ static MagickBooleanType sRGBTransformImage(Image *image, primary_info.z=(double) (MaxMap+1.0)/2.0; #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,4) \ - magick_threads(image,image,1,1) + magick_number_threads(image,image,2) #endif for (i=0; i <= (ssize_t) MaxMap; i++) { @@ -915,7 +915,7 @@ static MagickBooleanType sRGBTransformImage(Image *image, */ #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,4) \ - magick_threads(image,image,1,1) + magick_number_threads(image,image,2) #endif for (i=0; i <= (ssize_t) MaxMap; i++) { @@ -946,7 +946,7 @@ static MagickBooleanType sRGBTransformImage(Image *image, image_view=AcquireAuthenticCacheView(image,exception); #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,4) shared(status) \ - magick_threads(image,image,image->rows,1) + magick_chunk_threads(image,image,image->rows,1) #endif for (y=0; y < (ssize_t) image->rows; y++) { @@ -1756,7 +1756,7 @@ static MagickBooleanType TransformsRGBImage(Image *image, image_view=AcquireAuthenticCacheView(image,exception); #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,4) shared(status) \ - magick_threads(image,image,image->rows,1) + magick_chunk_threads(image,image,image->rows,1) #endif for (y=0; y < (ssize_t) image->rows; y++) { @@ -1815,7 +1815,7 @@ static MagickBooleanType TransformsRGBImage(Image *image, image_view=AcquireAuthenticCacheView(image,exception); #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,4) shared(status) \ - magick_threads(image,image,image->rows,1) + magick_chunk_threads(image,image,image->rows,1) #endif for (y=0; y < (ssize_t) image->rows; y++) { @@ -1895,7 +1895,7 @@ static MagickBooleanType TransformsRGBImage(Image *image, image_view=AcquireAuthenticCacheView(image,exception); #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,4) shared(status) \ - magick_threads(image,image,image->rows,1) + magick_chunk_threads(image,image,image->rows,1) #endif for (y=0; y < (ssize_t) image->rows; y++) { @@ -2116,7 +2116,7 @@ static MagickBooleanType TransformsRGBImage(Image *image, image_view=AcquireAuthenticCacheView(image,exception); #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,4) shared(status) \ - magick_threads(image,image,image->rows,1) + magick_chunk_threads(image,image,image->rows,1) #endif for (y=0; y < (ssize_t) image->rows; y++) { @@ -2182,7 +2182,7 @@ static MagickBooleanType TransformsRGBImage(Image *image, image_view=AcquireAuthenticCacheView(image,exception); #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,4) shared(status) \ - magick_threads(image,image,image->rows,1) + magick_chunk_threads(image,image,image->rows,1) #endif for (y=0; y < (ssize_t) image->rows; y++) { @@ -2272,7 +2272,7 @@ static MagickBooleanType TransformsRGBImage(Image *image, */ #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,4) \ - magick_threads(image,image,1,1) + magick_number_threads(image,image,2) #endif for (i=0; i <= (ssize_t) MaxMap; i++) { @@ -2302,7 +2302,7 @@ static MagickBooleanType TransformsRGBImage(Image *image, */ #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,4) \ - magick_threads(image,image,1,1) + magick_number_threads(image,image,2) #endif for (i=0; i <= (ssize_t) MaxMap; i++) { @@ -2332,7 +2332,7 @@ static MagickBooleanType TransformsRGBImage(Image *image, */ #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,4) \ - magick_threads(image,image,1,1) + magick_number_threads(image,image,2) #endif for (i=0; i <= (ssize_t) MaxMap; i++) { @@ -2361,7 +2361,7 @@ static MagickBooleanType TransformsRGBImage(Image *image, */ #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,4) \ - magick_threads(image,image,1,1) + magick_number_threads(image,image,2) #endif for (i=0; i <= (ssize_t) MaxMap; i++) { @@ -2388,7 +2388,7 @@ static MagickBooleanType TransformsRGBImage(Image *image, */ #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,4) \ - magick_threads(image,image,1,1) + magick_number_threads(image,image,2) #endif for (i=0; i <= (ssize_t) MaxMap; i++) { @@ -2419,7 +2419,7 @@ static MagickBooleanType TransformsRGBImage(Image *image, image_view=AcquireAuthenticCacheView(image,exception); #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,4) shared(status) \ - magick_threads(image,image,image->rows,1) + magick_chunk_threads(image,image,image->rows,1) #endif for (y=0; y < (ssize_t) image->rows; y++) { @@ -2504,7 +2504,7 @@ static MagickBooleanType TransformsRGBImage(Image *image, */ #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,4) shared(status) \ - magick_threads(image,image,1,1) + magick_number_threads(image,image,2) #endif for (i=0; i < (ssize_t) image->colors; i++) { diff --git a/MagickCore/compare.c b/MagickCore/compare.c index 461d5cc2f..d55defab1 100644 --- a/MagickCore/compare.c +++ b/MagickCore/compare.c @@ -227,7 +227,7 @@ MagickExport Image *CompareImages(Image *image,const Image *reconstruct_image, highlight_view=AcquireAuthenticCacheView(highlight_image,exception); #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,4) shared(status) \ - magick_threads(image,highlight_image,rows,1) + magick_chunk_threads(image,highlight_image,rows,1) #endif for (y=0; y < (ssize_t) rows; y++) { @@ -391,7 +391,7 @@ static MagickBooleanType GetAbsoluteDistortion(const Image *image, reconstruct_view=AcquireVirtualCacheView(reconstruct_image,exception); #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,4) shared(status) \ - magick_threads(image,image,rows,1) + magick_chunk_threads(image,image,rows,1) #endif for (y=0; y < (ssize_t) rows; y++) { @@ -507,7 +507,7 @@ static MagickBooleanType GetFuzzDistortion(const Image *image, reconstruct_view=AcquireVirtualCacheView(reconstruct_image,exception); #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,4) shared(status) \ - magick_threads(image,image,rows,1) reduction(+:area) + magick_chunk_threads(image,image,rows,1) reduction(+:area) #endif for (y=0; y < (ssize_t) rows; y++) { @@ -622,7 +622,7 @@ static MagickBooleanType GetMeanAbsoluteDistortion(const Image *image, reconstruct_view=AcquireVirtualCacheView(reconstruct_image,exception); #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,4) shared(status) \ - magick_threads(image,image,rows,1) reduction(+:area) + magick_chunk_threads(image,image,rows,1) reduction(+:area) #endif for (y=0; y < (ssize_t) rows; y++) { @@ -838,7 +838,7 @@ static MagickBooleanType GetMeanSquaredDistortion(const Image *image, reconstruct_view=AcquireVirtualCacheView(reconstruct_image,exception); #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,4) shared(status) \ - magick_threads(image,image,rows,1) reduction(+:area) + magick_chunk_threads(image,image,rows,1) reduction(+:area) #endif for (y=0; y < (ssize_t) rows; y++) { @@ -1138,7 +1138,7 @@ static MagickBooleanType GetPeakAbsoluteDistortion(const Image *image, reconstruct_view=AcquireVirtualCacheView(reconstruct_image,exception); #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,4) shared(status) \ - magick_threads(image,image,rows,1) + magick_chunk_threads(image,image,rows,1) #endif for (y=0; y < (ssize_t) rows; y++) { @@ -1416,7 +1416,7 @@ static MagickBooleanType GetStructuralSimilarityDistortion(const Image *image, reconstruct_view=AcquireVirtualCacheView(reconstruct_image,exception); #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,4) shared(status) \ - magick_threads(image,reconstruct_image,rows,1) + magick_chunk_threads(image,reconstruct_image,rows,1) #endif for (y=0; y < (ssize_t) rows; y++) { @@ -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_threads(image,image,image->rows,1) + magick_chunk_threads(image,image,image->rows,1) #endif for (y=0; y < (ssize_t) (image->rows-reference->rows+1); y++) { diff --git a/MagickCore/composite.c b/MagickCore/composite.c index 7e51289f6..45a901ab9 100644 --- a/MagickCore/composite.c +++ b/MagickCore/composite.c @@ -322,7 +322,7 @@ static MagickBooleanType CompositeOverImage(Image *image, image_view=AcquireAuthenticCacheView(image,exception); #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,4) shared(progress,status) \ - magick_threads(source_image,image,image->rows,1) + magick_chunk_threads(source_image,image,image->rows,1) #endif for (y=0; y < (ssize_t) image->rows; y++) { @@ -627,7 +627,7 @@ MagickExport MagickBooleanType CompositeImage(Image *image, image_view=AcquireAuthenticCacheView(image,exception); #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,4) shared(status) \ - magick_threads(source_image,image,source_image->rows,1) + magick_chunk_threads(source_image,image,source_image->rows,1) #endif for (y=0; y < (ssize_t) source_image->rows; y++) { @@ -716,7 +716,7 @@ MagickExport MagickBooleanType CompositeImage(Image *image, image_view=AcquireAuthenticCacheView(image,exception); #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,4) shared(status) \ - magick_threads(source_image,image,source_image->rows,1) + magick_chunk_threads(source_image,image,source_image->rows,1) #endif for (y=0; y < (ssize_t) source_image->rows; y++) { @@ -1232,7 +1232,7 @@ MagickExport MagickBooleanType CompositeImage(Image *image, image_view=AcquireAuthenticCacheView(image,exception); #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,4) shared(progress,status) \ - magick_threads(source_image,image,image->rows,1) + magick_chunk_threads(source_image,image,image->rows,1) #endif for (y=0; y < (ssize_t) image->rows; y++) { @@ -2458,7 +2458,7 @@ MagickExport MagickBooleanType TextureImage(Image *image,const Image *texture, image_view=AcquireAuthenticCacheView(image,exception); #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,4) shared(status) \ - magick_threads(texture_image,image,1,1) + magick_number_threads(texture_image,image,2) #endif for (y=0; y < (ssize_t) image->rows; y++) { diff --git a/MagickCore/decorate.c b/MagickCore/decorate.c index ad923628e..0c9da68ef 100644 --- a/MagickCore/decorate.c +++ b/MagickCore/decorate.c @@ -383,7 +383,7 @@ MagickExport Image *FrameImage(const Image *image,const FrameInfo *frame_info, */ #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,4) shared(progress,status) \ - magick_threads(image,frame_image,1,1) + magick_number_threads(image,frame_image,2) #endif for (y=0; y < (ssize_t) image->rows; y++) { @@ -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_threads(image,image,1,1) + magick_number_threads(image,image,2) #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_threads(image,image,1,1) + magick_number_threads(image,image,2) #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_threads(image,image,1,1) + magick_number_threads(image,image,2) #endif for (y=(ssize_t) (image->rows-raise_info->height); y < (ssize_t) image->rows; y++) { diff --git a/MagickCore/distort.c b/MagickCore/distort.c index 5685cbfd4..7198702db 100644 --- a/MagickCore/distort.c +++ b/MagickCore/distort.c @@ -2316,7 +2316,7 @@ MagickExport Image *DistortImage(const Image *image, DistortMethod method, distort_view=AcquireAuthenticCacheView(distort_image,exception); #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,4) shared(progress,status) \ - magick_threads(image,distort_image,distort_image->rows,1) + magick_chunk_threads(image,distort_image,distort_image->rows,1) #endif for (j=0; j < (ssize_t) distort_image->rows; j++) { @@ -3038,7 +3038,7 @@ MagickExport Image *SparseColorImage(const Image *image, sparse_view=AcquireAuthenticCacheView(sparse_image,exception); #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,4) shared(progress,status) \ - magick_threads(image,sparse_image,sparse_image->rows,1) + magick_chunk_threads(image,sparse_image,sparse_image->rows,1) #endif for (j=0; j < (ssize_t) sparse_image->rows; j++) { diff --git a/MagickCore/draw.c b/MagickCore/draw.c index 4d2746a33..2b85d1570 100644 --- a/MagickCore/draw.c +++ b/MagickCore/draw.c @@ -1163,7 +1163,7 @@ MagickExport MagickBooleanType DrawAffineImage(Image *image, image_view=AcquireAuthenticCacheView(image,exception); #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,4) shared(status) \ - magick_threads(source,image,1,1) + magick_number_threads(source,image,2) #endif for (y=start; y <= stop; y++) { @@ -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_threads(image,image,1,1) + magick_number_threads(image,image,2) #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_threads(image,image,1,1) + magick_number_threads(image,image,2) #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_threads(image,image,1,1) + magick_number_threads(image,image,2) #endif for (y=start_y; y <= stop_y; y++) { diff --git a/MagickCore/effect.c b/MagickCore/effect.c index 614ae3751..28d9acd8f 100644 --- a/MagickCore/effect.c +++ b/MagickCore/effect.c @@ -253,7 +253,7 @@ MagickExport Image *AdaptiveBlurImage(const Image *image,const double radius, blur_view=AcquireAuthenticCacheView(blur_image,exception); #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,4) shared(progress,status) \ - magick_threads(image,blur_image,blur_image->rows,1) + magick_chunk_threads(image,blur_image,blur_image->rows,1) #endif for (y=0; y < (ssize_t) blur_image->rows; y++) { @@ -574,7 +574,7 @@ MagickExport Image *AdaptiveSharpenImage(const Image *image,const double radius, sharp_view=AcquireAuthenticCacheView(sharp_image,exception); #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,4) shared(progress,status) \ - magick_threads(image,sharp_image,sharp_image->rows,1) + magick_chunk_threads(image,sharp_image,sharp_image->rows,1) #endif for (y=0; y < (ssize_t) sharp_image->rows; y++) { @@ -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_threads(image,image,1,1) + magick_number_threads(image,image,2) #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_threads(image,image,1,1) + magick_number_threads(image,image,2) #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_threads(image,kuwahara_image,image->rows,1) + magick_chunk_threads(image,kuwahara_image,image->rows,1) #endif for (y=0; y < (ssize_t) gaussian_image->rows; y++) { @@ -1763,7 +1763,7 @@ MagickExport Image *LocalContrastImage(const Image *image,const double radius, #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,4) \ - magick_threads(image,image,image->columns,1) + magick_chunk_threads(image,image,image->columns,1) #endif for (x=0; x < (ssize_t) image->columns; x++) { @@ -1842,7 +1842,7 @@ MagickExport Image *LocalContrastImage(const Image *image,const double radius, #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,4) \ - magick_threads(image,image,image->rows,1) + magick_chunk_threads(image,image,image->rows,1) #endif for (y=0; y < (ssize_t) image->rows; y++) { @@ -2087,7 +2087,7 @@ MagickExport Image *MotionBlurImage(const Image *image,const double radius, blur_view=AcquireAuthenticCacheView(blur_image,exception); #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,4) shared(progress,status) \ - magick_threads(image,blur_image,image->rows,1) + magick_chunk_threads(image,blur_image,image->rows,1) #endif for (y=0; y < (ssize_t) image->rows; y++) { @@ -2874,7 +2874,7 @@ MagickExport Image *RotationalBlurImage(const Image *image,const double angle, blur_view=AcquireAuthenticCacheView(blur_image,exception); #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,4) shared(progress,status) \ - magick_threads(image,blur_image,image->rows,1) + magick_chunk_threads(image,blur_image,image->rows,1) #endif for (y=0; y < (ssize_t) image->rows; y++) { @@ -3189,7 +3189,7 @@ MagickExport Image *SelectiveBlurImage(const Image *image,const double radius, blur_view=AcquireAuthenticCacheView(blur_image,exception); #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,4) shared(progress,status) \ - magick_threads(image,blur_image,image->rows,1) + magick_chunk_threads(image,blur_image,image->rows,1) #endif for (y=0; y < (ssize_t) image->rows; y++) { @@ -3463,7 +3463,7 @@ MagickExport Image *ShadeImage(const Image *image,const MagickBooleanType gray, shade_view=AcquireAuthenticCacheView(shade_image,exception); #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,4) shared(progress,status) \ - magick_threads(linear_image,shade_image,linear_image->rows,1) + magick_chunk_threads(linear_image,shade_image,linear_image->rows,1) #endif for (y=0; y < (ssize_t) linear_image->rows; y++) { @@ -3807,7 +3807,7 @@ MagickExport Image *SpreadImage(const Image *image, #if defined(MAGICKCORE_OPENMP_SUPPORT) key=GetRandomSecretKey(random_info[0]); #pragma omp parallel for schedule(static,4) shared(progress,status) \ - magick_threads(image,spread_image,image->rows,key == ~0UL) + magick_chunk_threads(image,spread_image,image->rows,key == ~0UL) #endif for (y=0; y < (ssize_t) image->rows; y++) { @@ -3952,7 +3952,7 @@ MagickExport Image *UnsharpMaskImage(const Image *image,const double radius, unsharp_view=AcquireAuthenticCacheView(unsharp_image,exception); #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,4) shared(progress,status) \ - magick_threads(image,unsharp_image,image->rows,1) + magick_chunk_threads(image,unsharp_image,image->rows,1) #endif for (y=0; y < (ssize_t) image->rows; y++) { diff --git a/MagickCore/enhance.c b/MagickCore/enhance.c index 2e7e789b8..aebf8e9a6 100644 --- a/MagickCore/enhance.c +++ b/MagickCore/enhance.c @@ -353,7 +353,7 @@ MagickExport MagickBooleanType ClutImage(Image *image,const Image *clut_image, image_view=AcquireAuthenticCacheView(image,exception); #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,4) shared(progress,status) \ - magick_threads(image,image,image->rows,1) + magick_chunk_threads(image,image,image->rows,1) #endif for (y=0; y < (ssize_t) image->rows; y++) { @@ -752,7 +752,7 @@ MagickExport MagickBooleanType ColorDecisionListImage(Image *image, image_view=AcquireAuthenticCacheView(image,exception); #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,4) shared(progress,status) \ - magick_threads(image,image,image->rows,1) + magick_chunk_threads(image,image,image->rows,1) #endif for (y=0; y < (ssize_t) image->rows; y++) { @@ -924,7 +924,7 @@ MagickExport MagickBooleanType ContrastImage(Image *image, image_view=AcquireAuthenticCacheView(image,exception); #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,4) shared(progress,status) \ - magick_threads(image,image,image->rows,1) + magick_chunk_threads(image,image,image->rows,1) #endif for (y=0; y < (ssize_t) image->rows; y++) { @@ -1212,7 +1212,7 @@ MagickExport MagickBooleanType ContrastStretchImage(Image *image, image_view=AcquireAuthenticCacheView(image,exception); #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,4) shared(progress,status) \ - magick_threads(image,image,image->rows,1) + magick_chunk_threads(image,image,image->rows,1) #endif for (y=0; y < (ssize_t) image->rows; y++) { @@ -1374,7 +1374,7 @@ MagickExport Image *EnhanceImage(const Image *image,ExceptionInfo *exception) enhance_view=AcquireAuthenticCacheView(enhance_image,exception); #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,4) shared(progress,status) \ - magick_threads(image,enhance_image,image->rows,1) + magick_chunk_threads(image,enhance_image,image->rows,1) #endif for (y=0; y < (ssize_t) image->rows; y++) { @@ -1683,7 +1683,7 @@ MagickExport MagickBooleanType EqualizeImage(Image *image, image_view=AcquireAuthenticCacheView(image,exception); #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,4) shared(progress,status) \ - magick_threads(image,image,image->rows,1) + magick_chunk_threads(image,image,image->rows,1) #endif for (y=0; y < (ssize_t) image->rows; y++) { @@ -1865,7 +1865,7 @@ MagickExport MagickBooleanType GammaImage(Image *image,const double gamma, image_view=AcquireAuthenticCacheView(image,exception); #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,4) shared(progress,status) \ - magick_threads(image,image,image->rows,1) + magick_chunk_threads(image,image,image->rows,1) #endif for (y=0; y < (ssize_t) image->rows; y++) { @@ -2001,7 +2001,7 @@ MagickExport MagickBooleanType GrayscaleImage(Image *image, image_view=AcquireAuthenticCacheView(image,exception); #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,4) shared(progress,status) \ - magick_threads(image,image,image->rows,1) + magick_chunk_threads(image,image,image->rows,1) #endif for (y=0; y < (ssize_t) image->rows; y++) { @@ -2231,7 +2231,7 @@ MagickExport MagickBooleanType HaldClutImage(Image *image, image_view=AcquireAuthenticCacheView(image,exception); #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,4) shared(progress,status) \ - magick_threads(image,image,image->rows,1) + magick_chunk_threads(image,image,image->rows,1) #endif for (y=0; y < (ssize_t) image->rows; y++) { @@ -2438,7 +2438,7 @@ MagickExport MagickBooleanType LevelImage(Image *image,const double black_point, image_view=AcquireAuthenticCacheView(image,exception); #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,4) shared(progress,status) \ - magick_threads(image,image,image->rows,1) + magick_chunk_threads(image,image,image->rows,1) #endif for (y=0; y < (ssize_t) image->rows; y++) { @@ -2594,7 +2594,7 @@ MagickExport MagickBooleanType LevelizeImage(Image *image, image_view=AcquireAuthenticCacheView(image,exception); #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,4) shared(progress,status) \ - magick_threads(image,image,image->rows,1) + magick_chunk_threads(image,image,image->rows,1) #endif for (y=0; y < (ssize_t) image->rows; y++) { @@ -3259,7 +3259,7 @@ MagickExport MagickBooleanType ModulateImage(Image *image,const char *modulate, image_view=AcquireAuthenticCacheView(image,exception); #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,4) shared(progress,status) \ - magick_threads(image,image,image->rows,1) + magick_chunk_threads(image,image,image->rows,1) #endif for (y=0; y < (ssize_t) image->rows; y++) { @@ -3512,7 +3512,7 @@ MagickExport MagickBooleanType NegateImage(Image *image, */ #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,4) shared(progress,status) \ - magick_threads(image,image,image->rows,1) + magick_chunk_threads(image,image,image->rows,1) #endif for (y=0; y < (ssize_t) image->rows; y++) { @@ -3816,7 +3816,7 @@ MagickExport MagickBooleanType SigmoidalContrastImage(Image *image, image_view=AcquireAuthenticCacheView(image,exception); #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,4) shared(progress,status) \ - magick_threads(image,image,image->rows,1) + magick_chunk_threads(image,image,image->rows,1) #endif for (y=0; y < (ssize_t) image->rows; y++) { diff --git a/MagickCore/feature.c b/MagickCore/feature.c index db1c9bbcb..d4c22ac05 100644 --- a/MagickCore/feature.c +++ b/MagickCore/feature.c @@ -311,7 +311,7 @@ MagickExport Image *CannyEdgeImage(const Image *image,const double radius, edge_view=AcquireVirtualCacheView(edge_image,exception); #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,4) shared(status) \ - magick_threads(edge_image,edge_image,edge_image->rows,1) + magick_chunk_threads(edge_image,edge_image,edge_image->rows,1) #endif for (y=0; y < (ssize_t) edge_image->rows; y++) { @@ -423,7 +423,7 @@ MagickExport Image *CannyEdgeImage(const Image *image,const double radius, edge_view=AcquireAuthenticCacheView(edge_image,exception); #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,4) shared(status) \ - magick_threads(edge_image,edge_image,edge_image->rows,1) + magick_chunk_threads(edge_image,edge_image,edge_image->rows,1) #endif for (y=0; y < (ssize_t) edge_image->rows; y++) { @@ -705,7 +705,7 @@ MagickExport ChannelFeatures *GetImageFeatures(const Image *image, image_view=AcquireVirtualCacheView(image,exception); #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,4) shared(status) \ - magick_threads(image,image,image->rows,1) + magick_chunk_threads(image,image,image->rows,1) #endif for (r=0; r < (ssize_t) image->rows; r++) { @@ -1075,7 +1075,7 @@ MagickExport ChannelFeatures *GetImageFeatures(const Image *image, */ #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,4) shared(status) \ - magick_threads(image,image,number_grays,1) + magick_chunk_threads(image,image,number_grays,1) #endif for (i=0; i < 4; i++) { @@ -1260,7 +1260,7 @@ MagickExport ChannelFeatures *GetImageFeatures(const Image *image, */ #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,4) shared(status) \ - magick_threads(image,image,number_grays,1) + magick_chunk_threads(image,image,number_grays,1) #endif for (i=0; i < 4; i++) { @@ -1336,7 +1336,7 @@ MagickExport ChannelFeatures *GetImageFeatures(const Image *image, */ #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,4) shared(status) \ - magick_threads(image,image,number_grays,1) + magick_chunk_threads(image,image,number_grays,1) #endif for (i=0; i < 4; i++) { @@ -1451,7 +1451,7 @@ MagickExport ChannelFeatures *GetImageFeatures(const Image *image, (void) ResetMagickMemory(&sum_squares,0,sizeof(sum_squares)); #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,4) shared(status) \ - magick_threads(image,image,number_grays,1) + magick_chunk_threads(image,image,number_grays,1) #endif for (i=0; i < 4; i++) { @@ -1603,7 +1603,7 @@ MagickExport ChannelFeatures *GetImageFeatures(const Image *image, */ #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,4) shared(status) \ - magick_threads(image,image,number_grays,1) + magick_chunk_threads(image,image,number_grays,1) #endif for (i=0; i < 4; i++) { @@ -2189,7 +2189,7 @@ MagickExport Image *MeanShiftImage(const Image *image,const size_t width, mean_view=AcquireAuthenticCacheView(mean_image,exception); #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,4) shared(status,progress) \ - magick_threads(mean_image,mean_image,mean_image->rows,1) + magick_chunk_threads(mean_image,mean_image,mean_image->rows,1) #endif for (y=0; y < (ssize_t) mean_image->rows; y++) { diff --git a/MagickCore/fourier.c b/MagickCore/fourier.c index e8be9b300..b04fd4f1d 100644 --- a/MagickCore/fourier.c +++ b/MagickCore/fourier.c @@ -226,7 +226,7 @@ MagickExport Image *ComplexImages(const Image *images,const ComplexOperator op, progress=0; #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,4) shared(progress,status) \ - magick_threads(images,complex_images,images->rows,1L) + magick_chunk_threads(images,complex_images,images->rows,1L) #endif for (y=0; y < (ssize_t) images->rows; y++) { diff --git a/MagickCore/fx.c b/MagickCore/fx.c index c8fec9f16..ed80406b8 100644 --- a/MagickCore/fx.c +++ b/MagickCore/fx.c @@ -325,7 +325,7 @@ MagickExport Image *AddNoiseImage(const Image *image,const NoiseType noise_type, #if defined(MAGICKCORE_OPENMP_SUPPORT) key=GetRandomSecretKey(random_info[0]); #pragma omp parallel for schedule(static,4) shared(progress,status) \ - magick_threads(image,noise_image,image->rows,key == ~0UL) + magick_chunk_threads(image,noise_image,image->rows,key == ~0UL) #endif for (y=0; y < (ssize_t) image->rows; y++) { @@ -480,7 +480,7 @@ MagickExport Image *BlueShiftImage(const Image *image,const double factor, shift_view=AcquireAuthenticCacheView(shift_image,exception); #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,4) shared(progress,status) \ - magick_threads(image,shift_image,image->rows,1) + magick_chunk_threads(image,shift_image,image->rows,1) #endif for (y=0; y < (ssize_t) image->rows; y++) { @@ -739,7 +739,7 @@ MagickExport Image *ColorizeImage(const Image *image,const char *blend, image_view=AcquireVirtualCacheView(colorize_image,exception); #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,4) shared(progress,status) \ - magick_threads(colorize_image,colorize_image,colorize_image->rows,1) + magick_chunk_threads(colorize_image,colorize_image,colorize_image->rows,1) #endif for (y=0; y < (ssize_t) colorize_image->rows; y++) { @@ -940,7 +940,7 @@ MagickExport Image *ColorMatrixImage(const Image *image, color_view=AcquireAuthenticCacheView(color_image,exception); #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,4) shared(progress,status) \ - magick_threads(image,color_image,image->rows,1) + magick_chunk_threads(image,color_image,image->rows,1) #endif for (y=0; y < (ssize_t) image->rows; y++) { @@ -3116,7 +3116,7 @@ MagickExport Image *FxImage(const Image *image,const char *expression, fx_view=AcquireAuthenticCacheView(fx_image,exception); #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,4) shared(progress,status) \ - magick_threads(image,fx_image,fx_image->rows,1) + magick_chunk_threads(image,fx_image,fx_image->rows,1) #endif for (y=0; y < (ssize_t) fx_image->rows; y++) { @@ -3314,7 +3314,7 @@ MagickExport Image *ImplodeImage(const Image *image,const double amount, implode_view=AcquireAuthenticCacheView(implode_image,exception); #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,4) shared(progress,status) \ - magick_threads(canvas,implode_image,canvas->rows,1) + magick_chunk_threads(canvas,implode_image,canvas->rows,1) #endif for (y=0; y < (ssize_t) canvas->rows; y++) { @@ -3556,7 +3556,7 @@ MagickExport Image *MorphImages(const Image *image,const size_t number_frames, morph_view=AcquireAuthenticCacheView(morph_images,exception); #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,4) shared(status) \ - magick_threads(morph_image,morph_image,morph_image->rows,1) + magick_chunk_threads(morph_image,morph_image,morph_image->rows,1) #endif for (y=0; y < (ssize_t) morph_images->rows; y++) { @@ -4215,7 +4215,7 @@ MagickExport Image *SepiaToneImage(const Image *image,const double threshold, sepia_view=AcquireAuthenticCacheView(sepia_image,exception); #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,4) shared(progress,status) \ - magick_threads(image,sepia_image,image->rows,1) + magick_chunk_threads(image,sepia_image,image->rows,1) #endif for (y=0; y < (ssize_t) image->rows; y++) { @@ -4509,7 +4509,7 @@ MagickExport Image *SketchImage(const Image *image,const double radius, #if defined(MAGICKCORE_OPENMP_SUPPORT) key=GetRandomSecretKey(random_info[0]); #pragma omp parallel for schedule(static,4) shared(status) \ - magick_threads(random_image,random_image,random_image->rows,key == ~0UL) + magick_chunk_threads(random_image,random_image,random_image->rows,key == ~0UL) #endif for (y=0; y < (ssize_t) random_image->rows; y++) { @@ -4679,7 +4679,7 @@ MagickExport MagickBooleanType SolarizeImage(Image *image, image_view=AcquireAuthenticCacheView(image,exception); #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,4) shared(progress,status) \ - magick_threads(image,image,image->rows,1) + magick_chunk_threads(image,image,image->rows,1) #endif for (y=0; y < (ssize_t) image->rows; y++) { @@ -5164,7 +5164,7 @@ MagickExport Image *SwirlImage(const Image *image,double degrees, swirl_view=AcquireAuthenticCacheView(swirl_image,exception); #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,4) shared(progress,status) \ - magick_threads(canvas,swirl_image,canvas->rows,1) + magick_chunk_threads(canvas,swirl_image,canvas->rows,1) #endif for (y=0; y < (ssize_t) canvas->rows; y++) { @@ -5393,7 +5393,7 @@ MagickExport Image *TintImage(const Image *image,const char *blend, tint_view=AcquireAuthenticCacheView(tint_image,exception); #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,4) shared(progress,status) \ - magick_threads(image,tint_image,image->rows,1) + magick_chunk_threads(image,tint_image,image->rows,1) #endif for (y=0; y < (ssize_t) image->rows; y++) { @@ -5697,7 +5697,7 @@ MagickExport Image *WaveImage(const Image *image,const double amplitude, BackgroundVirtualPixelMethod); #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,4) shared(progress,status) \ - magick_threads(canvas,wave_image,wave_image->rows,1) + magick_chunk_threads(canvas,wave_image,wave_image->rows,1) #endif for (y=0; y < (ssize_t) wave_image->rows; y++) { @@ -5960,7 +5960,7 @@ MagickExport Image *WaveletDenoiseImage(const Image *image, low_pass=(size_t) (number_pixels*((level & 0x01)+1)); #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,1) \ - magick_threads(image,image,image->rows,1) + magick_chunk_threads(image,image,image->rows,1) #endif for (y=0; y < (ssize_t) image->rows; y++) { @@ -5983,7 +5983,7 @@ MagickExport Image *WaveletDenoiseImage(const Image *image, } #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,1) \ - magick_threads(image,image,image->columns,1) + magick_chunk_threads(image,image,image->columns,1) #endif for (x=0; x < (ssize_t) image->columns; x++) { diff --git a/MagickCore/image-view.c b/MagickCore/image-view.c index 9fcbc9c6f..b0b12c2a7 100644 --- a/MagickCore/image-view.c +++ b/MagickCore/image-view.c @@ -244,7 +244,7 @@ MagickExport MagickBooleanType DuplexTransferImageViewIterator( #if defined(MAGICKCORE_OPENMP_SUPPORT) height=source->extent.height-source->extent.y; #pragma omp parallel for schedule(static,4) shared(progress,status) \ - magick_threads(source_image,destination_image,height,1) + magick_chunk_threads(source_image,destination_image,height,1) #endif for (y=source->extent.y; y < (ssize_t) source->extent.height; y++) { @@ -556,7 +556,7 @@ MagickExport MagickBooleanType GetImageViewIterator(ImageView *source, #if defined(MAGICKCORE_OPENMP_SUPPORT) height=source->extent.height-source->extent.y; #pragma omp parallel for schedule(static,4) shared(progress,status) \ - magick_threads(source_image,source_image,height,1) + magick_chunk_threads(source_image,source_image,height,1) #endif for (y=source->extent.y; y < (ssize_t) source->extent.height; y++) { @@ -904,7 +904,7 @@ MagickExport MagickBooleanType SetImageViewIterator(ImageView *destination, #if defined(MAGICKCORE_OPENMP_SUPPORT) height=destination->extent.height-destination->extent.y; #pragma omp parallel for schedule(static,4) shared(progress,status) \ - magick_threads(destination_image,destination_image,height,1) + magick_chunk_threads(destination_image,destination_image,height,1) #endif for (y=destination->extent.y; y < (ssize_t) destination->extent.height; y++) { @@ -1032,7 +1032,7 @@ MagickExport MagickBooleanType TransferImageViewIterator(ImageView *source, #if defined(MAGICKCORE_OPENMP_SUPPORT) height=source->extent.height-source->extent.y; #pragma omp parallel for schedule(static,4) shared(progress,status) \ - magick_threads(source_image,destination_image,height,1) + magick_chunk_threads(source_image,destination_image,height,1) #endif for (y=source->extent.y; y < (ssize_t) source->extent.height; y++) { @@ -1163,7 +1163,7 @@ MagickExport MagickBooleanType UpdateImageViewIterator(ImageView *source, #if defined(MAGICKCORE_OPENMP_SUPPORT) height=source->extent.height-source->extent.y; #pragma omp parallel for schedule(static,4) shared(progress,status) \ - magick_threads(source_image,source_image,height,1) + magick_chunk_threads(source_image,source_image,height,1) #endif for (y=source->extent.y; y < (ssize_t) source->extent.height; y++) { diff --git a/MagickCore/image.c b/MagickCore/image.c index c63fdfcdd..1875afcac 100644 --- a/MagickCore/image.c +++ b/MagickCore/image.c @@ -552,7 +552,7 @@ MagickExport Image *AppendImages(const Image *images, image_view=AcquireVirtualCacheView(next,exception); #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,4) shared(status) \ - magick_threads(next,next,next->rows,1) + magick_chunk_threads(next,next,next->rows,1) #endif for (y=0; y < (ssize_t) next->rows; y++) { @@ -1084,7 +1084,7 @@ MagickExport MagickBooleanType CopyImagePixels(Image *image, image_view=AcquireAuthenticCacheView(image,exception); #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,4) shared(progress,status) \ - magick_threads(image,source_image,geometry->height,1) + magick_chunk_threads(image,source_image,geometry->height,1) #endif for (y=0; y < (ssize_t) geometry->height; y++) { @@ -1804,7 +1804,7 @@ MagickExport MagickBooleanType IsHighDynamicRangeImage(const Image *image, image_view=AcquireVirtualCacheView(image,exception); #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,4) shared(status) \ - magick_threads(image,image,image->rows,1) + magick_chunk_threads(image,image,image->rows,1) #endif for (y=0; y < (ssize_t) image->rows; y++) { @@ -2059,7 +2059,7 @@ MagickExport Image *NewMagickImage(const ImageInfo *image_info, image_view=AcquireAuthenticCacheView(image,exception); #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,4) shared(status) \ - magick_threads(image,image,image->rows,1) + magick_chunk_threads(image,image,image->rows,1) #endif for (y=0; y < (ssize_t) image->rows; y++) { @@ -2242,7 +2242,7 @@ MagickExport MagickBooleanType SetImageAlpha(Image *image,const Quantum alpha, image_view=AcquireAuthenticCacheView(image,exception); #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,4) shared(status) \ - magick_threads(image,image,image->rows,1) + magick_chunk_threads(image,image,image->rows,1) #endif for (y=0; y < (ssize_t) image->rows; y++) { @@ -2442,7 +2442,7 @@ MagickExport MagickBooleanType SetImageColor(Image *image, image_view=AcquireAuthenticCacheView(image,exception); #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,4) shared(status) \ - magick_threads(image,image,image->rows,1) + magick_chunk_threads(image,image,image->rows,1) #endif for (y=0; y < (ssize_t) image->rows; y++) { @@ -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_threads(mask,image,1,1) + magick_chunk_threads(mask,image,1,1) #endif for (y=0; y < (ssize_t) image->rows; y++) { @@ -3229,7 +3229,7 @@ MagickExport MagickBooleanType SetImageRegionMask(Image *image, image_view=AcquireAuthenticCacheView(image,exception); #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,4) shared(status) \ - magick_threads(image,image,1,1) + magick_number_threads(image,image,2) #endif for (y=0; y < (ssize_t) image->rows; y++) { @@ -3726,7 +3726,7 @@ MagickExport MagickBooleanType SyncImage(Image *image,ExceptionInfo *exception) image_view=AcquireAuthenticCacheView(image,exception); #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,4) shared(range_exception,status) \ - magick_threads(image,image,image->rows,1) + magick_chunk_threads(image,image,image->rows,1) #endif for (y=0; y < (ssize_t) image->rows; y++) { diff --git a/MagickCore/matrix.c b/MagickCore/matrix.c index ec916b86e..4467f6aef 100644 --- a/MagickCore/matrix.c +++ b/MagickCore/matrix.c @@ -943,7 +943,7 @@ MagickExport Image *MatrixToImage(const MatrixInfo *matrix_info, image_view=AcquireAuthenticCacheView(image,exception); #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,4) shared(status) \ - magick_threads(image,image,image->rows,1) + magick_chunk_threads(image,image,image->rows,1) #endif for (y=0; y < (ssize_t) image->rows; y++) { diff --git a/MagickCore/morphology.c b/MagickCore/morphology.c index 25c4ad67e..dd4e31f30 100644 --- a/MagickCore/morphology.c +++ b/MagickCore/morphology.c @@ -2652,7 +2652,7 @@ static ssize_t MorphologyPrimitive(const Image *image,Image *morphology_image, */ #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,4) shared(progress,status) \ - magick_threads(image,morphology_image,image->columns,1) + magick_chunk_threads(image,morphology_image,image->columns,1) #endif for (x=0; x < (ssize_t) image->columns; x++) { @@ -2796,7 +2796,7 @@ static ssize_t MorphologyPrimitive(const Image *image,Image *morphology_image, */ #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,4) shared(progress,status) \ - magick_threads(image,morphology_image,image->rows,1) + magick_chunk_threads(image,morphology_image,image->rows,1) #endif for (y=0; y < (ssize_t) image->rows; y++) { diff --git a/MagickCore/paint.c b/MagickCore/paint.c index 1e386a7ff..b27bdb0d1 100644 --- a/MagickCore/paint.c +++ b/MagickCore/paint.c @@ -755,7 +755,7 @@ MagickExport Image *OilPaintImage(const Image *image,const double radius, paint_view=AcquireAuthenticCacheView(paint_image,exception); #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,4) shared(progress,status) \ - magick_threads(linear_image,paint_image,linear_image->rows,1) + magick_chunk_threads(linear_image,paint_image,linear_image->rows,1) #endif for (y=0; y < (ssize_t) linear_image->rows; y++) { @@ -946,7 +946,7 @@ MagickExport MagickBooleanType OpaquePaintImage(Image *image, image_view=AcquireAuthenticCacheView(image,exception); #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,4) shared(progress,status) \ - magick_threads(image,image,image->rows,1) + magick_chunk_threads(image,image,image->rows,1) #endif for (y=0; y < (ssize_t) image->rows; y++) { @@ -1097,7 +1097,7 @@ MagickExport MagickBooleanType TransparentPaintImage(Image *image, image_view=AcquireAuthenticCacheView(image,exception); #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,4) shared(progress,status) \ - magick_threads(image,image,image->rows,1) + magick_chunk_threads(image,image,image->rows,1) #endif for (y=0; y < (ssize_t) image->rows; y++) { @@ -1229,7 +1229,7 @@ MagickExport MagickBooleanType TransparentPaintImageChroma(Image *image, image_view=AcquireAuthenticCacheView(image,exception); #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,4) shared(progress,status) \ - magick_threads(image,image,image->rows,1) + magick_chunk_threads(image,image,image->rows,1) #endif for (y=0; y < (ssize_t) image->rows; y++) { diff --git a/MagickCore/prepress.c b/MagickCore/prepress.c index 7f3758b38..4096fea3f 100644 --- a/MagickCore/prepress.c +++ b/MagickCore/prepress.c @@ -113,7 +113,7 @@ MagickExport double GetImageTotalInkDensity(Image *image, image_view=AcquireVirtualCacheView(image,exception); #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,4) shared(status) \ - magick_threads(image,image,image->rows,1) + magick_chunk_threads(image,image,image->rows,1) #endif for (y=0; y < (ssize_t) image->rows; y++) { diff --git a/MagickCore/profile.c b/MagickCore/profile.c index 2204b1623..fa4aae7a9 100644 --- a/MagickCore/profile.c +++ b/MagickCore/profile.c @@ -1107,7 +1107,7 @@ MagickExport MagickBooleanType ProfileImage(Image *image,const char *name, image_view=AcquireAuthenticCacheView(image,exception); #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,4) shared(status) \ - magick_threads(image,image,image->rows,1) + magick_chunk_threads(image,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 7eb5d755d..17f741ae0 100644 --- a/MagickCore/quantize.c +++ b/MagickCore/quantize.c @@ -534,7 +534,7 @@ static MagickBooleanType AssignImageColors(Image *image,CubeInfo *cube_info, image_view=AcquireAuthenticCacheView(image,exception); #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,4) shared(status) \ - magick_threads(image,image,image->rows,1) + magick_chunk_threads(image,image,image->rows,1) #endif for (y=0; y < (ssize_t) image->rows; y++) { @@ -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_threads(image,image,1,1) + magick_number_threads(image,image,2) #endif for (i=0; i < (ssize_t) image->colors; i++) { @@ -2401,7 +2401,7 @@ MagickExport MagickBooleanType PosterizeImage(Image *image,const size_t levels, image_view=AcquireAuthenticCacheView(image,exception); #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,4) shared(progress,status) \ - magick_threads(image,image,image->rows,1) + magick_chunk_threads(image,image,image->rows,1) #endif for (y=0; y < (ssize_t) image->rows; y++) { @@ -3339,7 +3339,7 @@ static MagickBooleanType SetGrayscaleImage(Image *image, image_view=AcquireAuthenticCacheView(image,exception); #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,4) shared(status) \ - magick_threads(image,image,image->rows,1) + magick_chunk_threads(image,image,image->rows,1) #endif for (y=0; y < (ssize_t) image->rows; y++) { @@ -3418,7 +3418,7 @@ static MagickBooleanType SetGrayscaleImage(Image *image, image_view=AcquireAuthenticCacheView(image,exception); #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,4) shared(status) \ - magick_threads(image,image,image->rows,1) + magick_chunk_threads(image,image,image->rows,1) #endif for (y=0; y < (ssize_t) image->rows; y++) { diff --git a/MagickCore/resize.c b/MagickCore/resize.c index 3b089e72d..3234a3e69 100644 --- a/MagickCore/resize.c +++ b/MagickCore/resize.c @@ -1758,7 +1758,7 @@ MagickExport Image *InterpolativeResizeImage(const Image *image, scale.y=(double) image->rows/resize_image->rows; #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,4) shared(progress,status) \ - magick_threads(image,resize_image,resize_image->rows,1) + magick_chunk_threads(image,resize_image,resize_image->rows,1) #endif for (y=0; y < (ssize_t) resize_image->rows; y++) { @@ -2105,7 +2105,7 @@ MagickExport Image *MagnifyImage(const Image *image,ExceptionInfo *exception) magnify_view=AcquireAuthenticCacheView(magnify_image,exception); #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,4) shared(progress,status) \ - magick_threads(image,magnify_image,image->rows,1) + magick_chunk_threads(image,magnify_image,image->rows,1) #endif for (y=0; y < (ssize_t) image->rows; y++) { @@ -2483,7 +2483,7 @@ static MagickBooleanType HorizontalFilter(const ResizeFilter *resize_filter, resize_view=AcquireAuthenticCacheView(resize_image,exception); #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,4) shared(status) \ - magick_threads(image,resize_image,resize_image->columns,1) + magick_chunk_threads(image,resize_image,resize_image->columns,1) #endif for (x=0; x < (ssize_t) resize_image->columns; x++) { @@ -2698,7 +2698,7 @@ static MagickBooleanType VerticalFilter(const ResizeFilter *resize_filter, resize_view=AcquireAuthenticCacheView(resize_image,exception); #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,4) shared(status) \ - magick_threads(image,resize_image,resize_image->rows,1) + magick_chunk_threads(image,resize_image,resize_image->rows,1) #endif for (y=0; y < (ssize_t) resize_image->rows; y++) { @@ -3094,7 +3094,7 @@ MagickExport Image *SampleImage(const Image *image,const size_t columns, sample_view=AcquireAuthenticCacheView(sample_image,exception); #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,4) shared(status) \ - magick_threads(image,sample_image,1,1) + magick_number_threads(image,sample_image,2) #endif for (y=0; y < (ssize_t) sample_image->rows; y++) { diff --git a/MagickCore/segment.c b/MagickCore/segment.c index 2c652603d..555961822 100644 --- a/MagickCore/segment.c +++ b/MagickCore/segment.c @@ -536,7 +536,7 @@ static MagickBooleanType Classify(Image *image,short **extrema, image_view=AcquireAuthenticCacheView(image,exception); #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,4) shared(progress,status) \ - magick_threads(image,image,image->rows,1) + magick_chunk_threads(image,image,image->rows,1) #endif for (y=0; y < (ssize_t) image->rows; y++) { diff --git a/MagickCore/shear.c b/MagickCore/shear.c index d7f40a24e..3a4f9a4ae 100644 --- 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_threads(image,image,1,1) + magick_number_threads(image,image,2) #endif for (x=0; x < (ssize_t) GetMatrixColumns(p); x++) { @@ -380,7 +380,7 @@ static MagickBooleanType RadonTransform(const Image *image, image_view=AcquireVirtualCacheView(image,exception); #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,4) shared(status) \ - magick_threads(image,image,1,1) + magick_number_threads(image,image,2) #endif for (y=0; y < (ssize_t) image->rows; y++) { @@ -437,7 +437,7 @@ static MagickBooleanType RadonTransform(const Image *image, (void) NullMatrix(source_matrixs); #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,4) shared(status) \ - magick_threads(image,image,image->rows,1) + magick_chunk_threads(image,image,image->rows,1) #endif for (y=0; y < (ssize_t) image->rows; y++) { @@ -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_threads(image,image,1,1) + magick_number_threads(image,image,2) #endif for (tile_y=0; tile_y < (ssize_t) image->rows; tile_y+=(ssize_t) tile_height) { @@ -887,7 +887,7 @@ MagickExport Image *IntegralRotateImage(const Image *image,size_t rotations, */ #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,4) shared(status) \ - magick_threads(image,image,1,1) + magick_number_threads(image,image,2) #endif for (y=0; y < (ssize_t) image->rows; y++) { @@ -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_threads(image,image,1,1) + magick_number_threads(image,image,2) #endif for (tile_y=0; tile_y < (ssize_t) image->rows; tile_y+=(ssize_t) tile_height) { @@ -1178,7 +1178,7 @@ static MagickBooleanType XShearImage(Image *image,const double degrees, image_view=AcquireAuthenticCacheView(image,exception); #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,4) shared(progress,status) \ - magick_threads(image,image,height,1) + magick_chunk_threads(image,image,height,1) #endif for (y=0; y < (ssize_t) height; y++) { @@ -1394,7 +1394,7 @@ static MagickBooleanType YShearImage(Image *image,const double degrees, image_view=AcquireAuthenticCacheView(image,exception); #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,4) shared(progress,status) \ - magick_threads(image,image,width,1) + magick_chunk_threads(image,image,width,1) #endif for (x=0; x < (ssize_t) width; x++) { diff --git a/MagickCore/statistic.c b/MagickCore/statistic.c index 16b9694a1..402306437 100644 --- a/MagickCore/statistic.c +++ b/MagickCore/statistic.c @@ -510,7 +510,7 @@ MagickExport Image *EvaluateImages(const Image *images, #if defined(MAGICKCORE_OPENMP_SUPPORT) key=GetRandomSecretKey(random_info[0]); #pragma omp parallel for schedule(static,4) shared(progress,status) \ - magick_threads(image,images,image->rows,key == ~0UL) + magick_chunk_threads(image,images,image->rows,key == ~0UL) #endif for (y=0; y < (ssize_t) image->rows; y++) { @@ -612,7 +612,7 @@ MagickExport Image *EvaluateImages(const Image *images, #if defined(MAGICKCORE_OPENMP_SUPPORT) key=GetRandomSecretKey(random_info[0]); #pragma omp parallel for schedule(static,4) shared(progress,status) \ - magick_threads(image,images,image->rows,key == ~0UL) + magick_chunk_threads(image,images,image->rows,key == ~0UL) #endif for (y=0; y < (ssize_t) image->rows; y++) { @@ -815,7 +815,7 @@ MagickExport MagickBooleanType EvaluateImage(Image *image, #if defined(MAGICKCORE_OPENMP_SUPPORT) key=GetRandomSecretKey(random_info[0]); #pragma omp parallel for schedule(static,4) shared(progress,status) \ - magick_threads(image,image,image->rows,key == ~0UL) + magick_chunk_threads(image,image,image->rows,key == ~0UL) #endif for (y=0; y < (ssize_t) image->rows; y++) { @@ -1050,7 +1050,7 @@ MagickExport MagickBooleanType FunctionImage(Image *image, image_view=AcquireAuthenticCacheView(image,exception); #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,4) shared(progress,status) \ - magick_threads(image,image,image->rows,1) + magick_chunk_threads(image,image,image->rows,1) #endif for (y=0; y < (ssize_t) image->rows; y++) { @@ -1824,7 +1824,7 @@ MagickExport MagickBooleanType GetImageRange(const Image *image,double *minima, image_view=AcquireVirtualCacheView(image,exception); #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,4) shared(status,initialize) \ - magick_threads(image,image,image->rows,1) + magick_chunk_threads(image,image,image->rows,1) #endif for (y=0; y < (ssize_t) image->rows; y++) { @@ -2236,7 +2236,7 @@ MagickExport Image *PolynomialImage(const Image *images, polynomial_view=AcquireAuthenticCacheView(image,exception); #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,4) shared(progress,status) \ - magick_threads(image,image,image->rows,1) + magick_chunk_threads(image,image,image->rows,1) #endif for (y=0; y < (ssize_t) image->rows; y++) { @@ -2918,7 +2918,7 @@ MagickExport Image *StatisticImage(const Image *image,const StatisticType type, statistic_view=AcquireAuthenticCacheView(statistic_image,exception); #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,4) shared(progress,status) \ - magick_threads(image,statistic_image,statistic_image->rows,1) + magick_chunk_threads(image,statistic_image,statistic_image->rows,1) #endif for (y=0; y < (ssize_t) statistic_image->rows; y++) { diff --git a/MagickCore/thread-private.h b/MagickCore/thread-private.h index fef7e1796..c3696accd 100644 --- a/MagickCore/thread-private.h +++ b/MagickCore/thread-private.h @@ -30,13 +30,20 @@ extern "C" { /* Single threaded unless workload justifies the threading overhead. */ -#define magick_threads(source,destination,chunk,expression) \ +#define magick_chunk_threads(source,destination,chunk,expression) \ num_threads((((expression) != 0) && \ ((GetImagePixelCacheType(source) == MemoryCache) || \ (GetImagePixelCacheType(source) == MapCache)) && \ ((GetImagePixelCacheType(destination) == MemoryCache) || \ (GetImagePixelCacheType(destination) == MapCache))) ? \ MagickMax(1,MagickMin(GetMagickResourceLimit(ThreadResource),(chunk)/16)) : 1) +#define magick_number_threads(source,destination,number_threads) \ + num_threads(( \ + ((GetImagePixelCacheType(source) == MemoryCache) || \ + (GetImagePixelCacheType(source) == MapCache)) && \ + ((GetImagePixelCacheType(destination) == MemoryCache) || \ + (GetImagePixelCacheType(destination) == MapCache))) ? \ + MagickMax(MagickMin(GetMagickResourceLimit(ThreadResource),number_threads),1) : 1) #if defined(__clang__) || (__GNUC__ > 3) || ((__GNUC__ == 3) && (__GNUC_MINOR__ > 10)) #define MagickCachePrefetch(address,mode,locality) \ diff --git a/MagickCore/threshold.c b/MagickCore/threshold.c index ab2e4a2d8..c74952d03 100644 --- a/MagickCore/threshold.c +++ b/MagickCore/threshold.c @@ -228,7 +228,7 @@ MagickExport Image *AdaptiveThresholdImage(const Image *image, threshold_view=AcquireAuthenticCacheView(threshold_image,exception); #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,4) shared(progress,status) \ - magick_threads(image,threshold_image,image->rows,1) + magick_chunk_threads(image,threshold_image,image->rows,1) #endif for (y=0; y < (ssize_t) image->rows; y++) { @@ -831,7 +831,7 @@ MagickExport MagickBooleanType BilevelImage(Image *image,const double threshold, image_view=AcquireAuthenticCacheView(image,exception); #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,4) shared(progress,status) \ - magick_threads(image,image,image->rows,1) + magick_chunk_threads(image,image,image->rows,1) #endif for (y=0; y < (ssize_t) image->rows; y++) { @@ -996,7 +996,7 @@ MagickExport MagickBooleanType BlackThresholdImage(Image *image, image_view=AcquireAuthenticCacheView(image,exception); #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,4) shared(progress,status) \ - magick_threads(image,image,image->rows,1) + magick_chunk_threads(image,image,image->rows,1) #endif for (y=0; y < (ssize_t) image->rows; y++) { @@ -1135,7 +1135,7 @@ MagickExport MagickBooleanType ClampImage(Image *image,ExceptionInfo *exception) image_view=AcquireAuthenticCacheView(image,exception); #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,4) shared(progress,status) \ - magick_threads(image,image,image->rows,1) + magick_chunk_threads(image,image,image->rows,1) #endif for (y=0; y < (ssize_t) image->rows; y++) { @@ -1772,7 +1772,7 @@ MagickExport MagickBooleanType OrderedDitherImage(Image *image, image_view=AcquireAuthenticCacheView(image,exception); #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,4) shared(progress,status) \ - magick_threads(image,image,image->rows,1) + magick_chunk_threads(image,image,image->rows,1) #endif for (y=0; y < (ssize_t) image->rows; y++) { @@ -1943,7 +1943,7 @@ MagickExport MagickBooleanType PerceptibleImage(Image *image, image_view=AcquireAuthenticCacheView(image,exception); #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,4) shared(progress,status) \ - magick_threads(image,image,image->rows,1) + magick_chunk_threads(image,image,image->rows,1) #endif for (y=0; y < (ssize_t) image->rows; y++) { @@ -2077,7 +2077,7 @@ MagickExport MagickBooleanType RandomThresholdImage(Image *image, #if defined(MAGICKCORE_OPENMP_SUPPORT) key=GetRandomSecretKey(random_info[0]); #pragma omp parallel for schedule(static,4) shared(progress,status) \ - magick_threads(image,image,image->rows,key == ~0UL) + magick_chunk_threads(image,image,image->rows,key == ~0UL) #endif for (y=0; y < (ssize_t) image->rows; y++) { @@ -2251,7 +2251,7 @@ MagickExport MagickBooleanType WhiteThresholdImage(Image *image, image_view=AcquireAuthenticCacheView(image,exception); #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,4) shared(progress,status) \ - magick_threads(image,image,image->rows,1) + magick_chunk_threads(image,image,image->rows,1) #endif for (y=0; y < (ssize_t) image->rows; y++) { diff --git a/MagickCore/transform.c b/MagickCore/transform.c index 2e04575d3..814480170 100644 --- a/MagickCore/transform.c +++ b/MagickCore/transform.c @@ -252,7 +252,7 @@ MagickExport Image *ChopImage(const Image *image,const RectangleInfo *chop_info, chop_view=AcquireAuthenticCacheView(chop_image,exception); #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,4) shared(status) \ - magick_threads(image,chop_image,1,1) + magick_number_threads(image,chop_image,2) #endif for (y=0; y < (ssize_t) extent.y; y++) { @@ -316,7 +316,7 @@ MagickExport Image *ChopImage(const Image *image,const RectangleInfo *chop_info, */ #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,4) shared(progress,status) \ - magick_threads(image,chop_image,1,1) + magick_number_threads(image,chop_image,2) #endif for (y=0; y < (ssize_t) (image->rows-(extent.y+extent.height)); y++) { @@ -669,7 +669,7 @@ MagickExport Image *CropImage(const Image *image,const RectangleInfo *geometry, crop_view=AcquireAuthenticCacheView(crop_image,exception); #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,4) shared(status) \ - magick_threads(image,crop_image,1,1) + magick_number_threads(image,crop_image,2) #endif for (y=0; y < (ssize_t) crop_image->rows; y++) { @@ -1022,7 +1022,7 @@ MagickExport Image *ExcerptImage(const Image *image, excerpt_view=AcquireAuthenticCacheView(excerpt_image,exception); #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,4) shared(progress,status) \ - magick_threads(image,excerpt_image,excerpt_image->rows,1) + magick_chunk_threads(image,excerpt_image,excerpt_image->rows,1) #endif for (y=0; y < (ssize_t) excerpt_image->rows; y++) { @@ -1221,7 +1221,7 @@ MagickExport Image *FlipImage(const Image *image,ExceptionInfo *exception) flip_view=AcquireAuthenticCacheView(flip_image,exception); #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,4) shared(status) \ - magick_threads(image,flip_image,1,1) + magick_number_threads(image,flip_image,2) #endif for (y=0; y < (ssize_t) flip_image->rows; y++) { @@ -1362,7 +1362,7 @@ MagickExport Image *FlopImage(const Image *image,ExceptionInfo *exception) flop_view=AcquireAuthenticCacheView(flop_image,exception); #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,4) shared(status) \ - magick_threads(image,flop_image,1,1) + magick_number_threads(image,flop_image,2) #endif for (y=0; y < (ssize_t) flop_image->rows; y++) { @@ -1485,7 +1485,7 @@ static MagickBooleanType CopyImageRegion(Image *destination,const Image *source, destination_view=AcquireAuthenticCacheView(destination,exception); #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,4) shared(status) \ - magick_threads(source,destination,rows,1) + magick_chunk_threads(source,destination,rows,1) #endif for (y=0; y < (ssize_t) rows; y++) { @@ -1817,7 +1817,7 @@ MagickExport Image *SpliceImage(const Image *image, splice_view=AcquireAuthenticCacheView(splice_image,exception); #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,4) shared(progress,status) \ - magick_threads(image,splice_image,1,1) + magick_number_threads(image,splice_image,2) #endif for (y=0; y < (ssize_t) splice_geometry.y; y++) { @@ -1919,7 +1919,7 @@ MagickExport Image *SpliceImage(const Image *image, } #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,4) shared(progress,status) \ - magick_threads(image,splice_image,1,1) + magick_number_threads(image,splice_image,2) #endif for (y=(ssize_t) (splice_geometry.y+splice_geometry.height); y < (ssize_t) splice_image->rows; y++) @@ -2196,7 +2196,7 @@ MagickExport Image *TransposeImage(const Image *image,ExceptionInfo *exception) transpose_view=AcquireAuthenticCacheView(transpose_image,exception); #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,4) shared(progress,status) \ - magick_threads(image,transpose_image,image->rows,1) + magick_chunk_threads(image,transpose_image,image->rows,1) #endif for (y=0; y < (ssize_t) image->rows; y++) { @@ -2341,7 +2341,7 @@ MagickExport Image *TransverseImage(const Image *image,ExceptionInfo *exception) transverse_view=AcquireAuthenticCacheView(transverse_image,exception); #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,4) shared(progress,status) \ - magick_threads(image,transverse_image,image->rows,1) + magick_chunk_threads(image,transverse_image,image->rows,1) #endif for (y=0; y < (ssize_t) image->rows; y++) { diff --git a/MagickWand/wand-view.c b/MagickWand/wand-view.c index 7e8adfadc..6cacea38b 100644 --- a/MagickWand/wand-view.c +++ b/MagickWand/wand-view.c @@ -292,7 +292,7 @@ WandExport MagickBooleanType DuplexTransferWandViewIterator(WandView *source, #if defined(MAGICKCORE_OPENMP_SUPPORT) height=source->extent.height-source->extent.y; #pragma omp parallel for schedule(static,4) shared(progress,status) \ - magick_threads(source_image,destination_image,height,1) + magick_chunk_threads(source_image,destination_image,height,1) #endif for (y=source->extent.y; y < (ssize_t) source->extent.height; y++) { @@ -545,7 +545,7 @@ WandExport MagickBooleanType GetWandViewIterator(WandView *source, #if defined(MAGICKCORE_OPENMP_SUPPORT) height=source->extent.height-source->extent.y; #pragma omp parallel for schedule(static,4) shared(progress,status) \ - magick_threads(source_image,source_image,height,1) + magick_chunk_threads(source_image,source_image,height,1) #endif for (y=source->extent.y; y < (ssize_t) source->extent.height; y++) { @@ -948,7 +948,7 @@ WandExport MagickBooleanType SetWandViewIterator(WandView *destination, #if defined(MAGICKCORE_OPENMP_SUPPORT) height=destination->extent.height-destination->extent.y; #pragma omp parallel for schedule(static,4) shared(progress,status) \ - magick_threads(destination_image,destination_image,height,1) + magick_chunk_threads(destination_image,destination_image,height,1) #endif for (y=destination->extent.y; y < (ssize_t) destination->extent.height; y++) { @@ -1085,7 +1085,7 @@ WandExport MagickBooleanType TransferWandViewIterator(WandView *source, #if defined(MAGICKCORE_OPENMP_SUPPORT) height=source->extent.height-source->extent.y; #pragma omp parallel for schedule(static,4) shared(progress,status) \ - magick_threads(source_image,destination_image,height,1) + magick_chunk_threads(source_image,destination_image,height,1) #endif for (y=source->extent.y; y < (ssize_t) source->extent.height; y++) { @@ -1239,7 +1239,7 @@ WandExport MagickBooleanType UpdateWandViewIterator(WandView *source, #if defined(MAGICKCORE_OPENMP_SUPPORT) height=source->extent.height-source->extent.y; #pragma omp parallel for schedule(static,4) shared(progress,status) \ - magick_threads(source_image,source_image,height,1) + magick_chunk_threads(source_image,source_image,height,1) #endif for (y=source->extent.y; y < (ssize_t) source->extent.height; y++) { diff --git a/coders/psd.c b/coders/psd.c index 096172ddd..6ddb65d6a 100644 --- a/coders/psd.c +++ b/coders/psd.c @@ -319,7 +319,7 @@ static MagickBooleanType CorrectPSDAlphaBlend(const ImageInfo *image_info, status=MagickTrue; #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,4) shared(status) \ - magick_threads(image,image,image->rows,1) + magick_chunk_threads(image,image,image->rows,1) #endif for (y=0; y < (ssize_t) image->rows; y++) { @@ -397,7 +397,7 @@ static MagickBooleanType ApplyPSDLayerOpacity(Image *image,Quantum opacity, status=MagickTrue; #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,4) shared(status) \ - magick_threads(image,image,image->rows,1) + magick_chunk_threads(image,image,image->rows,1) #endif for (y=0; y < (ssize_t) image->rows; y++) { @@ -468,7 +468,7 @@ static MagickBooleanType ApplyPSDOpacityMask(Image *image,const Image *mask, image->alpha_trait=BlendPixelTrait; #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,4) shared(status) \ - magick_threads(image,image,image->rows,1) + magick_chunk_threads(image,image,image->rows,1) #endif for (y=0; y < (ssize_t) image->rows; y++) { diff --git a/configure b/configure index 2875fecbc..c23faef7f 100755 --- a/configure +++ b/configure @@ -4534,7 +4534,7 @@ MAGICK_PATCHLEVEL_VERSION=8 MAGICK_VERSION=7.0.7-8 -MAGICK_GIT_REVISION=21434:e719ae34e:20171007 +MAGICK_GIT_REVISION=21449:27531f37f:20171008 # Substitute library versioning -- 2.40.0