From: cristy Date: Mon, 7 May 2012 23:08:14 +0000 (+0000) Subject: (no commit message) X-Git-Tag: 7.0.1-0~5639 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=ddacdd1e1792a764ee0aa75ba349759ee73f46df;p=imagemagick --- diff --git a/MagickCore/attribute.c b/MagickCore/attribute.c index 806b05b62..668abd88d 100644 --- a/MagickCore/attribute.c +++ b/MagickCore/attribute.c @@ -169,7 +169,7 @@ MagickExport RectangleInfo GetImageBoundingBox(const Image *image, GetPixelInfo(image,&zero); #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,4) shared(status) \ - dynamic_num_threads_dos(image->columns,image->rows) + dynamic_number_threads(image->columns,image->rows,1) #endif for (y=0; y < (ssize_t) image->rows; y++) { @@ -388,7 +388,7 @@ MagickExport size_t GetImageDepth(const Image *image,ExceptionInfo *exception) } #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,4) shared(status) \ - dynamic_num_threads_dos(image->columns,image->rows) + dynamic_number_threads(image->columns,image->rows,1) #endif for (y=0; y < (ssize_t) image->rows; y++) { @@ -452,7 +452,7 @@ MagickExport size_t GetImageDepth(const Image *image,ExceptionInfo *exception) */ #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,4) shared(status) \ - dynamic_num_threads_dos(image->columns,image->rows) + dynamic_number_threads(image->columns,image->rows,1) #endif for (y=0; y < (ssize_t) image->rows; y++) { @@ -936,7 +936,7 @@ MagickExport MagickBooleanType SetImageDepth(Image *image, #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static) shared(status) \ - dynamic_num_threads_uno(image->colors) + dynamic_number_threads(image->columns,1,1) #endif for (i=0; i < (ssize_t) image->colors; i++) { @@ -980,7 +980,7 @@ MagickExport MagickBooleanType SetImageDepth(Image *image, range); #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,4) shared(status) \ - dynamic_num_threads_dos(image->columns,image->rows) + dynamic_number_threads(image->columns,image->rows,1) #endif for (y=0; y < (ssize_t) image->rows; y++) { @@ -1044,7 +1044,7 @@ MagickExport MagickBooleanType SetImageDepth(Image *image, */ #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,4) shared(status) \ - dynamic_num_threads_dos(image->columns,image->rows) + dynamic_number_threads(image->columns,image->rows,1) #endif for (y=0; y < (ssize_t) image->rows; y++) { diff --git a/MagickCore/cache.c b/MagickCore/cache.c index 93de807b7..fa4600dc9 100644 --- a/MagickCore/cache.c +++ b/MagickCore/cache.c @@ -4898,7 +4898,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) shared(status) \ - dynamic_num_threads_dos(image->columns,image->rows) + dynamic_number_threads(image->columns,image->rows,1) #endif for (y=0; y < (ssize_t) image->rows; y++) { diff --git a/MagickCore/channel.c b/MagickCore/channel.c index 6e6744150..56473a15f 100644 --- a/MagickCore/channel.c +++ b/MagickCore/channel.c @@ -141,7 +141,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) shared(status) \ - dynamic_num_threads_dos(width,height) + dynamic_number_threads(width,height,1) #endif for (y=0; y < (ssize_t) height; y++) { @@ -656,7 +656,7 @@ MagickExport Image *SeparateImage(const Image *image, separate_view=AcquireAuthenticCacheView(separate_image,exception); #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static) shared(progress,status) \ - dynamic_num_threads_dos(image->columns,image->rows) + dynamic_number_threads(image->columns,image->rows,1) #endif for (y=0; y < (ssize_t) image->rows; y++) { diff --git a/MagickCore/colormap.c b/MagickCore/colormap.c index fff4f6aab..dc3128ab4 100644 --- a/MagickCore/colormap.c +++ b/MagickCore/colormap.c @@ -206,7 +206,7 @@ MagickExport MagickBooleanType CycleColormapImage(Image *image, image_view=AcquireAuthenticCacheView(image,exception); #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,4) shared(status) \ - dynamic_num_threads_dos(image->columns,image->rows) + dynamic_number_threads(image->columns,image->rows,1) #endif for (y=0; y < (ssize_t) image->rows; y++) { @@ -331,7 +331,7 @@ MagickExport MagickBooleanType SortColormapByIntensity(Image *image, */ #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,4) shared(status) \ - dynamic_num_threads_uno(image->colors) + dynamic_number_threads(image->columns,1,1) #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 a55c0fb37..a8685d0bb 100644 --- a/MagickCore/colorspace.c +++ b/MagickCore/colorspace.c @@ -245,7 +245,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) \ - dynamic_num_threads_dos(image->columns,image->rows) + dynamic_number_threads(image->columns,image->rows,1) #endif for (y=0; y < (ssize_t) image->rows; y++) { @@ -305,7 +305,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) \ - dynamic_num_threads_dos(image->columns,image->rows) + dynamic_number_threads(image->columns,image->rows,1) #endif for (y=0; y < (ssize_t) image->rows; y++) { @@ -362,7 +362,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) \ - dynamic_num_threads_dos(image->columns,image->rows) + dynamic_number_threads(image->columns,image->rows,1) #endif for (y=0; y < (ssize_t) image->rows; y++) { @@ -427,7 +427,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) \ - dynamic_num_threads_dos(image->columns,image->rows) + dynamic_number_threads(image->columns,image->rows,1) #endif for (y=0; y < (ssize_t) image->rows; y++) { @@ -492,7 +492,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) \ - dynamic_num_threads_dos(image->columns,image->rows) + dynamic_number_threads(image->columns,image->rows,1) #endif for (y=0; y < (ssize_t) image->rows; y++) { @@ -557,7 +557,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) \ - dynamic_num_threads_dos(image->columns,image->rows) + dynamic_number_threads(image->columns,image->rows,1) #endif for (y=0; y < (ssize_t) image->rows; y++) { @@ -664,7 +664,7 @@ static MagickBooleanType sRGBTransformImage(Image *image, 0.002/film_gamma); #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static) \ - dynamic_num_threads_uno(MaxMap) + dynamic_number_threads(image->columns,1,1) #endif for (i=0; i <= (ssize_t) MaxMap; i++) logmap[i]=ScaleMapToQuantum((MagickRealType) (MaxMap*(reference_white+ @@ -673,7 +673,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) \ - dynamic_num_threads_dos(image->columns,image->rows) + dynamic_number_threads(image->columns,image->rows,1) #endif for (y=0; y < (ssize_t) image->rows; y++) { @@ -749,7 +749,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) \ - dynamic_num_threads_uno(MaxMap) + dynamic_number_threads(image->columns,1,1) #endif for (i=0; i <= (ssize_t) MaxMap; i++) { @@ -775,7 +775,7 @@ static MagickBooleanType sRGBTransformImage(Image *image, */ #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static) \ - dynamic_num_threads_uno(MaxMap) + dynamic_number_threads(image->columns,1,1) #endif for (i=0; i <= (ssize_t) MaxMap; i++) { @@ -809,7 +809,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) \ - dynamic_num_threads_uno(MaxMap) + dynamic_number_threads(image->columns,1,1) #endif for (i=0; i <= (ssize_t) MaxMap; i++) { @@ -834,7 +834,7 @@ static MagickBooleanType sRGBTransformImage(Image *image, */ #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static) \ - dynamic_num_threads_uno(MaxMap) + dynamic_number_threads(image->columns,1,1) #endif for (i=0; i <= (ssize_t) MaxMap; i++) { @@ -866,7 +866,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) \ - dynamic_num_threads_uno(MaxMap) + dynamic_number_threads(image->columns,1,1) #endif for (i=0; i <= (ssize_t) MaxMap; i++) { @@ -890,7 +890,7 @@ static MagickBooleanType sRGBTransformImage(Image *image, */ #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static) \ - dynamic_num_threads_uno(MaxMap) + dynamic_number_threads(image->columns,1,1) #endif for (i=0; i <= (ssize_t) MaxMap; i++) { @@ -925,7 +925,7 @@ static MagickBooleanType sRGBTransformImage(Image *image, */ #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static) \ - dynamic_num_threads_uno(MaxMap) + dynamic_number_threads(image->columns,1,1) #endif for (i=0; i <= (ssize_t) MaxMap; i++) { @@ -996,7 +996,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) \ - dynamic_num_threads_uno(MaxMap) + dynamic_number_threads(image->columns,1,1) #endif for (i=0; i <= (ssize_t) MaxMap; i++) { @@ -1028,7 +1028,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) \ - dynamic_num_threads_uno(MaxMap) + dynamic_number_threads(image->columns,1,1) #endif for (i=0; i <= (ssize_t) MaxMap; i++) { @@ -1060,7 +1060,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) \ - dynamic_num_threads_uno(MaxMap) + dynamic_number_threads(image->columns,1,1) #endif for (i=0; i <= (ssize_t) MaxMap; i++) { @@ -1083,7 +1083,7 @@ static MagickBooleanType sRGBTransformImage(Image *image, */ #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static) \ - dynamic_num_threads_uno(MaxMap) + dynamic_number_threads(image->columns,1,1) #endif for (i=0; i <= (ssize_t) MaxMap; i++) { @@ -1114,7 +1114,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) \ - dynamic_num_threads_dos(image->columns,image->rows) + dynamic_number_threads(image->columns,image->rows,1) #endif for (y=0; y < (ssize_t) image->rows; y++) { @@ -1730,7 +1730,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) \ - dynamic_num_threads_dos(image->columns,image->rows) + dynamic_number_threads(image->columns,image->rows,1) #endif for (y=0; y < (ssize_t) image->rows; y++) { @@ -1790,7 +1790,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) \ - dynamic_num_threads_dos(image->columns,image->rows) + dynamic_number_threads(image->columns,image->rows,1) #endif for (y=0; y < (ssize_t) image->rows; y++) { @@ -1847,7 +1847,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) \ - dynamic_num_threads_dos(image->columns,image->rows) + dynamic_number_threads(image->columns,image->rows,1) #endif for (y=0; y < (ssize_t) image->rows; y++) { @@ -1914,7 +1914,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) \ - dynamic_num_threads_dos(image->columns,image->rows) + dynamic_number_threads(image->columns,image->rows,1) #endif for (y=0; y < (ssize_t) image->rows; y++) { @@ -1981,7 +1981,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) \ - dynamic_num_threads_dos(image->columns,image->rows) + dynamic_number_threads(image->columns,image->rows,1) #endif for (y=0; y < (ssize_t) image->rows; y++) { @@ -2048,7 +2048,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) \ - dynamic_num_threads_dos(image->columns,image->rows) + dynamic_number_threads(image->columns,image->rows,1) #endif for (y=0; y < (ssize_t) image->rows; y++) { @@ -2164,7 +2164,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) \ - dynamic_num_threads_dos(image->columns,image->rows) + dynamic_number_threads(image->columns,image->rows,1) #endif for (y=0; y < (ssize_t) image->rows; y++) { @@ -2247,7 +2247,7 @@ static MagickBooleanType TransformsRGBImage(Image *image, */ #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static) \ - dynamic_num_threads_uno(MaxMap) + dynamic_number_threads(image->columns,1,1) #endif for (i=0; i <= (ssize_t) MaxMap; i++) { @@ -2283,7 +2283,7 @@ static MagickBooleanType TransformsRGBImage(Image *image, */ #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static) \ - dynamic_num_threads_uno(MaxMap) + dynamic_number_threads(image->columns,1,1) #endif for (i=0; i <= (ssize_t) MaxMap; i++) { @@ -2317,7 +2317,7 @@ static MagickBooleanType TransformsRGBImage(Image *image, */ #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static) \ - dynamic_num_threads_uno(MaxMap) + dynamic_number_threads(image->columns,1,1) #endif for (i=0; i <= (ssize_t) MaxMap; i++) { @@ -2348,7 +2348,7 @@ static MagickBooleanType TransformsRGBImage(Image *image, */ #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static) \ - dynamic_num_threads_uno(MaxMap) + dynamic_number_threads(image->columns,1,1) #endif for (i=0; i <= (ssize_t) MaxMap; i++) { @@ -2383,7 +2383,7 @@ static MagickBooleanType TransformsRGBImage(Image *image, */ #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static) \ - dynamic_num_threads_uno(MaxMap) + dynamic_number_threads(image->columns,1,1) #endif for (i=0; i <= (ssize_t) MaxMap; i++) { @@ -2412,7 +2412,7 @@ static MagickBooleanType TransformsRGBImage(Image *image, */ #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static) \ - dynamic_num_threads_uno(MaxMap) + dynamic_number_threads(image->columns,1,1) #endif for (i=0; i <= (ssize_t) MaxMap; i++) { @@ -2446,7 +2446,7 @@ static MagickBooleanType TransformsRGBImage(Image *image, */ #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static) \ - dynamic_num_threads_uno(MaxMap) + dynamic_number_threads(image->columns,1,1) #endif for (i=0; i <= (ssize_t) MaxMap; i++) { @@ -2482,7 +2482,7 @@ static MagickBooleanType TransformsRGBImage(Image *image, */ #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static) \ - dynamic_num_threads_uno(MaxMap) + dynamic_number_threads(image->columns,1,1) #endif for (i=0; i <= (ssize_t) MaxMap; i++) { @@ -2516,7 +2516,7 @@ static MagickBooleanType TransformsRGBImage(Image *image, */ #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static) \ - dynamic_num_threads_uno(MaxMap) + dynamic_number_threads(image->columns,1,1) #endif for (i=0; i <= (ssize_t) MaxMap; i++) { @@ -2543,7 +2543,7 @@ static MagickBooleanType TransformsRGBImage(Image *image, */ #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static) \ - dynamic_num_threads_uno(MaxMap) + dynamic_number_threads(image->columns,1,1) #endif for (i=0; i <= (ssize_t) MaxMap; i++) { @@ -2574,7 +2574,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) \ - dynamic_num_threads_dos(image->columns,image->rows) + dynamic_number_threads(image->columns,image->rows,1) #endif for (y=0; y < (ssize_t) image->rows; y++) { @@ -2679,7 +2679,7 @@ static MagickBooleanType TransformsRGBImage(Image *image, */ #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,4) shared(status) \ - dynamic_num_threads_uno(image->colors) + dynamic_number_threads(image->columns,1,1) #endif for (i=0; i < (ssize_t) image->colors; i++) { diff --git a/MagickCore/compare.c b/MagickCore/compare.c index 5c9483a7c..f0ed87504 100644 --- a/MagickCore/compare.c +++ b/MagickCore/compare.c @@ -179,7 +179,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) \ - dynamic_num_threads_dos(image->columns,image->rows) + dynamic_number_threads(image->columns,image->rows,1) #endif for (y=0; y < (ssize_t) image->rows; y++) { @@ -328,7 +328,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) \ - dynamic_num_threads_dos(image->columns,image->rows) + dynamic_number_threads(image->columns,image->rows,1) #endif for (y=0; y < (ssize_t) image->rows; y++) { @@ -453,7 +453,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) \ - dynamic_num_threads_dos(image->columns,image->rows) + dynamic_number_threads(image->columns,image->rows,1) #endif for (y=0; y < (ssize_t) image->rows; y++) { @@ -554,7 +554,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) \ - dynamic_num_threads_dos(image->columns,image->rows) + dynamic_number_threads(image->columns,image->rows,1) #endif for (y=0; y < (ssize_t) image->rows; y++) { @@ -749,7 +749,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) \ - dynamic_num_threads_dos(image->columns,image->rows) + dynamic_number_threads(image->columns,image->rows,1) #endif for (y=0; y < (ssize_t) image->rows; y++) { @@ -984,7 +984,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) \ - dynamic_num_threads_dos(image->columns,image->rows) + dynamic_number_threads(image->columns,image->rows,1) #endif for (y=0; y < (ssize_t) image->rows; y++) { @@ -1594,7 +1594,7 @@ MagickExport Image *SimilarityImage(Image *image,const Image *reference, similarity_view=AcquireAuthenticCacheView(similarity_image,exception); #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,4) shared(progress,status) \ - dynamic_num_threads_dos(image->columns,image->rows) + dynamic_number_threads(image->columns,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 2171ba4cf..e2bf6048d 100644 --- a/MagickCore/composite.c +++ b/MagickCore/composite.c @@ -335,7 +335,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) \ - dynamic_num_threads_dos(image->columns,image->rows) + dynamic_number_threads(image->columns,image->rows,1) #endif for (y=0; y < (ssize_t) image->rows; y++) { @@ -609,7 +609,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) \ - dynamic_num_threads_dos(image->columns,image->rows) + dynamic_number_threads(image->columns,image->rows,1) #endif for (y=0; y < (ssize_t) composite_image->rows; y++) { @@ -1166,7 +1166,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) \ - dynamic_num_threads_dos(image->columns,image->rows) + dynamic_number_threads(image->columns,image->rows,1) #endif for (y=0; y < (ssize_t) image->rows; y++) { @@ -2365,7 +2365,7 @@ MagickExport MagickBooleanType TextureImage(Image *image,const Image *texture, */ #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static) shared(status) \ - dynamic_num_threads_dos(image->columns,image->rows) + dynamic_number_threads(image->columns,image->rows,1) #endif for (y=0; y < (ssize_t) image->rows; y+=(ssize_t) texture_image->rows) { @@ -2415,7 +2415,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) shared(status) \ - dynamic_num_threads_dos(image->columns,image->rows) + dynamic_number_threads(image->columns,image->rows,1) #endif for (y=0; y < (ssize_t) image->rows; y++) { diff --git a/MagickCore/decorate.c b/MagickCore/decorate.c index 4c26d6fa1..e1a6cde29 100644 --- a/MagickCore/decorate.c +++ b/MagickCore/decorate.c @@ -385,7 +385,7 @@ MagickExport Image *FrameImage(const Image *image,const FrameInfo *frame_info, */ #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static) shared(progress,status) \ - dynamic_num_threads_dos(image->columns,image->rows) + dynamic_number_threads(image->columns,image->rows,1) #endif for (y=0; y < (ssize_t) image->rows; y++) { @@ -690,7 +690,7 @@ MagickExport MagickBooleanType RaiseImage(Image *image, image_view=AcquireAuthenticCacheView(image,exception); #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static) shared(progress,status) \ - dynamic_num_threads_dos(image->columns,image->rows) + dynamic_number_threads(image->columns,image->rows,1) #endif for (y=0; y < (ssize_t) raise_info->height; y++) { @@ -796,7 +796,7 @@ MagickExport MagickBooleanType RaiseImage(Image *image, } #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static) shared(progress,status) \ - dynamic_num_threads_dos(image->columns,image->rows) + dynamic_number_threads(image->columns,image->rows,1) #endif for (y=(ssize_t) raise_info->height; y < (ssize_t) (image->rows-raise_info->height); y++) { @@ -879,7 +879,7 @@ MagickExport MagickBooleanType RaiseImage(Image *image, } #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static) shared(progress,status) \ - dynamic_num_threads_dos(image->columns,image->rows) + dynamic_number_threads(image->columns,image->rows,1) #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 71d58d13b..6e17f5fb1 100644 --- a/MagickCore/distort.c +++ b/MagickCore/distort.c @@ -2314,7 +2314,7 @@ MagickExport Image *DistortImage(const Image *image,DistortImageMethod method, distort_view=AcquireAuthenticCacheView(distort_image,exception); #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,4) shared(progress,status) \ - dynamic_num_threads_dos(image->columns,image->rows) + dynamic_number_threads(image->columns,image->rows,1) #endif for (j=0; j < (ssize_t) distort_image->rows; j++) { @@ -3039,7 +3039,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) \ - dynamic_num_threads_dos(image->columns,image->rows) + dynamic_number_threads(image->columns,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 768c03a05..53d40a32f 100644 --- a/MagickCore/draw.c +++ b/MagickCore/draw.c @@ -1169,7 +1169,7 @@ MagickExport MagickBooleanType DrawAffineImage(Image *image, image_view=AcquireAuthenticCacheView(image,exception); #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static) shared(status) \ - dynamic_num_threads_dos(width,height) + dynamic_number_threads(width,height,1) #endif for (y=start; y <= stop; y++) { @@ -3261,7 +3261,7 @@ MagickExport MagickBooleanType DrawGradientImage(Image *image, image_view=AcquireAuthenticCacheView(image,exception); #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static) shared(status) \ - dynamic_num_threads_dos(width,height) + dynamic_number_threads(width,height,1) #endif for (y=bounding_box.y; y < (ssize_t) bounding_box.height; y++) { @@ -3874,7 +3874,7 @@ static MagickBooleanType DrawPolygonPrimitive(Image *image, stop=(ssize_t) floor(bounds.y2+0.5); #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static) shared(status) \ - dynamic_num_threads_dos(width,height) + dynamic_number_threads(width,height,1) #endif for (y=start; y <= stop; y++) { @@ -3937,7 +3937,7 @@ static MagickBooleanType DrawPolygonPrimitive(Image *image, stop=(ssize_t) floor(bounds.y2+0.5); #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static) shared(status) \ - dynamic_num_threads_dos(width,height) + dynamic_number_threads(width,height,1) #endif for (y=start; y <= stop; y++) { diff --git a/MagickCore/effect.c b/MagickCore/effect.c index e974b0d9c..02390c4b2 100644 --- a/MagickCore/effect.c +++ b/MagickCore/effect.c @@ -295,7 +295,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) \ - dynamic_num_threads_dos(image->columns,image->rows) + dynamic_number_threads(image->columns,image->rows,1) #endif for (y=0; y < (ssize_t) blur_image->rows; y++) { @@ -622,7 +622,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) \ - dynamic_num_threads_dos(image->columns,image->rows) + dynamic_number_threads(image->columns,image->rows,1) #endif for (y=0; y < (ssize_t) sharp_image->rows; y++) { @@ -952,7 +952,7 @@ MagickExport Image *BlurImage(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) \ - dynamic_num_threads_dos(image->columns,image->rows) + dynamic_number_threads(image->columns,image->rows,1) #endif for (y=0; y < (ssize_t) image->rows; y++) { @@ -1082,7 +1082,7 @@ MagickExport Image *BlurImage(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) \ - dynamic_num_threads_dos(image->columns,image->rows) + dynamic_number_threads(image->columns,image->rows,1) #endif for (x=0; x < (ssize_t) blur_image->columns; x++) { @@ -1293,7 +1293,7 @@ static void Hull(const ssize_t x_offset,const ssize_t y_offset, r=p+(y_offset*(columns+2)+x_offset); #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static) \ - dynamic_num_threads_dos(columns,rows) + dynamic_number_threads(columns,rows,1) #endif for (y=0; y < (ssize_t) rows; y++) { @@ -1330,7 +1330,7 @@ static void Hull(const ssize_t x_offset,const ssize_t y_offset, s=q-(y_offset*(columns+2)+x_offset); #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static) \ - dynamic_num_threads_dos(columns,rows) + dynamic_number_threads(columns,rows,1) #endif for (y=0; y < (ssize_t) rows; y++) { @@ -1956,7 +1956,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) \ - dynamic_num_threads_dos(image->columns,image->rows) + dynamic_number_threads(image->columns,image->rows,1) #endif for (y=0; y < (ssize_t) image->rows; y++) { @@ -2734,7 +2734,7 @@ MagickExport Image *RadialBlurImage(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) \ - dynamic_num_threads_dos(image->columns,image->rows) + dynamic_number_threads(image->columns,image->rows,1) #endif for (y=0; y < (ssize_t) image->rows; y++) { @@ -3029,7 +3029,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) \ - dynamic_num_threads_dos(image->columns,image->rows) + dynamic_number_threads(image->columns,image->rows,1) #endif for (y=0; y < (ssize_t) image->rows; y++) { @@ -3283,7 +3283,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) \ - dynamic_num_threads_dos(image->columns,image->rows) + dynamic_number_threads(image->columns,image->rows,1) #endif for (y=0; y < (ssize_t) image->rows; y++) { @@ -3611,7 +3611,7 @@ MagickExport Image *SpreadImage(const Image *image,const double radius, spread_view=AcquireAuthenticCacheView(spread_image,exception); #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,8) shared(progress,status) \ - dynamic_num_threads_tres(image->columns,image->rows,key == ~0UL) + dynamic_number_threads(image->columns,image->rows,key == ~0UL) #endif for (y=0; y < (ssize_t) image->rows; y++) { @@ -3751,7 +3751,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) \ - dynamic_num_threads_dos(image->columns,image->rows) + dynamic_number_threads(image->columns,image->rows,1) #endif for (y=0; y < (ssize_t) image->rows; y++) { diff --git a/MagickCore/enhance.c b/MagickCore/enhance.c index 11b5f418f..ac870bc41 100644 --- a/MagickCore/enhance.c +++ b/MagickCore/enhance.c @@ -344,7 +344,7 @@ MagickExport MagickBooleanType ClutImage(Image *image,const Image *clut_image, clut_view=AcquireVirtualCacheView(clut_image,exception); #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,4) \ - dynamic_num_threads_uno(MaxMap) + dynamic_number_threads(image->columns,1,1) #endif for (i=0; i <= (ssize_t) MaxMap; i++) { @@ -357,7 +357,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) \ - dynamic_num_threads_dos(image->columns,image->rows) + dynamic_number_threads(image->columns,image->rows,1) #endif for (y=0; y < (ssize_t) image->rows; y++) { @@ -707,7 +707,7 @@ MagickExport MagickBooleanType ColorDecisionListImage(Image *image, image->filename); #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,4) \ - dynamic_num_threads_uno(MaxMap) + dynamic_number_threads(image->columns,1,1) #endif for (i=0; i <= (ssize_t) MaxMap; i++) { @@ -728,7 +728,7 @@ MagickExport MagickBooleanType ColorDecisionListImage(Image *image, */ #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,4) shared(progress,status) \ - dynamic_num_threads_uno(image->colors) + dynamic_number_threads(image->columns,1,1) #endif for (i=0; i < (ssize_t) image->colors; i++) { @@ -756,7 +756,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) \ - dynamic_num_threads_dos(image->columns,image->rows) + dynamic_number_threads(image->columns,image->rows,1) #endif for (y=0; y < (ssize_t) image->rows; y++) { @@ -912,7 +912,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) \ - dynamic_num_threads_dos(image->columns,image->rows) + dynamic_number_threads(image->columns,image->rows,1) #endif for (y=0; y < (ssize_t) image->rows; y++) { @@ -1099,7 +1099,7 @@ MagickExport MagickBooleanType ContrastStretchImage(Image *image, number_channels=GetPixelChannels(image); #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,4) shared(progress,status) \ - dynamic_num_threads_uno(MaxMap) + dynamic_number_threads(image->columns,1,1) #endif for (i=0; i < (ssize_t) number_channels; i++) { @@ -1137,7 +1137,7 @@ MagickExport MagickBooleanType ContrastStretchImage(Image *image, number_channels=GetPixelChannels(image); #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,4) shared(progress,status) \ - dynamic_num_threads_uno(MaxMap) + dynamic_number_threads(image->columns,1,1) #endif for (i=0; i < (ssize_t) number_channels; i++) { @@ -1169,7 +1169,7 @@ MagickExport MagickBooleanType ContrastStretchImage(Image *image, */ #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,4) shared(progress,status) \ - dynamic_num_threads_uno(image->colors) + dynamic_number_threads(image->columns,1,1) #endif for (j=0; j < (ssize_t) image->colors; j++) { @@ -1211,7 +1211,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) \ - dynamic_num_threads_dos(image->columns,image->rows) + dynamic_number_threads(image->columns,image->rows,1) #endif for (y=0; y < (ssize_t) image->rows; y++) { @@ -1364,7 +1364,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) \ - dynamic_num_threads_dos(image->columns,image->rows) + dynamic_number_threads(image->columns,image->rows,1) #endif for (y=0; y < (ssize_t) image->rows; y++) { @@ -1596,7 +1596,7 @@ MagickExport MagickBooleanType EqualizeImage(Image *image, number_channels=GetPixelChannels(image); #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,4) shared(progress,status) \ - dynamic_num_threads_uno(MaxMap) + dynamic_number_threads(image->columns,1,1) #endif for (i=0; i < (ssize_t) number_channels; i++) { @@ -1618,7 +1618,7 @@ MagickExport MagickBooleanType EqualizeImage(Image *image, number_channels=GetPixelChannels(image); #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,4) shared(progress,status) \ - dynamic_num_threads_uno(MaxMap) + dynamic_number_threads(image->columns,1,1) #endif for (i=0; i < (ssize_t) number_channels; i++) { @@ -1648,7 +1648,7 @@ MagickExport MagickBooleanType EqualizeImage(Image *image, */ #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,4) shared(progress,status) \ - dynamic_num_threads_uno(image->colors) + dynamic_number_threads(image->columns,1,1) #endif for (j=0; j < (ssize_t) image->colors; j++) { @@ -1693,7 +1693,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) \ - dynamic_num_threads_dos(image->columns,image->rows) + dynamic_number_threads(image->columns,image->rows,1) #endif for (y=0; y < (ssize_t) image->rows; y++) { @@ -1832,7 +1832,7 @@ MagickExport MagickBooleanType GammaImage(Image *image,const double gamma, if (gamma != 0.0) #if defined(MAGICKCORE_OPENMP_SUPPORT) && (MaxMap > 256) #pragma omp parallel for \ - dynamic_num_threads_uno(MaxMap) + dynamic_number_threads(image->columns,1,1) #endif for (i=0; i <= (ssize_t) MaxMap; i++) gamma_map[i]=ScaleMapToQuantum((MagickRealType) (MaxMap*pow((double) i/ @@ -1844,7 +1844,7 @@ MagickExport MagickBooleanType GammaImage(Image *image,const double gamma, */ #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static) shared(progress,status) \ - dynamic_num_threads_uno(image->colors) + dynamic_number_threads(image->columns,1,1) #endif for (i=0; i < (ssize_t) image->colors; i++) { @@ -1870,7 +1870,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) \ - dynamic_num_threads_dos(image->columns,image->rows) + dynamic_number_threads(image->columns,image->rows,1) #endif for (y=0; y < (ssize_t) image->rows; y++) { @@ -2040,7 +2040,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) \ - dynamic_num_threads_dos(image->columns,image->rows) + dynamic_number_threads(image->columns,image->rows,1) #endif for (y=0; y < (ssize_t) image->rows; y++) { @@ -2221,7 +2221,7 @@ MagickExport MagickBooleanType LevelImage(Image *image,const double black_point, if (image->storage_class == PseudoClass) #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,4) shared(progress,status) \ - dynamic_num_threads_uno(image->colors) + dynamic_number_threads(image->columns,1,1) #endif for (i=0; i < (ssize_t) image->colors; i++) { @@ -2249,7 +2249,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) \ - dynamic_num_threads_dos(image->columns,image->rows) + dynamic_number_threads(image->columns,image->rows,1) #endif for (y=0; y < (ssize_t) image->rows; y++) { @@ -2389,7 +2389,7 @@ MagickExport MagickBooleanType LevelizeImage(Image *image, if (image->storage_class == PseudoClass) #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,4) shared(progress,status) \ - dynamic_num_threads_uno(image->colors) + dynamic_number_threads(image->columns,1,1) #endif for (i=0; i < (ssize_t) image->colors; i++) { @@ -2417,7 +2417,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) \ - dynamic_num_threads_dos(image->columns,image->rows) + dynamic_number_threads(image->columns,image->rows,1) #endif for (y=0; y < (ssize_t) image->rows; y++) { @@ -2902,7 +2902,7 @@ MagickExport MagickBooleanType ModulateImage(Image *image,const char *modulate, */ #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,4) shared(progress,status) \ - dynamic_num_threads_uno(image->colors) + dynamic_number_threads(image->columns,1,1) #endif for (i=0; i < (ssize_t) image->colors; i++) switch (colorspace) @@ -2939,7 +2939,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) \ - dynamic_num_threads_dos(image->columns,image->rows) + dynamic_number_threads(image->columns,image->rows,1) #endif for (y=0; y < (ssize_t) image->rows; y++) { @@ -3072,7 +3072,7 @@ MagickExport MagickBooleanType NegateImage(Image *image, */ #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static) shared(progress,status) \ - dynamic_num_threads_uno(image->colors) + dynamic_number_threads(image->columns,1,1) #endif for (i=0; i < (ssize_t) image->colors; i++) { @@ -3101,7 +3101,7 @@ MagickExport MagickBooleanType NegateImage(Image *image, { #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static) shared(progress,status) \ - dynamic_num_threads_dos(image->columns,image->rows) + dynamic_number_threads(image->columns,image->rows,1) #endif for (y=0; y < (ssize_t) image->rows; y++) { @@ -3175,7 +3175,7 @@ MagickExport MagickBooleanType NegateImage(Image *image, */ #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static) shared(progress,status) \ - dynamic_num_threads_dos(image->columns,image->rows) + dynamic_number_threads(image->columns,image->rows,1) #endif for (y=0; y < (ssize_t) image->rows; y++) { @@ -3355,7 +3355,7 @@ MagickExport MagickBooleanType SigmoidalContrastImage(Image *image, (void) ResetMagickMemory(sigmoidal_map,0,(MaxMap+1)*sizeof(*sigmoidal_map)); #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static) shared(progress,status) \ - dynamic_num_threads_uno(MaxMap) + dynamic_number_threads(image->columns,1,1) #endif for (i=0; i <= (ssize_t) MaxMap; i++) { @@ -3419,7 +3419,7 @@ MagickExport MagickBooleanType SigmoidalContrastImage(Image *image, */ #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,4) shared(progress,status) \ - dynamic_num_threads_uno(image->colors) + dynamic_number_threads(image->columns,1,1) #endif for (i=0; i < (ssize_t) image->colors; i++) { @@ -3445,7 +3445,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) \ - dynamic_num_threads_dos(image->columns,image->rows) + dynamic_number_threads(image->columns,image->rows,1) #endif for (y=0; y < (ssize_t) image->rows; y++) { diff --git a/MagickCore/feature.c b/MagickCore/feature.c index 30e2a5f94..016e19e85 100644 --- a/MagickCore/feature.c +++ b/MagickCore/feature.c @@ -224,7 +224,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) \ - dynamic_num_threads_dos(image->columns,image->rows) + dynamic_number_threads(image->columns,image->rows,1) #endif for (y=0; y < (ssize_t) image->rows; y++) { @@ -595,7 +595,7 @@ MagickExport ChannelFeatures *GetImageFeatures(const Image *image, */ #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,4) shared(status) \ - dynamic_num_threads_dos(number_grays,number_grays) + dynamic_number_threads(number_grays,number_grays,1) #endif for (i=0; i < 4; i++) { @@ -780,7 +780,7 @@ MagickExport ChannelFeatures *GetImageFeatures(const Image *image, */ #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,4) shared(status) \ - dynamic_num_threads_dos(number_grays,number_grays) + dynamic_number_threads(number_grays,number_grays,1) #endif for (i=0; i < 4; i++) { @@ -856,7 +856,7 @@ MagickExport ChannelFeatures *GetImageFeatures(const Image *image, */ #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,4) shared(status) \ - dynamic_num_threads_dos(number_grays,number_grays) + dynamic_number_threads(number_grays,number_grays,1) #endif for (i=0; i < 4; i++) { @@ -977,7 +977,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) \ - dynamic_num_threads_dos(number_grays,number_grays) + dynamic_number_threads(number_grays,number_grays,1) #endif for (i=0; i < 4; i++) { @@ -1129,7 +1129,7 @@ MagickExport ChannelFeatures *GetImageFeatures(const Image *image, */ #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,4) shared(status) \ - dynamic_num_threads_dos(number_grays,number_grays) + dynamic_number_threads(number_grays,number_grays,1) #endif for (i=0; i < 4; i++) { diff --git a/MagickCore/fx.c b/MagickCore/fx.c index 0a57c6440..e49ec7609 100644 --- a/MagickCore/fx.c +++ b/MagickCore/fx.c @@ -312,7 +312,7 @@ MagickExport Image *AddNoiseImage(const Image *image,const NoiseType noise_type, key=GetRandomSecretKey(random_info[0]); #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,4) shared(progress,status) \ - dynamic_num_threads_tres(image->columns,image->rows,key == ~0UL) + dynamic_number_threads(image->columns,image->rows,key == ~0UL) #endif for (y=0; y < (ssize_t) image->rows; y++) { @@ -479,7 +479,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) \ - dynamic_num_threads_dos(image->columns,image->rows) + dynamic_number_threads(image->columns,image->rows,1) #endif for (y=0; y < (ssize_t) image->rows; y++) { @@ -742,7 +742,7 @@ MagickExport Image *ColorizeImage(const Image *image,const char *blend, colorize_view=AcquireAuthenticCacheView(colorize_image,exception); #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,4) shared(progress,status) \ - dynamic_num_threads_dos(image->columns,image->rows) + dynamic_number_threads(image->columns,image->rows,1) #endif for (y=0; y < (ssize_t) image->rows; y++) { @@ -949,7 +949,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) \ - dynamic_num_threads_dos(image->columns,image->rows) + dynamic_number_threads(image->columns,image->rows,1) #endif for (y=0; y < (ssize_t) image->rows; y++) { @@ -3044,7 +3044,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) \ - dynamic_num_threads_dos(image->columns,image->rows) + dynamic_number_threads(image->columns,image->rows,1) #endif for (y=0; y < (ssize_t) fx_image->rows; y++) { @@ -3243,7 +3243,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) \ - dynamic_num_threads_dos(image->columns,image->rows) + dynamic_number_threads(image->columns,image->rows,1) #endif for (y=0; y < (ssize_t) image->rows; y++) { @@ -3488,7 +3488,7 @@ MagickExport Image *MorphImages(const Image *image, morph_view=AcquireAuthenticCacheView(morph_images,exception); #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,4) shared(status) \ - dynamic_num_threads_dos(image->columns,image->rows) + dynamic_number_threads(image->columns,image->rows,1) #endif for (y=0; y < (ssize_t) morph_images->rows; y++) { @@ -4144,7 +4144,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) \ - dynamic_num_threads_dos(image->columns,image->rows) + dynamic_number_threads(image->columns,image->rows,1) #endif for (y=0; y < (ssize_t) image->rows; y++) { @@ -4435,7 +4435,7 @@ MagickExport Image *SketchImage(const Image *image,const double radius, random_view=AcquireAuthenticCacheView(random_image,exception); #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,4) shared(status) \ - dynamic_num_threads_tres(image->columns,image->rows,key == ~0UL) + dynamic_number_threads(image->columns,image->rows,key == ~0UL) #endif for (y=0; y < (ssize_t) random_image->rows; y++) { @@ -4609,7 +4609,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) \ - dynamic_num_threads_dos(image->columns,image->rows) + dynamic_number_threads(image->columns,image->rows,1) #endif for (y=0; y < (ssize_t) image->rows; y++) { @@ -5094,7 +5094,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) \ - dynamic_num_threads_dos(image->columns,image->rows) + dynamic_number_threads(image->columns,image->rows,1) #endif for (y=0; y < (ssize_t) image->rows; y++) { @@ -5328,7 +5328,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) \ - dynamic_num_threads_dos(image->columns,image->rows) + dynamic_number_threads(image->columns,image->rows,1) #endif for (y=0; y < (ssize_t) image->rows; y++) { @@ -5632,7 +5632,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) \ - dynamic_num_threads_dos(image->columns,image->rows) + dynamic_number_threads(image->columns,image->rows,1) #endif for (y=0; y < (ssize_t) wave_image->rows; y++) { diff --git a/MagickCore/image-view.c b/MagickCore/image-view.c index 4afd97549..28be5e71c 100644 --- a/MagickCore/image-view.c +++ b/MagickCore/image-view.c @@ -244,7 +244,7 @@ MagickExport MagickBooleanType DuplexTransferImageViewIterator( width=source->extent.width-source->extent.x; #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static) shared(progress,status) \ - dynamic_num_threads_dos(width,height) + dynamic_number_threads(width,height,1) #endif for (y=source->extent.y; y < (ssize_t) source->extent.height; y++) { @@ -556,7 +556,7 @@ MagickExport MagickBooleanType GetImageViewIterator(ImageView *source, width=source->extent.width-source->extent.x; #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static) shared(progress,status) \ - dynamic_num_threads_dos(width,height) + dynamic_number_threads(width,height,1) #endif for (y=source->extent.y; y < (ssize_t) source->extent.height; y++) { @@ -904,7 +904,7 @@ MagickExport MagickBooleanType SetImageViewIterator(ImageView *destination, width=destination->extent.width-destination->extent.x; #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static) shared(progress,status) \ - dynamic_num_threads_dos(width,height) + dynamic_number_threads(width,height,1) #endif for (y=destination->extent.y; y < (ssize_t) destination->extent.height; y++) { @@ -1032,7 +1032,7 @@ MagickExport MagickBooleanType TransferImageViewIterator(ImageView *source, width=source->extent.width-source->extent.x; #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static) shared(progress,status) \ - dynamic_num_threads_dos(width,height) + dynamic_number_threads(width,height,1) #endif for (y=source->extent.y; y < (ssize_t) source->extent.height; y++) { @@ -1163,7 +1163,7 @@ MagickExport MagickBooleanType UpdateImageViewIterator(ImageView *source, width=source->extent.width-source->extent.x; #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static) shared(progress,status) \ - dynamic_num_threads_dos(width,height) + dynamic_number_threads(width,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 f6d16c4e8..73ae3bdbe 100644 --- a/MagickCore/image.c +++ b/MagickCore/image.c @@ -536,7 +536,7 @@ MagickExport Image *AppendImages(const Image *images, image_view=AcquireVirtualCacheView(image,exception); #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static) shared(status) \ - dynamic_num_threads_dos(image->columns,image->rows) + dynamic_number_threads(image->columns,image->rows,1) #endif for (y=0; y < (ssize_t) image->rows; y++) { @@ -1644,7 +1644,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) \ - dynamic_num_threads_dos(image->columns,image->rows) + dynamic_number_threads(image->columns,image->rows,1) #endif for (y=0; y < (ssize_t) image->rows; y++) { @@ -1899,7 +1899,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) \ - dynamic_num_threads_dos(image->columns,image->rows) + dynamic_number_threads(image->columns,image->rows,1) #endif for (y=0; y < (ssize_t) image->rows; y++) { @@ -2171,7 +2171,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) \ - dynamic_num_threads_dos(image->columns,image->rows) + dynamic_number_threads(image->columns,image->rows,1) #endif for (y=0; y < (ssize_t) image->rows; y++) { @@ -2250,7 +2250,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) \ - dynamic_num_threads_dos(image->columns,image->rows) + dynamic_number_threads(image->columns,image->rows,1) #endif for (y=0; y < (ssize_t) image->rows; y++) { @@ -2438,7 +2438,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) \ - dynamic_num_threads_dos(image->columns,image->rows) + dynamic_number_threads(image->columns,image->rows,1) #endif for (y=0; y < (ssize_t) image->rows; y++) { @@ -3092,7 +3092,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) \ - dynamic_num_threads_dos(image->columns,image->rows) + dynamic_number_threads(image->columns,image->rows,1) #endif for (y=0; y < (ssize_t) image->rows; y++) { @@ -3747,7 +3747,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) \ - dynamic_num_threads_dos(image->columns,image->rows) + dynamic_number_threads(image->columns,image->rows,1) #endif for (y=0; y < (ssize_t) image->rows; y++) { diff --git a/MagickCore/morphology.c b/MagickCore/morphology.c index 9f0d47c05..e30114a97 100644 --- a/MagickCore/morphology.c +++ b/MagickCore/morphology.c @@ -2589,7 +2589,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) \ - dynamic_num_threads_dos(image->columns,image->rows) + dynamic_number_threads(image->columns,image->rows,1) #endif for (x=0; x < (ssize_t) image->columns; x++) { @@ -2766,7 +2766,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) \ - dynamic_num_threads_dos(image->columns,image->rows) + dynamic_number_threads(image->columns,image->rows,1) #endif for (y=0; y < (ssize_t) image->rows; y++) { diff --git a/MagickCore/paint.c b/MagickCore/paint.c index 99faf8f5a..6ef6723b0 100644 --- a/MagickCore/paint.c +++ b/MagickCore/paint.c @@ -592,7 +592,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) \ - dynamic_num_threads_dos(image->columns,image->rows) + dynamic_number_threads(image->columns,image->rows,1) #endif for (y=0; y < (ssize_t) image->rows; y++) { @@ -793,7 +793,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) \ - dynamic_num_threads_dos(image->columns,image->rows) + dynamic_number_threads(image->columns,image->rows,1) #endif for (y=0; y < (ssize_t) image->rows; y++) { @@ -920,7 +920,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) \ - dynamic_num_threads_dos(image->columns,image->rows) + dynamic_number_threads(image->columns,image->rows,1) #endif for (y=0; y < (ssize_t) image->rows; y++) { @@ -1047,7 +1047,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) \ - dynamic_num_threads_dos(image->columns,image->rows) + dynamic_number_threads(image->columns,image->rows,1) #endif for (y=0; y < (ssize_t) image->rows; y++) { diff --git a/MagickCore/prepress.c b/MagickCore/prepress.c index 2b7cfe669..3e4ee7206 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) \ - dynamic_num_threads_dos(image->columns,image->rows) + dynamic_number_threads(image->columns,image->rows,1) #endif for (y=0; y < (ssize_t) image->rows; y++) { diff --git a/MagickCore/profile.c b/MagickCore/profile.c index 8d349aea2..dd26629ba 100644 --- a/MagickCore/profile.c +++ b/MagickCore/profile.c @@ -6042,7 +6042,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) \ - dynamic_num_threads_dos(image->columns,image->rows) + dynamic_number_threads(image->columns,image->rows,1) #endif for (y=0; y < (ssize_t) image->rows; y++) { diff --git a/MagickCore/quantize.c b/MagickCore/quantize.c index c1faafaf8..29a1c1d68 100644 --- a/MagickCore/quantize.c +++ b/MagickCore/quantize.c @@ -543,7 +543,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) \ - dynamic_num_threads_dos(image->columns,image->rows) + dynamic_number_threads(image->columns,image->rows,1) #endif for (y=0; y < (ssize_t) image->rows; y++) { @@ -2380,7 +2380,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) \ - dynamic_num_threads_uno(image->colors) + dynamic_number_threads(image->columns,1,1) #endif for (i=0; i < (ssize_t) image->colors; i++) { @@ -2408,7 +2408,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) \ - dynamic_num_threads_dos(image->columns,image->rows) + dynamic_number_threads(image->columns,image->rows,1) #endif for (y=0; y < (ssize_t) image->rows; y++) { @@ -3305,7 +3305,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) \ - dynamic_num_threads_dos(image->columns,image->rows) + dynamic_number_threads(image->columns,image->rows,1) #endif for (y=0; y < (ssize_t) image->rows; y++) { @@ -3383,7 +3383,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) \ - dynamic_num_threads_dos(image->columns,image->rows) + dynamic_number_threads(image->columns,image->rows,1) #endif for (y=0; y < (ssize_t) image->rows; y++) { diff --git a/MagickCore/resize.c b/MagickCore/resize.c index 0d0ad9406..13979e08d 100644 --- a/MagickCore/resize.c +++ b/MagickCore/resize.c @@ -1594,7 +1594,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) shared(progress,status) \ - dynamic_num_threads_dos(image->columns,image->rows) + dynamic_number_threads(image->columns,image->rows,1) #endif for (y=0; y < (ssize_t) resize_image->rows; y++) { @@ -2203,7 +2203,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) \ - dynamic_num_threads_dos(image->columns,image->rows) + dynamic_number_threads(image->columns,image->rows,1) #endif for (x=0; x < (ssize_t) resize_image->columns; x++) { @@ -2421,7 +2421,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) \ - dynamic_num_threads_dos(image->columns,image->rows) + dynamic_number_threads(image->columns,image->rows,1) #endif for (y=0; y < (ssize_t) resize_image->rows; y++) { @@ -2776,7 +2776,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) shared(progress,status) \ - dynamic_num_threads_dos(image->columns,image->rows) + dynamic_number_threads(image->columns,image->rows,1) #endif for (y=0; y < (ssize_t) sample_image->rows; y++) { diff --git a/MagickCore/resource.c b/MagickCore/resource.c index 61f4d054b..0e6af9da6 100644 --- a/MagickCore/resource.c +++ b/MagickCore/resource.c @@ -990,7 +990,7 @@ MagickPrivate MagickBooleanType ResourceComponentGenesis(void) if (files < 0) files=64; (void) SetMagickResourceLimit(FileResource,MagickMax((size_t) - (3*files/4))); + (3*files/4),64)); limit=GetEnvironmentValue("MAGICK_FILE_LIMIT"); if (limit == (char *) NULL) limit=GetPolicyValue("file"); diff --git a/MagickCore/segment.c b/MagickCore/segment.c index 88e59b51f..758e3f8ad 100644 --- a/MagickCore/segment.c +++ b/MagickCore/segment.c @@ -533,7 +533,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) \ - dynamic_num_threads_dos(image->columns,image->rows) + dynamic_number_threads(image->columns,image->rows,1) #endif for (y=0; y < (ssize_t) image->rows; y++) { diff --git a/MagickCore/shear.c b/MagickCore/shear.c index 74b687a29..72dfac167 100644 --- a/MagickCore/shear.c +++ b/MagickCore/shear.c @@ -573,7 +573,7 @@ static void RadonProjection(RadonInfo *source_cells, } #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,4) \ - dynamic_num_threads_dos(p->width,p->height) + dynamic_number_threads(p->width,p->height,1) #endif for (x=0; x < (ssize_t) p->width; x++) { @@ -654,7 +654,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) \ - dynamic_num_threads_dos(image->columns,image->rows) + dynamic_number_threads(image->columns,image->rows,1) #endif for (y=0; y < (ssize_t) image->rows; y++) { @@ -704,7 +704,7 @@ static MagickBooleanType RadonTransform(const Image *image, (void) ResetRadonCells(source_cells); #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,4) shared(status) \ - dynamic_num_threads_dos(image->columns,image->rows) + dynamic_number_threads(image->columns,image->rows,1) #endif for (y=0; y < (ssize_t) image->rows; y++) { @@ -1027,7 +1027,7 @@ MagickExport Image *IntegralRotateImage(const Image *image,size_t rotations, GetPixelCacheTileSize(image,&tile_width,&tile_height); #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,4) shared(progress,status) \ - dynamic_num_threads_dos(image->columns,image->rows) + dynamic_number_threads(image->columns,image->rows,1) #endif for (tile_y=0; tile_y < (ssize_t) image->rows; tile_y+=(ssize_t) tile_height) { @@ -1152,7 +1152,7 @@ MagickExport Image *IntegralRotateImage(const Image *image,size_t rotations, */ #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static) shared(progress,status) \ - dynamic_num_threads_dos(image->columns,image->rows) + dynamic_number_threads(image->columns,image->rows,1) #endif for (y=0; y < (ssize_t) image->rows; y++) { @@ -1249,7 +1249,7 @@ MagickExport Image *IntegralRotateImage(const Image *image,size_t rotations, GetPixelCacheTileSize(image,&tile_width,&tile_height); #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,4) shared(progress,status) \ - dynamic_num_threads_dos(image->columns,image->rows) + dynamic_number_threads(image->columns,image->rows,1) #endif for (tile_y=0; tile_y < (ssize_t) image->rows; tile_y+=(ssize_t) tile_height) { @@ -1452,7 +1452,7 @@ static MagickBooleanType XShearImage(Image *image,const MagickRealType degrees, image_view=AcquireAuthenticCacheView(image,exception); #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,4) shared(progress,status) \ - dynamic_num_threads_dos(width,height) + dynamic_number_threads(width,height,1) #endif for (y=0; y < (ssize_t) height; y++) { @@ -1668,7 +1668,7 @@ static MagickBooleanType YShearImage(Image *image,const MagickRealType degrees, image_view=AcquireAuthenticCacheView(image,exception); #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,4) shared(progress,status) \ - dynamic_num_threads_dos(width,height) + dynamic_number_threads(width,height,1) #endif for (x=0; x < (ssize_t) width; x++) { diff --git a/MagickCore/statistic.c b/MagickCore/statistic.c index 87e7f4817..7d0ef38b9 100644 --- a/MagickCore/statistic.c +++ b/MagickCore/statistic.c @@ -506,7 +506,7 @@ MagickExport Image *EvaluateImages(const Image *images, { #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static) shared(progress,status) \ - dynamic_num_threads_tres(images->columns,images->rows,key == ~0UL) + dynamic_number_threads(images->columns,images->rows,key == ~0UL) #endif for (y=0; y < (ssize_t) evaluate_image->rows; y++) { @@ -614,7 +614,7 @@ MagickExport Image *EvaluateImages(const Image *images, { #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static) shared(progress,status) \ - dynamic_num_threads_tres(images->columns,images->rows,key == ~0UL) + dynamic_number_threads(images->columns,images->rows,key == ~0UL) #endif for (y=0; y < (ssize_t) evaluate_image->rows; y++) { @@ -820,7 +820,7 @@ MagickExport MagickBooleanType EvaluateImage(Image *image, image_view=AcquireAuthenticCacheView(image,exception); #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,4) shared(progress,status) \ - dynamic_num_threads_tres(image->columns,image->rows,key == ~0UL) + dynamic_number_threads(image->columns,image->rows,key == ~0UL) #endif for (y=0; y < (ssize_t) image->rows; y++) { @@ -1053,7 +1053,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) \ - dynamic_num_threads_dos(image->columns,image->rows) + dynamic_number_threads(image->columns,image->rows,1) #endif for (y=0; y < (ssize_t) image->rows; y++) { @@ -1317,7 +1317,7 @@ MagickExport MagickBooleanType GetImageKurtosis(const Image *image, image_view=AcquireVirtualCacheView(image,exception); #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static) shared(status) \ - dynamic_num_threads_dos(image->columns,image->rows) + dynamic_number_threads(image->columns,image->rows,1) #endif for (y=0; y < (ssize_t) image->rows; y++) { @@ -1446,7 +1446,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) shared(status) \ - dynamic_num_threads_dos(image->columns,image->rows) + dynamic_number_threads(image->columns,image->rows,1) #endif for (y=0; y < (ssize_t) image->rows; y++) { @@ -2268,7 +2268,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) \ - dynamic_num_threads_dos(image->columns,image->rows) + dynamic_number_threads(image->columns,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 2623d521b..f30b82fb9 100644 --- a/MagickCore/thread-private.h +++ b/MagickCore/thread-private.h @@ -29,15 +29,7 @@ extern "C" { Single threaded unless workload justifies the threading overhead. */ #define MinimumWorkLoad() (32*GetMagickResourceLimit(ThreadResource)) -#define dynamic_num_threads_uno(colors) \ - if ((colors) > MinimumWorkLoad()) \ - num_threads(GetMagickResourceLimit(ThreadResource)) -#define dynamic_num_threads_dos(columns,rows) \ - if (((((columns) > MinimumWorkLoad()) || \ - ((rows) > MinimumWorkLoad()))) && ((MagickSizeType) \ - ((columns)*(rows)) > (MinimumWorkLoad()*MinimumWorkLoad()))) \ - num_threads(GetMagickResourceLimit(ThreadResource)) -#define dynamic_num_threads_tres(columns,rows,expression) \ +#define dynamic_number_threads(columns,rows,expression) \ if (((((columns) > MinimumWorkLoad()) || \ ((rows) > MinimumWorkLoad()))) && ((MagickSizeType) \ ((columns)*(rows)) > (MinimumWorkLoad()*MinimumWorkLoad())) && \ diff --git a/MagickCore/threshold.c b/MagickCore/threshold.c index 0fe399d07..6b42c38dc 100644 --- a/MagickCore/threshold.c +++ b/MagickCore/threshold.c @@ -206,7 +206,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) \ - dynamic_num_threads_dos(image->columns,image->rows) + dynamic_number_threads(image->columns,image->rows,1) #endif for (y=0; y < (ssize_t) image->rows; y++) { @@ -393,7 +393,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,8) shared(progress,status) \ - dynamic_num_threads_dos(image->columns,image->rows) + dynamic_number_threads(image->columns,image->rows,1) #endif for (y=0; y < (ssize_t) image->rows; y++) { @@ -560,7 +560,7 @@ MagickExport MagickBooleanType BlackThresholdImage(Image *image, image_view=AcquireAuthenticCacheView(image,exception); #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,8) shared(progress,status) \ - dynamic_num_threads_dos(image->columns,image->rows) + dynamic_number_threads(image->columns,image->rows,1) #endif for (y=0; y < (ssize_t) image->rows; y++) { @@ -703,7 +703,7 @@ MagickExport MagickBooleanType ClampImage(Image *image,ExceptionInfo *exception) image_view=AcquireAuthenticCacheView(image,exception); #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,8) shared(progress,status) \ - dynamic_num_threads_dos(image->columns,image->rows) + dynamic_number_threads(image->columns,image->rows,1) #endif for (y=0; y < (ssize_t) image->rows; y++) { @@ -1327,7 +1327,7 @@ MagickExport MagickBooleanType OrderedPosterizeImage(Image *image, image_view=AcquireAuthenticCacheView(image,exception); #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,8) shared(progress,status) \ - dynamic_num_threads_dos(image->columns,image->rows) + dynamic_number_threads(image->columns,image->rows,1) #endif for (y=0; y < (ssize_t) image->rows; y++) { @@ -1507,7 +1507,7 @@ MagickExport MagickBooleanType RandomThresholdImage(Image *image, image_view=AcquireAuthenticCacheView(image,exception); #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,8) shared(progress,status) \ - dynamic_num_threads_tres(image->columns,image->rows,key == ~0UL) + dynamic_number_threads(image->columns,image->rows,key == ~0UL) #endif for (y=0; y < (ssize_t) image->rows; y++) { @@ -1690,7 +1690,7 @@ MagickExport MagickBooleanType WhiteThresholdImage(Image *image, image_view=AcquireAuthenticCacheView(image,exception); #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,8) shared(progress,status) \ - dynamic_num_threads_dos(image->columns,image->rows) + dynamic_number_threads(image->columns,image->rows,1) #endif for (y=0; y < (ssize_t) image->rows; y++) { diff --git a/MagickCore/transform.c b/MagickCore/transform.c index 5c8926413..ddd492d14 100644 --- a/MagickCore/transform.c +++ b/MagickCore/transform.c @@ -161,7 +161,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) shared(progress,status) \ - dynamic_num_threads_dos(image->columns,image->rows) + dynamic_number_threads(image->columns,image->rows,1) #endif for (y=0; y < (ssize_t) extent.y; y++) { @@ -232,7 +232,7 @@ MagickExport Image *ChopImage(const Image *image,const RectangleInfo *chop_info, */ #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static) shared(progress,status) \ - dynamic_num_threads_dos(image->columns,image->rows) + dynamic_number_threads(image->columns,image->rows,1) #endif for (y=0; y < (ssize_t) (image->rows-(extent.y+extent.height)); y++) { @@ -588,7 +588,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) shared(progress,status) \ - dynamic_num_threads_dos(image->columns,image->rows) + dynamic_number_threads(image->columns,image->rows,1) #endif for (y=0; y < (ssize_t) crop_image->rows; y++) { @@ -950,7 +950,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) \ - dynamic_num_threads_dos(image->columns,image->rows) + dynamic_number_threads(image->columns,image->rows,1) #endif for (y=0; y < (ssize_t) excerpt_image->rows; y++) { @@ -1158,7 +1158,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) shared(progress,status) \ - dynamic_num_threads_dos(image->columns,image->rows) + dynamic_number_threads(image->columns,image->rows,1) #endif for (y=0; y < (ssize_t) flip_image->rows; y++) { @@ -1305,7 +1305,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) shared(progress,status) \ - dynamic_num_threads_dos(image->columns,image->rows) + dynamic_number_threads(image->columns,image->rows,1) #endif for (y=0; y < (ssize_t) flop_image->rows; y++) { @@ -1435,7 +1435,7 @@ static inline MagickBooleanType CopyImageRegion(Image *destination, destination_view=AcquireAuthenticCacheView(destination,exception); #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static) shared(status) \ - dynamic_num_threads_dos(columns,rows) + dynamic_number_threads(columns,rows,1) #endif for (y=0; y < (ssize_t) rows; y++) { @@ -1764,7 +1764,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) \ - dynamic_num_threads_dos(image->columns,image->rows) + dynamic_number_threads(image->columns,image->rows,1) #endif for (y=0; y < (ssize_t) splice_geometry.y; y++) { @@ -1869,7 +1869,7 @@ MagickExport Image *SpliceImage(const Image *image, } #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,4) shared(progress,status) \ - dynamic_num_threads_dos(image->columns,image->rows) + dynamic_number_threads(image->columns,image->rows,1) #endif for (y=(ssize_t) (splice_geometry.y+splice_geometry.height); y < (ssize_t) splice_image->rows; y++) @@ -2221,7 +2221,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) \ - dynamic_num_threads_dos(image->columns,image->rows) + dynamic_number_threads(image->columns,image->rows,1) #endif for (y=0; y < (ssize_t) image->rows; y++) { @@ -2371,7 +2371,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) \ - dynamic_num_threads_dos(image->columns,image->rows) + dynamic_number_threads(image->columns,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 777f26aa7..c49b439eb 100644 --- a/MagickWand/wand-view.c +++ b/MagickWand/wand-view.c @@ -292,7 +292,7 @@ WandExport MagickBooleanType DuplexTransferWandViewIterator(WandView *source, width=source->extent.width-source->extent.x; #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static) shared(progress,status) \ - dynamic_num_threads_dos(width,height) + dynamic_number_threads(width,height,1) #endif for (y=source->extent.y; y < (ssize_t) source->extent.height; y++) { @@ -545,7 +545,7 @@ WandExport MagickBooleanType GetWandViewIterator(WandView *source, width=source->extent.width-source->extent.x; #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static) shared(progress,status) \ - dynamic_num_threads_dos(width,height) + dynamic_number_threads(width,height,1) #endif for (y=source->extent.y; y < (ssize_t) source->extent.height; y++) { @@ -948,7 +948,7 @@ WandExport MagickBooleanType SetWandViewIterator(WandView *destination, width=destination->extent.width-destination->extent.x; #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static) shared(progress,status) \ - dynamic_num_threads_dos(width,height) + dynamic_number_threads(width,height,1) #endif for (y=destination->extent.y; y < (ssize_t) destination->extent.height; y++) { @@ -1085,7 +1085,7 @@ WandExport MagickBooleanType TransferWandViewIterator(WandView *source, width=source->extent.width-source->extent.x; #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static) shared(progress,status) \ - dynamic_num_threads_dos(width,height) + dynamic_number_threads(width,height,1) #endif for (y=source->extent.y; y < (ssize_t) source->extent.height; y++) { @@ -1239,7 +1239,7 @@ WandExport MagickBooleanType UpdateWandViewIterator(WandView *source, width=source->extent.width-source->extent.x; #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static) shared(progress,status) \ - dynamic_num_threads_dos(width,height) + dynamic_number_threads(width,height,1) #endif for (y=source->extent.y; y < (ssize_t) source->extent.height; y++) { diff --git a/coders/hald.c b/coders/hald.c index d14078df2..236e58fec 100644 --- a/coders/hald.c +++ b/coders/hald.c @@ -127,7 +127,7 @@ static Image *ReadHALDImage(const ImageInfo *image_info, image->rows=(size_t) (level*cube_size); #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,8) shared(status) \ - dynamic_num_threads_dos(image->columns,image->rows) + dynamic_number_threads(image->columns,image->rows,1) #endif for (y=0; y < (ssize_t) image->rows; y+=(ssize_t) level) { diff --git a/coders/rgb.c b/coders/rgb.c index d3c733406..2ad462d61 100644 --- a/coders/rgb.c +++ b/coders/rgb.c @@ -96,8 +96,7 @@ static MagickBooleanType % o exception: return any errors or warnings in this structure. % */ -static Image *ReadRGBImage(const ImageInfo *image_info, - ExceptionInfo *exception) +static Image *ReadRGBImage(const ImageInfo *image_info,ExceptionInfo *exception) { Image *canvas_image, @@ -248,8 +247,7 @@ static Image *ReadRGBImage(const ImageInfo *image_info, canvas_image->columns,1,exception); q=QueueAuthenticPixels(image,0,y-image->extract_info.y, image->columns,1,exception); - if ((p == (const Quantum *) NULL) || - (q == (Quantum *) NULL)) + if ((p == (const Quantum *) NULL) || (q == (Quantum *) NULL)) break; for (x=0; x < (ssize_t) image->columns; x++) { @@ -332,8 +330,7 @@ static Image *ReadRGBImage(const ImageInfo *image_info, 0,canvas_image->columns,1,exception); q=GetAuthenticPixels(image,0,y-image->extract_info.y, image->columns,1,exception); - if ((p == (const Quantum *) NULL) || - (q == (Quantum *) NULL)) + if ((p == (const Quantum *) NULL) || (q == (Quantum *) NULL)) break; for (x=0; x < (ssize_t) image->columns; x++) { @@ -427,8 +424,7 @@ static Image *ReadRGBImage(const ImageInfo *image_info, canvas_image->columns,1,exception); q=GetAuthenticPixels(image,0,y-image->extract_info.y, image->columns,1,exception); - if ((p == (const Quantum *) NULL) || - (q == (Quantum *) NULL)) + if ((p == (const Quantum *) NULL) || (q == (Quantum *) NULL)) break; for (x=0; x < (ssize_t) image->columns; x++) { @@ -479,8 +475,7 @@ static Image *ReadRGBImage(const ImageInfo *image_info, canvas_image->columns,1,exception); q=GetAuthenticPixels(image,0,y-image->extract_info.y, image->columns,1,exception); - if ((p == (const Quantum *) NULL) || - (q == (Quantum *) NULL)) + if ((p == (const Quantum *) NULL) || (q == (Quantum *) NULL)) break; for (x=0; x < (ssize_t) image->columns; x++) { @@ -531,8 +526,7 @@ static Image *ReadRGBImage(const ImageInfo *image_info, canvas_image->columns,1,exception); q=GetAuthenticPixels(image,0,y-image->extract_info.y, image->columns,1,exception); - if ((p == (const Quantum *) NULL) || - (q == (Quantum *) NULL)) + if ((p == (const Quantum *) NULL) || (q == (Quantum *) NULL)) break; for (x=0; x < (ssize_t) image->columns; x++) { @@ -592,8 +586,7 @@ static Image *ReadRGBImage(const ImageInfo *image_info, exception); q=GetAuthenticPixels(image,0,y-image->extract_info.y, image->columns,1,exception); - if ((p == (const Quantum *) NULL) || - (q == (Quantum *) NULL)) + if ((p == (const Quantum *) NULL) || (q == (Quantum *) NULL)) break; for (x=0; x < (ssize_t) image->columns; x++) { @@ -679,8 +672,7 @@ static Image *ReadRGBImage(const ImageInfo *image_info, canvas_image->columns,1,exception); q=GetAuthenticPixels(image,0,y-image->extract_info.y, image->columns,1,exception); - if ((p == (const Quantum *) NULL) || - (q == (Quantum *) NULL)) + if ((p == (const Quantum *) NULL) || (q == (Quantum *) NULL)) break; for (x=0; x < (ssize_t) image->columns; x++) { @@ -750,8 +742,7 @@ static Image *ReadRGBImage(const ImageInfo *image_info, canvas_image->columns,1,exception); q=GetAuthenticPixels(image,0,y-image->extract_info.y, image->columns,1,exception); - if ((p == (const Quantum *) NULL) || - (q == (Quantum *) NULL)) + if ((p == (const Quantum *) NULL) || (q == (Quantum *) NULL)) break; for (x=0; x < (ssize_t) image->columns; x++) { @@ -821,8 +812,7 @@ static Image *ReadRGBImage(const ImageInfo *image_info, canvas_image->columns,1,exception); q=GetAuthenticPixels(image,0,y-image->extract_info.y, image->columns,1,exception); - if ((p == (const Quantum *) NULL) || - (q == (Quantum *) NULL)) + if ((p == (const Quantum *) NULL) || (q == (Quantum *) NULL)) break; for (x=0; x < (ssize_t) image->columns; x++) { @@ -1066,8 +1056,8 @@ ModuleExport void UnregisterRGBImage(void) % o exception: return any errors or warnings in this structure. % */ -static MagickBooleanType WriteRGBImage(const ImageInfo *image_info, - Image *image,ExceptionInfo *exception) +static MagickBooleanType WriteRGBImage(const ImageInfo *image_info,Image *image, + ExceptionInfo *exception) { MagickBooleanType status; diff --git a/filters/analyze.c b/filters/analyze.c index 9622757e2..b4005c486 100644 --- a/filters/analyze.c +++ b/filters/analyze.c @@ -146,7 +146,7 @@ ModuleExport size_t analyzeImage(Image **images,const int argc, image_view=AcquireVirtualCacheView(image,exception); #if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for schedule(static,4) shared(status) \ - dynamic_num_threads_dos(image->columns,image->rows) + dynamic_number_threads(image->columns,image->rows,1) #endif for (y=0; y < (ssize_t) image->rows; y++) {