From e6178503e4d6d3260666d42080d6f02545413685 Mon Sep 17 00:00:00 2001 From: cristy Date: Fri, 23 Dec 2011 17:02:29 +0000 Subject: [PATCH] --- MagickCore/attribute.c | 10 +++--- MagickCore/colormap.c | 6 ++-- MagickCore/colorspace.c | 74 +++++++++++++++++++------------------- MagickCore/compare.c | 14 ++++---- MagickCore/composite.c | 80 ++++++++++++++++++++++++----------------- MagickCore/decorate.c | 8 ++--- MagickCore/distort.c | 4 +-- MagickCore/draw.c | 8 ++--- MagickCore/effect.c | 22 ++++++------ MagickCore/enhance.c | 60 +++++++++++++++---------------- MagickCore/feature.c | 12 +++---- MagickCore/fx.c | 26 +++++++------- MagickCore/image.c | 16 ++++----- MagickCore/morphology.c | 4 +-- MagickCore/paint.c | 8 ++--- MagickCore/prepress.c | 2 +- MagickCore/profile.c | 2 +- MagickCore/quantize.c | 10 +++--- MagickCore/resize.c | 4 +-- MagickCore/segment.c | 2 +- MagickCore/shear.c | 16 ++++----- MagickCore/statistic.c | 14 ++++---- MagickCore/threshold.c | 14 ++++---- MagickCore/transform.c | 22 ++++++------ filters/analyze.c | 2 +- 25 files changed, 227 insertions(+), 213 deletions(-) diff --git a/MagickCore/attribute.c b/MagickCore/attribute.c index d595ced2c..7bb7d99d1 100644 --- a/MagickCore/attribute.c +++ b/MagickCore/attribute.c @@ -168,7 +168,7 @@ MagickExport RectangleInfo GetImageBoundingBox(const Image *image, status=MagickTrue; GetPixelInfo(image,&zero); #if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp parallel for schedule(dynamic,4) shared(status) + #pragma omp parallel for schedule(static,4) shared(status) #endif for (y=0; y < (ssize_t) image->rows; y++) { @@ -309,7 +309,7 @@ MagickExport size_t GetImageDepth(const Image *image, p=image->colormap; #if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp parallel for schedule(dynamic,4) shared(status) + #pragma omp parallel for schedule(static,4) shared(status) #endif for (i=0; i < (ssize_t) image->colors; i++) { @@ -352,7 +352,7 @@ MagickExport size_t GetImageDepth(const Image *image, } image_view=AcquireCacheView(image); #if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp parallel for schedule(dynamic,4) shared(status) + #pragma omp parallel for schedule(static,4) shared(status) #endif for (y=0; y < (ssize_t) image->rows; y++) { @@ -832,7 +832,7 @@ MagickExport MagickBooleanType SetImageDepth(Image *image, range=GetQuantumRange(depth); image_view=AcquireCacheView(image); #if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp parallel for schedule(dynamic,4) shared(status) + #pragma omp parallel for schedule(static,4) shared(status) #endif for (y=0; y < (ssize_t) image->rows; y++) { @@ -888,7 +888,7 @@ MagickExport MagickBooleanType SetImageDepth(Image *image, p=image->colormap; #if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp parallel for schedule(dynamic,4) shared(status) + #pragma omp parallel for schedule(static,4) shared(status) #endif for (i=0; i < (ssize_t) image->colors; i++) { diff --git a/MagickCore/colormap.c b/MagickCore/colormap.c index 36ddf6833..d5ff3e804 100644 --- a/MagickCore/colormap.c +++ b/MagickCore/colormap.c @@ -198,7 +198,7 @@ MagickExport MagickBooleanType CycleColormapImage(Image *image, status=MagickTrue; image_view=AcquireCacheView(image); #if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp parallel for schedule(dynamic,4) shared(status) + #pragma omp parallel for schedule(static,4) shared(status) #endif for (y=0; y < (ssize_t) image->rows; y++) { @@ -322,7 +322,7 @@ MagickExport MagickBooleanType SortColormapByIntensity(Image *image, Assign index values to colormap entries. */ #if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp parallel for schedule(dynamic,4) shared(status) + #pragma omp parallel for schedule(static,4) shared(status) #endif for (i=0; i < (ssize_t) image->colors; i++) image->colormap[i].alpha=(Quantum) i; @@ -335,7 +335,7 @@ MagickExport MagickBooleanType SortColormapByIntensity(Image *image, Update image colormap indexes to sorted colormap order. */ #if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp parallel for schedule(dynamic,4) shared(status) + #pragma omp parallel for schedule(static,4) shared(status) #endif for (i=0; i < (ssize_t) image->colors; i++) pixels[(ssize_t) image->colormap[i].alpha]=(unsigned short) i; diff --git a/MagickCore/colorspace.c b/MagickCore/colorspace.c index 2df79ea22..32d9ffbc0 100644 --- a/MagickCore/colorspace.c +++ b/MagickCore/colorspace.c @@ -249,7 +249,7 @@ MagickExport MagickBooleanType RGBTransformImage(Image *image, } image_view=AcquireCacheView(image); #if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp parallel for schedule(dynamic,4) shared(status) + #pragma omp parallel for schedule(static,4) shared(status) #endif for (y=0; y < (ssize_t) image->rows; y++) { @@ -305,7 +305,7 @@ MagickExport MagickBooleanType RGBTransformImage(Image *image, GetPixelInfo(image,&zero); image_view=AcquireCacheView(image); #if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp parallel for schedule(dynamic,4) shared(status) + #pragma omp parallel for schedule(static,4) shared(status) #endif for (y=0; y < (ssize_t) image->rows; y++) { @@ -358,7 +358,7 @@ MagickExport MagickBooleanType RGBTransformImage(Image *image, } image_view=AcquireCacheView(image); #if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp parallel for schedule(dynamic,4) shared(status) + #pragma omp parallel for schedule(static,4) shared(status) #endif for (y=0; y < (ssize_t) image->rows; y++) { @@ -418,7 +418,7 @@ MagickExport MagickBooleanType RGBTransformImage(Image *image, } image_view=AcquireCacheView(image); #if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp parallel for schedule(dynamic,4) shared(status) + #pragma omp parallel for schedule(static,4) shared(status) #endif for (y=0; y < (ssize_t) image->rows; y++) { @@ -478,7 +478,7 @@ MagickExport MagickBooleanType RGBTransformImage(Image *image, } image_view=AcquireCacheView(image); #if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp parallel for schedule(dynamic,4) shared(status) + #pragma omp parallel for schedule(static,4) shared(status) #endif for (y=0; y < (ssize_t) image->rows; y++) { @@ -538,7 +538,7 @@ MagickExport MagickBooleanType RGBTransformImage(Image *image, } image_view=AcquireCacheView(image); #if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp parallel for schedule(dynamic,4) shared(status) + #pragma omp parallel for schedule(static,4) shared(status) #endif for (y=0; y < (ssize_t) image->rows; y++) { @@ -641,7 +641,7 @@ MagickExport MagickBooleanType RGBTransformImage(Image *image, black=pow(10.0,(reference_black-reference_white)*(gamma/density)* 0.002/film_gamma); #if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp parallel for schedule(dynamic,4) + #pragma omp parallel for schedule(static,4) #endif for (i=0; i <= (ssize_t) MaxMap; i++) logmap[i]=ScaleMapToQuantum((MagickRealType) (MaxMap*(reference_white+ @@ -649,7 +649,7 @@ MagickExport MagickBooleanType RGBTransformImage(Image *image, 0.002/film_gamma))/1024.0)); image_view=AcquireCacheView(image); #if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp parallel for schedule(dynamic,4) shared(status) + #pragma omp parallel for schedule(static,4) shared(status) #endif for (y=0; y < (ssize_t) image->rows; y++) { @@ -721,7 +721,7 @@ MagickExport MagickBooleanType RGBTransformImage(Image *image, primary_info.y=(double) (MaxMap+1.0)/2.0; primary_info.z=(double) (MaxMap+1.0)/2.0; #if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp parallel for schedule(dynamic,4) + #pragma omp parallel for schedule(static,4) #endif for (i=0; i <= (ssize_t) MaxMap; i++) { @@ -746,7 +746,7 @@ MagickExport MagickBooleanType RGBTransformImage(Image *image, G = 0.29900*R+0.58700*G+0.11400*B */ #if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp parallel for schedule(dynamic,4) + #pragma omp parallel for schedule(static,4) #endif for (i=0; i <= (ssize_t) MaxMap; i++) { @@ -779,7 +779,7 @@ MagickExport MagickBooleanType RGBTransformImage(Image *image, primary_info.y=(double) (MaxMap+1.0)/2.0; primary_info.z=(double) (MaxMap+1.0)/2.0; #if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp parallel for schedule(dynamic,4) + #pragma omp parallel for schedule(static,4) #endif for (i=0; i <= (ssize_t) MaxMap; i++) { @@ -803,7 +803,7 @@ MagickExport MagickBooleanType RGBTransformImage(Image *image, G = 0.21260*R+0.71520*G+0.07220*B */ #if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp parallel for schedule(dynamic,4) + #pragma omp parallel for schedule(static,4) #endif for (i=0; i <= (ssize_t) MaxMap; i++) { @@ -834,7 +834,7 @@ MagickExport MagickBooleanType RGBTransformImage(Image *image, primary_info.y=(double) (MaxMap+1.0)/2.0; primary_info.z=(double) (MaxMap+1.0)/2.0; #if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp parallel for schedule(dynamic,4) + #pragma omp parallel for schedule(static,4) #endif for (i=0; i <= (ssize_t) MaxMap; i++) { @@ -860,7 +860,7 @@ MagickExport MagickBooleanType RGBTransformImage(Image *image, B = 0.0*R+0.0*G+1.0*B */ #if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp parallel for schedule(dynamic,4) + #pragma omp parallel for schedule(static,4) #endif for (i=0; i <= (ssize_t) MaxMap; i++) { @@ -894,7 +894,7 @@ MagickExport MagickBooleanType RGBTransformImage(Image *image, Z = 0.0193339*R+0.1191920*G+0.9503041*B */ #if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp parallel for schedule(dynamic,4) + #pragma omp parallel for schedule(static,4) #endif for (i=0; i <= (ssize_t) MaxMap; i++) { @@ -964,7 +964,7 @@ MagickExport MagickBooleanType RGBTransformImage(Image *image, primary_info.y=(double) (MaxMap+1.0)/2.0; primary_info.z=(double) (MaxMap+1.0)/2.0; #if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp parallel for schedule(dynamic,4) + #pragma omp parallel for schedule(static,4) #endif for (i=0; i <= (ssize_t) MaxMap; i++) { @@ -995,7 +995,7 @@ MagickExport MagickBooleanType RGBTransformImage(Image *image, primary_info.y=(double) (MaxMap+1.0)/2.0; primary_info.z=(double) (MaxMap+1.0)/2.0; #if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp parallel for schedule(dynamic,4) + #pragma omp parallel for schedule(static,4) #endif for (i=0; i <= (ssize_t) MaxMap; i++) { @@ -1027,7 +1027,7 @@ MagickExport MagickBooleanType RGBTransformImage(Image *image, primary_info.y=(double) (MaxMap+1.0)/2.0; primary_info.z=(double) (MaxMap+1.0)/2.0; #if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp parallel for schedule(dynamic,4) + #pragma omp parallel for schedule(static,4) #endif for (i=0; i <= (ssize_t) MaxMap; i++) { @@ -1057,7 +1057,7 @@ MagickExport MagickBooleanType RGBTransformImage(Image *image, */ image_view=AcquireCacheView(image); #if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp parallel for schedule(dynamic,4) shared(status) + #pragma omp parallel for schedule(static,4) shared(status) #endif for (y=0; y < (ssize_t) image->rows; y++) { @@ -1672,7 +1672,7 @@ MagickExport MagickBooleanType TransformRGBImage(Image *image, } image_view=AcquireCacheView(image); #if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp parallel for schedule(dynamic,4) shared(status) + #pragma omp parallel for schedule(static,4) shared(status) #endif for (y=0; y < (ssize_t) image->rows; y++) { @@ -1731,7 +1731,7 @@ MagickExport MagickBooleanType TransformRGBImage(Image *image, GetPixelInfo(image,&zero); image_view=AcquireCacheView(image); #if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp parallel for schedule(dynamic,4) shared(status) + #pragma omp parallel for schedule(static,4) shared(status) #endif for (y=0; y < (ssize_t) image->rows; y++) { @@ -1787,7 +1787,7 @@ MagickExport MagickBooleanType TransformRGBImage(Image *image, } image_view=AcquireCacheView(image); #if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp parallel for schedule(dynamic,4) shared(status) + #pragma omp parallel for schedule(static,4) shared(status) #endif for (y=0; y < (ssize_t) image->rows; y++) { @@ -1853,7 +1853,7 @@ MagickExport MagickBooleanType TransformRGBImage(Image *image, } image_view=AcquireCacheView(image); #if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp parallel for schedule(dynamic,4) shared(status) + #pragma omp parallel for schedule(static,4) shared(status) #endif for (y=0; y < (ssize_t) image->rows; y++) { @@ -1919,7 +1919,7 @@ MagickExport MagickBooleanType TransformRGBImage(Image *image, } image_view=AcquireCacheView(image); #if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp parallel for schedule(dynamic,4) shared(status) + #pragma omp parallel for schedule(static,4) shared(status) #endif for (y=0; y < (ssize_t) image->rows; y++) { @@ -1985,7 +1985,7 @@ MagickExport MagickBooleanType TransformRGBImage(Image *image, } image_view=AcquireCacheView(image); #if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp parallel for schedule(dynamic,4) shared(status) + #pragma omp parallel for schedule(static,4) shared(status) #endif for (y=0; y < (ssize_t) image->rows; y++) { @@ -2100,7 +2100,7 @@ MagickExport MagickBooleanType TransformRGBImage(Image *image, return(MagickFalse); image_view=AcquireCacheView(image); #if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp parallel for schedule(dynamic,4) shared(status) + #pragma omp parallel for schedule(static,4) shared(status) #endif for (y=0; y < (ssize_t) image->rows; y++) { @@ -2182,7 +2182,7 @@ MagickExport MagickBooleanType TransformRGBImage(Image *image, through QuantumRange. */ #if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp parallel for schedule(dynamic,4) + #pragma omp parallel for schedule(static,4) #endif for (i=0; i <= (ssize_t) MaxMap; i++) { @@ -2217,7 +2217,7 @@ MagickExport MagickBooleanType TransformRGBImage(Image *image, through QuantumRange. */ #if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp parallel for schedule(dynamic,4) + #pragma omp parallel for schedule(static,4) #endif for (i=0; i <= (ssize_t) MaxMap; i++) { @@ -2250,7 +2250,7 @@ MagickExport MagickBooleanType TransformRGBImage(Image *image, through QuantumRange. */ #if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp parallel for schedule(dynamic,4) + #pragma omp parallel for schedule(static,4) #endif for (i=0; i <= (ssize_t) MaxMap; i++) { @@ -2280,7 +2280,7 @@ MagickExport MagickBooleanType TransformRGBImage(Image *image, B = 0.0*R+0.0*G+1.0*B */ #if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp parallel for schedule(dynamic,4) + #pragma omp parallel for schedule(static,4) #endif for (i=0; i <= (ssize_t) MaxMap; i++) { @@ -2306,7 +2306,7 @@ MagickExport MagickBooleanType TransformRGBImage(Image *image, B = 0.0556434*X-0.2040259*Y+1.057225*Z */ #if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp parallel for schedule(dynamic,4) + #pragma omp parallel for schedule(static,4) #endif for (i=0; i <= (ssize_t) MaxMap; i++) { @@ -2334,7 +2334,7 @@ MagickExport MagickBooleanType TransformRGBImage(Image *image, YCC is scaled by 1.3584. C1 zero is 156 and C2 is at 137. */ #if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp parallel for schedule(dynamic,4) + #pragma omp parallel for schedule(static,4) #endif for (i=0; i <= (ssize_t) MaxMap; i++) { @@ -2367,7 +2367,7 @@ MagickExport MagickBooleanType TransformRGBImage(Image *image, through QuantumRange. */ #if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp parallel for schedule(dynamic,4) + #pragma omp parallel for schedule(static,4) #endif for (i=0; i <= (ssize_t) MaxMap; i++) { @@ -2402,7 +2402,7 @@ MagickExport MagickBooleanType TransformRGBImage(Image *image, through QuantumRange. */ #if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp parallel for schedule(dynamic,4) + #pragma omp parallel for schedule(static,4) #endif for (i=0; i <= (ssize_t) MaxMap; i++) { @@ -2436,7 +2436,7 @@ MagickExport MagickBooleanType TransformRGBImage(Image *image, through QuantumRange. */ #if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp parallel for schedule(dynamic,4) + #pragma omp parallel for schedule(static,4) #endif for (i=0; i <= (ssize_t) MaxMap; i++) { @@ -2470,7 +2470,7 @@ MagickExport MagickBooleanType TransformRGBImage(Image *image, */ image_view=AcquireCacheView(image); #if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp parallel for schedule(dynamic,4) shared(status) + #pragma omp parallel for schedule(static,4) shared(status) #endif for (y=0; y < (ssize_t) image->rows; y++) { @@ -2579,7 +2579,7 @@ MagickExport MagickBooleanType TransformRGBImage(Image *image, */ image_view=AcquireCacheView(image); #if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp parallel for schedule(dynamic,4) shared(status) + #pragma omp parallel for schedule(static,4) shared(status) #endif for (i=0; i < (ssize_t) image->colors; i++) { diff --git a/MagickCore/compare.c b/MagickCore/compare.c index c9085dc01..477aeb4ce 100644 --- a/MagickCore/compare.c +++ b/MagickCore/compare.c @@ -180,7 +180,7 @@ MagickExport Image *CompareImages(Image *image,const Image *reconstruct_image, reconstruct_view=AcquireCacheView(reconstruct_image); highlight_view=AcquireCacheView(highlight_image); #if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp parallel for schedule(dynamic,4) shared(status) + #pragma omp parallel for schedule(static,4) shared(status) #endif for (y=0; y < (ssize_t) image->rows; y++) { @@ -321,7 +321,7 @@ static MagickBooleanType GetAbsoluteDistortion(const Image *image, image_view=AcquireCacheView(image); reconstruct_view=AcquireCacheView(reconstruct_image); #if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp parallel for schedule(dynamic,4) shared(status) + #pragma omp parallel for schedule(static,4) shared(status) #endif for (y=0; y < (ssize_t) image->rows; y++) { @@ -440,7 +440,7 @@ static MagickBooleanType GetFuzzDistortion(const Image *image, image_view=AcquireCacheView(image); reconstruct_view=AcquireCacheView(reconstruct_image); #if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp parallel for schedule(dynamic,4) shared(status) + #pragma omp parallel for schedule(static,4) shared(status) #endif for (y=0; y < (ssize_t) image->rows; y++) { @@ -535,7 +535,7 @@ static MagickBooleanType GetMeanAbsoluteDistortion(const Image *image, image_view=AcquireCacheView(image); reconstruct_view=AcquireCacheView(reconstruct_image); #if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp parallel for schedule(dynamic,4) shared(status) + #pragma omp parallel for schedule(static,4) shared(status) #endif for (y=0; y < (ssize_t) image->rows; y++) { @@ -719,7 +719,7 @@ static MagickBooleanType GetMeanSquaredDistortion(const Image *image, image_view=AcquireCacheView(image); reconstruct_view=AcquireCacheView(reconstruct_image); #if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp parallel for schedule(dynamic,4) shared(status) + #pragma omp parallel for schedule(static,4) shared(status) #endif for (y=0; y < (ssize_t) image->rows; y++) { @@ -943,7 +943,7 @@ static MagickBooleanType GetPeakAbsoluteDistortion(const Image *image, image_view=AcquireCacheView(image); reconstruct_view=AcquireCacheView(reconstruct_image); #if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp parallel for schedule(dynamic,4) shared(status) + #pragma omp parallel for schedule(static,4) shared(status) #endif for (y=0; y < (ssize_t) image->rows; y++) { @@ -1542,7 +1542,7 @@ MagickExport Image *SimilarityImage(Image *image,const Image *reference, progress=0; similarity_view=AcquireCacheView(similarity_image); #if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp parallel for schedule(dynamic,4) shared(progress,status) + #pragma omp parallel for schedule(static,4) shared(progress,status) #endif for (y=0; y < (ssize_t) (image->rows-reference->rows+1); y++) { diff --git a/MagickCore/composite.c b/MagickCore/composite.c index f064f1ab3..f54beedc9 100644 --- a/MagickCore/composite.c +++ b/MagickCore/composite.c @@ -309,7 +309,7 @@ static MagickBooleanType CompositeOverImage(Image *image, image_view=AcquireCacheView(image); composite_view=AcquireCacheView(composite_image); #if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp parallel for schedule(dynamic,4) shared(progress,status) + #pragma omp parallel for schedule(static,4) shared(progress,status) #endif for (y=0; y < (ssize_t) image->rows; y++) { @@ -636,7 +636,7 @@ MagickExport MagickBooleanType CompositeImage(Image *image, image_view=AcquireCacheView(image); composite_view=AcquireCacheView(composite_image); #if defined(MAGICKCORE_OPENMP_SUPPORT) -#pragma omp parallel for schedule(dynamic,4) shared(status) +#pragma omp parallel for schedule(static,4) shared(status) #endif for (y=0; y < (ssize_t) composite_image->rows; y++) { @@ -1126,7 +1126,7 @@ MagickExport MagickBooleanType CompositeImage(Image *image, image_view=AcquireCacheView(image); composite_view=AcquireCacheView(composite_image); #if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp parallel for schedule(dynamic,4) shared(progress,status) + #pragma omp parallel for schedule(static,4) shared(progress,status) #endif for (y=0; y < (ssize_t) image->rows; y++) { @@ -2184,18 +2184,18 @@ MagickExport MagickBooleanType CompositeImage(Image *image, % % The format of the TextureImage method is: % -% MagickBooleanType TextureImage(Image *image,const Image *texture, +% MagickBooleanType TextureImage(Image *image,const Image *texture_image, % ExceptionInfo *exception) % % A description of each parameter follows: % % o image: the image. % -% o texture: This image is the texture to layer on the background. +% o texture_image: This image is the texture to layer on the background. % */ -MagickExport MagickBooleanType TextureImage(Image *image,const Image *texture, - ExceptionInfo *exception) +MagickExport MagickBooleanType TextureImage(Image *image, + const Image *texture_image,ExceptionInfo *exception) { #define TextureImageTag "Texture/Image" @@ -2213,36 +2213,37 @@ MagickExport MagickBooleanType TextureImage(Image *image,const Image *texture, if (image->debug != MagickFalse) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"..."); assert(image->signature == MagickSignature); - if (texture == (const Image *) NULL) + if (texture_image == (const Image *) NULL) return(MagickFalse); - (void) SetImageVirtualPixelMethod(texture,TileVirtualPixelMethod); + (void) SetImageVirtualPixelMethod(texture_image,TileVirtualPixelMethod); if (SetImageStorageClass(image,DirectClass,exception) == MagickFalse) return(MagickFalse); status=MagickTrue; if ((image->compose != CopyCompositeOp) && ((image->compose != OverCompositeOp) || (image->matte != MagickFalse) || - (texture->matte != MagickFalse))) + (texture_image->matte != MagickFalse))) { /* Tile texture onto the image background. */ #if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp parallel for schedule(dynamic,4) shared(status) omp_throttle(1) + #pragma omp parallel for schedule(static,4) shared(status) omp_throttle(1) #endif - for (y=0; y < (ssize_t) image->rows; y+=(ssize_t) texture->rows) + for (y=0; y < (ssize_t) image->rows; y+=(ssize_t) texture_image->rows) { register ssize_t x; if (status == MagickFalse) continue; - for (x=0; x < (ssize_t) image->columns; x+=(ssize_t) texture->columns) + for (x=0; x < (ssize_t) image->columns; x+=(ssize_t) texture_image->columns) { MagickBooleanType thread_status; - thread_status=CompositeImage(image,image->compose,texture,x+ - texture->tile_offset.x,y+texture->tile_offset.y,exception); + thread_status=CompositeImage(image,image->compose,texture_image,x+ + texture_image->tile_offset.x,y+texture_image->tile_offset.y, + exception); if (thread_status == MagickFalse) { status=thread_status; @@ -2272,9 +2273,9 @@ MagickExport MagickBooleanType TextureImage(Image *image,const Image *texture, */ status=MagickTrue; image_view=AcquireCacheView(image); - texture_view=AcquireCacheView(texture); + texture_view=AcquireCacheView(texture_image); #if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp parallel for schedule(dynamic,4) shared(status) omp_throttle(1) + #pragma omp parallel for schedule(static,4) shared(status) omp_throttle(1) #endif for (y=0; y < (ssize_t) image->rows; y++) { @@ -2296,34 +2297,47 @@ MagickExport MagickBooleanType TextureImage(Image *image,const Image *texture, if (status == MagickFalse) continue; - pixels=GetCacheViewVirtualPixels(texture_view,texture->tile_offset.x,(y+ - texture->tile_offset.y) % texture->rows,texture->columns,1,exception); - q=QueueCacheViewAuthenticPixels(image_view,0,y,image->columns,1, - exception); + pixels=GetCacheViewVirtualPixels(texture_view,texture_image->tile_offset.x, + (y+texture_image->tile_offset.y) % texture_image->rows, + texture_image->columns,1,exception); + q=QueueCacheViewAuthenticPixels(image_view,0,y,image->columns,1,exception); if ((pixels == (const Quantum *) NULL) || (q == (Quantum *) NULL)) { status=MagickFalse; continue; } - for (x=0; x < (ssize_t) image->columns; x+=(ssize_t) texture->columns) + for (x=0; x < (ssize_t) image->columns; x+=(ssize_t) texture_image->columns) { register ssize_t - i; + j; p=pixels; - width=texture->columns; + width=texture_image->columns; if ((x+(ssize_t) width) > (ssize_t) image->columns) width=image->columns-x; - for (i=0; i < (ssize_t) width; i++) + for (j=0; j < (ssize_t) width; j++) { - SetPixelRed(image,GetPixelRed(texture,p),q); - SetPixelGreen(image,GetPixelGreen(texture,p),q); - SetPixelBlue(image,GetPixelBlue(texture,p),q); - SetPixelAlpha(image,GetPixelAlpha(texture,p),q); - if ((image->colorspace == CMYKColorspace) && - (texture->colorspace == CMYKColorspace)) - SetPixelBlack(image,GetPixelBlack(texture,p),q); - p+=GetPixelChannels(texture); + register ssize_t + i; + + for (i=0; i < (ssize_t) GetPixelChannels(texture_image); i++) + { + PixelChannel + channel; + + PixelTrait + texture_traits, + traits; + + channel=GetPixelChannelMapChannel(texture_image,i); + texture_traits=GetPixelChannelMapTraits(texture_image,channel); + traits=GetPixelChannelMapTraits(image,channel); + if ((traits == UndefinedPixelTrait) || + (texture_traits == UndefinedPixelTrait)) + continue; + SetPixelChannel(image,channel,p[i],q); + } + p+=GetPixelChannels(texture_image); q+=GetPixelChannels(image); } } diff --git a/MagickCore/decorate.c b/MagickCore/decorate.c index 4ff667ae3..238c49d97 100644 --- a/MagickCore/decorate.c +++ b/MagickCore/decorate.c @@ -379,7 +379,7 @@ MagickExport Image *FrameImage(const Image *image,const FrameInfo *frame_info, Draw sides of ornamental border. */ #if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp parallel for schedule(dynamic,4) shared(progress,status) omp_throttle(1) + #pragma omp parallel for schedule(static,4) shared(progress,status) omp_throttle(1) #endif for (y=0; y < (ssize_t) image->rows; y++) { @@ -679,7 +679,7 @@ MagickExport MagickBooleanType RaiseImage(Image *image, progress=0; image_view=AcquireCacheView(image); #if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp parallel for schedule(dynamic,4) shared(progress,status) omp_throttle(1) + #pragma omp parallel for schedule(static,4) shared(progress,status) omp_throttle(1) #endif for (y=0; y < (ssize_t) raise_info->height; y++) { @@ -768,7 +768,7 @@ MagickExport MagickBooleanType RaiseImage(Image *image, } } #if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp parallel for schedule(dynamic,4) shared(progress,status) omp_throttle(1) + #pragma omp parallel for schedule(static,4) shared(progress,status) omp_throttle(1) #endif for (y=(ssize_t) raise_info->height; y < (ssize_t) (image->rows-raise_info->height); y++) { @@ -840,7 +840,7 @@ MagickExport MagickBooleanType RaiseImage(Image *image, } } #if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp parallel for schedule(dynamic,4) shared(progress,status) omp_throttle(1) + #pragma omp parallel for schedule(static,4) shared(progress,status) omp_throttle(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 bf3eaceda..099475ed3 100644 --- a/MagickCore/distort.c +++ b/MagickCore/distort.c @@ -2312,7 +2312,7 @@ MagickExport Image *DistortImage(const Image *image,DistortImageMethod method, UndefinedVirtualPixelMethod,MagickFalse,exception); distort_view=AcquireCacheView(distort_image); #if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp parallel for schedule(dynamic,4) shared(progress,status) + #pragma omp parallel for schedule(static,4) shared(progress,status) #endif for (j=0; j < (ssize_t) distort_image->rows; j++) { @@ -3031,7 +3031,7 @@ MagickExport Image *SparseColorImage(const Image *image, progress=0; sparse_view=AcquireCacheView(sparse_image); #if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp parallel for schedule(dynamic,4) shared(progress,status) + #pragma omp parallel for schedule(static,4) shared(progress,status) #endif for (j=0; j < (ssize_t) sparse_image->rows; j++) { diff --git a/MagickCore/draw.c b/MagickCore/draw.c index 339e3786f..c3b17127b 100644 --- a/MagickCore/draw.c +++ b/MagickCore/draw.c @@ -1156,7 +1156,7 @@ MagickExport MagickBooleanType DrawAffineImage(Image *image, image_view=AcquireCacheView(image); source_view=AcquireCacheView(source); #if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp parallel for schedule(dynamic,4) shared(status) + #pragma omp parallel for schedule(static,4) shared(status) #endif for (y=(ssize_t) ceil(edge.y1-0.5); y <= (ssize_t) floor(edge.y2+0.5); y++) { @@ -3243,7 +3243,7 @@ MagickExport MagickBooleanType DrawGradientImage(Image *image, GetPixelInfo(image,&zero); image_view=AcquireCacheView(image); #if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp parallel for schedule(dynamic,4) shared(status) + #pragma omp parallel for schedule(static,4) shared(status) #endif for (y=bounding_box.y; y < (ssize_t) bounding_box.height; y++) { @@ -3850,7 +3850,7 @@ static MagickBooleanType DrawPolygonPrimitive(Image *image, Draw point. */ #if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp parallel for schedule(dynamic,4) shared(status) + #pragma omp parallel for schedule(static,4) shared(status) #endif for (y=(ssize_t) ceil(bounds.y1-0.5); y <= (ssize_t) floor(bounds.y2+0.5); y++) { @@ -3904,7 +3904,7 @@ static MagickBooleanType DrawPolygonPrimitive(Image *image, if (image->matte == MagickFalse) (void) SetImageAlphaChannel(image,OpaqueAlphaChannel,exception); #if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp parallel for schedule(dynamic,4) shared(status) + #pragma omp parallel for schedule(static,4) shared(status) #endif for (y=(ssize_t) ceil(bounds.y1-0.5); y <= (ssize_t) floor(bounds.y2+0.5); y++) { diff --git a/MagickCore/effect.c b/MagickCore/effect.c index 7544803de..59b7ece15 100644 --- a/MagickCore/effect.c +++ b/MagickCore/effect.c @@ -296,7 +296,7 @@ MagickExport Image *AdaptiveBlurImage(const Image *image,const double radius, edge_view=AcquireCacheView(edge_image); blur_view=AcquireCacheView(blur_image); #if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp parallel for schedule(dynamic,4) shared(progress,status) + #pragma omp parallel for schedule(static,4) shared(progress,status) #endif for (y=0; y < (ssize_t) blur_image->rows; y++) { @@ -618,7 +618,7 @@ MagickExport Image *AdaptiveSharpenImage(const Image *image,const double radius, edge_view=AcquireCacheView(edge_image); sharp_view=AcquireCacheView(sharp_image); #if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp parallel for schedule(dynamic,4) shared(progress,status) + #pragma omp parallel for schedule(static,4) shared(progress,status) #endif for (y=0; y < (ssize_t) sharp_image->rows; y++) { @@ -943,7 +943,7 @@ MagickExport Image *BlurImage(const Image *image,const double radius, image_view=AcquireCacheView(image); blur_view=AcquireCacheView(blur_image); #if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp parallel for schedule(dynamic,4) shared(progress,status) + #pragma omp parallel for schedule(static,4) shared(progress,status) #endif for (y=0; y < (ssize_t) image->rows; y++) { @@ -1065,7 +1065,7 @@ MagickExport Image *BlurImage(const Image *image,const double radius, image_view=AcquireCacheView(blur_image); blur_view=AcquireCacheView(blur_image); #if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp parallel for schedule(dynamic,4) shared(progress,status) + #pragma omp parallel for schedule(static,4) shared(progress,status) #endif for (x=0; x < (ssize_t) blur_image->columns; x++) { @@ -1304,7 +1304,7 @@ MagickExport Image *ConvolveImage(const Image *image, image_view=AcquireCacheView(image); convolve_view=AcquireCacheView(convolve_image); #if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp parallel for schedule(dynamic,4) shared(progress,status) + #pragma omp parallel for schedule(static,4) shared(progress,status) #endif for (y=0; y < (ssize_t) image->rows; y++) { @@ -2166,7 +2166,7 @@ MagickExport Image *MotionBlurImage(const Image *image,const double radius, image_view=AcquireCacheView(image); blur_view=AcquireCacheView(blur_image); #if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp parallel for schedule(dynamic,4) shared(progress,status) omp_throttle(1) + #pragma omp parallel for schedule(static,4) shared(progress,status) omp_throttle(1) #endif for (y=0; y < (ssize_t) image->rows; y++) { @@ -2938,7 +2938,7 @@ MagickExport Image *RadialBlurImage(const Image *image,const double angle, image_view=AcquireCacheView(image); blur_view=AcquireCacheView(blur_image); #if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp parallel for schedule(dynamic,4) shared(progress,status) + #pragma omp parallel for schedule(static,4) shared(progress,status) #endif for (y=0; y < (ssize_t) image->rows; y++) { @@ -3229,7 +3229,7 @@ MagickExport Image *SelectiveBlurImage(const Image *image,const double radius, image_view=AcquireCacheView(image); blur_view=AcquireCacheView(blur_image); #if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp parallel for schedule(dynamic,4) shared(progress,status) + #pragma omp parallel for schedule(static,4) shared(progress,status) #endif for (y=0; y < (ssize_t) image->rows; y++) { @@ -3476,7 +3476,7 @@ MagickExport Image *ShadeImage(const Image *image,const MagickBooleanType gray, image_view=AcquireCacheView(image); shade_view=AcquireCacheView(shade_image); #if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp parallel for schedule(dynamic,4) shared(progress,status) + #pragma omp parallel for schedule(static,4) shared(progress,status) #endif for (y=0; y < (ssize_t) image->rows; y++) { @@ -3794,7 +3794,7 @@ MagickExport Image *SpreadImage(const Image *image,const double radius, image_view=AcquireCacheView(image); spread_view=AcquireCacheView(spread_image); #if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp parallel for schedule(dynamic,4) shared(progress,status) omp_throttle(1) + #pragma omp parallel for schedule(static,4) shared(progress,status) omp_throttle(1) #endif for (y=0; y < (ssize_t) image->rows; y++) { @@ -3937,7 +3937,7 @@ MagickExport Image *UnsharpMaskImage(const Image *image,const double radius, image_view=AcquireCacheView(image); unsharp_view=AcquireCacheView(unsharp_image); #if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp parallel for schedule(dynamic,4) shared(progress,status) + #pragma omp parallel for schedule(static,4) shared(progress,status) #endif for (y=0; y < (ssize_t) image->rows; y++) { diff --git a/MagickCore/enhance.c b/MagickCore/enhance.c index 8653e8bb1..9253fed1c 100644 --- a/MagickCore/enhance.c +++ b/MagickCore/enhance.c @@ -340,7 +340,7 @@ MagickExport MagickBooleanType ClutImage(Image *image,const Image *clut_image, adjust=(ssize_t) (clut_image->interpolate == IntegerInterpolatePixel ? 0 : 1); clut_view=AcquireCacheView(clut_image); #if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp parallel for schedule(dynamic,4) + #pragma omp parallel for schedule(static,4) #endif for (x=0; x <= (ssize_t) MaxMap; x++) { @@ -356,7 +356,7 @@ MagickExport MagickBooleanType ClutImage(Image *image,const Image *clut_image, clut_view=DestroyCacheView(clut_view); image_view=AcquireCacheView(image); #if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp parallel for schedule(dynamic,4) shared(progress,status) + #pragma omp parallel for schedule(static,4) shared(progress,status) #endif for (y=0; y < (ssize_t) image->rows; y++) { @@ -708,7 +708,7 @@ MagickExport MagickBooleanType ColorDecisionListImage(Image *image, ThrowBinaryException(ResourceLimitError,"MemoryAllocationFailed", image->filename); #if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp parallel for schedule(dynamic,4) + #pragma omp parallel for schedule(static,4) #endif for (i=0; i <= (ssize_t) MaxMap; i++) { @@ -728,7 +728,7 @@ MagickExport MagickBooleanType ColorDecisionListImage(Image *image, Apply transfer function to colormap. */ #if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp parallel for schedule(dynamic,4) shared(progress,status) + #pragma omp parallel for schedule(static,4) shared(progress,status) #endif for (i=0; i < (ssize_t) image->colors; i++) { @@ -755,7 +755,7 @@ MagickExport MagickBooleanType ColorDecisionListImage(Image *image, progress=0; image_view=AcquireCacheView(image); #if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp parallel for schedule(dynamic,4) shared(progress,status) + #pragma omp parallel for schedule(static,4) shared(progress,status) #endif for (y=0; y < (ssize_t) image->rows; y++) { @@ -910,7 +910,7 @@ MagickExport MagickBooleanType ContrastImage(Image *image, progress=0; image_view=AcquireCacheView(image); #if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp parallel for schedule(dynamic,4) shared(progress,status) + #pragma omp parallel for schedule(static,4) shared(progress,status) #endif for (y=0; y < (ssize_t) image->rows; y++) { @@ -1091,7 +1091,7 @@ MagickExport MagickBooleanType ContrastStretchImage(Image *image, Find the histogram boundaries by locating the black/white levels. */ #if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp parallel for schedule(dynamic,4) shared(progress,status) + #pragma omp parallel for schedule(static,4) shared(progress,status) #endif for (i=0; i < (ssize_t) GetPixelChannels(image); i++) { @@ -1127,7 +1127,7 @@ MagickExport MagickBooleanType ContrastStretchImage(Image *image, (void) ResetMagickMemory(stretch_map,0,(MaxMap+1)*GetPixelChannels(image)* sizeof(*stretch_map)); #if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp parallel for schedule(dynamic,4) shared(progress,status) + #pragma omp parallel for schedule(static,4) shared(progress,status) #endif for (i=0; i < (ssize_t) GetPixelChannels(image); i++) { @@ -1158,7 +1158,7 @@ MagickExport MagickBooleanType ContrastStretchImage(Image *image, Stretch-contrast colormap. */ #if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp parallel for schedule(dynamic,4) shared(progress,status) + #pragma omp parallel for schedule(static,4) shared(progress,status) #endif for (j=0; j < (ssize_t) image->colors; j++) { @@ -1198,7 +1198,7 @@ MagickExport MagickBooleanType ContrastStretchImage(Image *image, status=MagickTrue; progress=0; #if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp parallel for schedule(dynamic,4) shared(progress,status) + #pragma omp parallel for schedule(static,4) shared(progress,status) #endif for (y=0; y < (ssize_t) image->rows; y++) { @@ -1344,7 +1344,7 @@ MagickExport Image *EnhanceImage(const Image *image,ExceptionInfo *exception) image_view=AcquireCacheView(image); enhance_view=AcquireCacheView(enhance_image); #if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp parallel for schedule(dynamic,4) shared(progress,status) + #pragma omp parallel for schedule(static,4) shared(progress,status) #endif for (y=0; y < (ssize_t) image->rows; y++) { @@ -1564,7 +1564,7 @@ MagickExport MagickBooleanType EqualizeImage(Image *image, Integrate the histogram to get the equalization map. */ #if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp parallel for schedule(dynamic,4) shared(progress,status) + #pragma omp parallel for schedule(static,4) shared(progress,status) #endif for (i=0; i < (ssize_t) GetPixelChannels(image); i++) { @@ -1584,7 +1584,7 @@ MagickExport MagickBooleanType EqualizeImage(Image *image, (void) ResetMagickMemory(equalize_map,0,(MaxMap+1)*GetPixelChannels(image)* sizeof(*equalize_map)); #if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp parallel for schedule(dynamic,4) shared(progress,status) + #pragma omp parallel for schedule(static,4) shared(progress,status) #endif for (i=0; i < (ssize_t) GetPixelChannels(image); i++) { @@ -1613,7 +1613,7 @@ MagickExport MagickBooleanType EqualizeImage(Image *image, Equalize colormap. */ #if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp parallel for schedule(dynamic,4) shared(progress,status) + #pragma omp parallel for schedule(static,4) shared(progress,status) #endif for (j=0; j < (ssize_t) image->colors; j++) { @@ -1656,7 +1656,7 @@ MagickExport MagickBooleanType EqualizeImage(Image *image, */ progress=0; #if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp parallel for schedule(dynamic,4) shared(progress,status) + #pragma omp parallel for schedule(static,4) shared(progress,status) #endif for (y=0; y < (ssize_t) image->rows; y++) { @@ -1799,7 +1799,7 @@ MagickExport MagickBooleanType GammaImage(Image *image,const double gamma, Gamma-correct colormap. */ #if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp parallel for schedule(dynamic,4) shared(progress,status) + #pragma omp parallel for schedule(static,4) shared(progress,status) #endif for (i=0; i < (ssize_t) image->colors; i++) { @@ -1824,7 +1824,7 @@ MagickExport MagickBooleanType GammaImage(Image *image,const double gamma, progress=0; image_view=AcquireCacheView(image); #if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp parallel for schedule(dynamic,4) shared(progress,status) + #pragma omp parallel for schedule(static,4) shared(progress,status) #endif for (y=0; y < (ssize_t) image->rows; y++) { @@ -1985,7 +1985,7 @@ MagickExport MagickBooleanType HaldClutImage(Image *image, image_view=AcquireCacheView(image); hald_view=AcquireCacheView(hald_image); #if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp parallel for schedule(dynamic,4) shared(progress,status) + #pragma omp parallel for schedule(static,4) shared(progress,status) #endif for (y=0; y < (ssize_t) image->rows; y++) { @@ -2169,7 +2169,7 @@ MagickExport MagickBooleanType LevelImage(Image *image,const double black_point, (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); if (image->storage_class == PseudoClass) #if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp parallel for schedule(dynamic,4) shared(progress,status) + #pragma omp parallel for schedule(static,4) shared(progress,status) #endif for (i=0; i < (ssize_t) image->colors; i++) { @@ -2196,7 +2196,7 @@ MagickExport MagickBooleanType LevelImage(Image *image,const double black_point, progress=0; image_view=AcquireCacheView(image); #if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp parallel for schedule(dynamic,4) shared(progress,status) + #pragma omp parallel for schedule(static,4) shared(progress,status) #endif for (y=0; y < (ssize_t) image->rows; y++) { @@ -2330,7 +2330,7 @@ MagickExport MagickBooleanType LevelizeImage(Image *image, (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); if (image->storage_class == PseudoClass) #if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp parallel for schedule(dynamic,4) shared(progress,status) + #pragma omp parallel for schedule(static,4) shared(progress,status) #endif for (i=0; i < (ssize_t) image->colors; i++) { @@ -2357,7 +2357,7 @@ MagickExport MagickBooleanType LevelizeImage(Image *image, progress=0; image_view=AcquireCacheView(image); #if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp parallel for schedule(dynamic,4) shared(progress,status) + #pragma omp parallel for schedule(static,4) shared(progress,status) #endif for (y=0; y < (ssize_t) image->rows; y++) { @@ -2836,7 +2836,7 @@ MagickExport MagickBooleanType ModulateImage(Image *image,const char *modulate, Modulate colormap. */ #if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp parallel for schedule(dynamic,4) shared(progress,status) + #pragma omp parallel for schedule(static,4) shared(progress,status) #endif for (i=0; i < (ssize_t) image->colors; i++) switch (colorspace) @@ -2872,7 +2872,7 @@ MagickExport MagickBooleanType ModulateImage(Image *image,const char *modulate, progress=0; image_view=AcquireCacheView(image); #if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp parallel for schedule(dynamic,4) shared(progress,status) + #pragma omp parallel for schedule(static,4) shared(progress,status) #endif for (y=0; y < (ssize_t) image->rows; y++) { @@ -3004,7 +3004,7 @@ MagickExport MagickBooleanType NegateImage(Image *image, Negate colormap. */ #if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp parallel for schedule(dynamic,4) shared(progress,status) + #pragma omp parallel for schedule(static,4) shared(progress,status) #endif for (i=0; i < (ssize_t) image->colors; i++) { @@ -3032,7 +3032,7 @@ MagickExport MagickBooleanType NegateImage(Image *image, if (grayscale != MagickFalse) { #if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp parallel for schedule(dynamic,4) shared(progress,status) + #pragma omp parallel for schedule(static,4) shared(progress,status) #endif for (y=0; y < (ssize_t) image->rows; y++) { @@ -3103,7 +3103,7 @@ MagickExport MagickBooleanType NegateImage(Image *image, Negate image. */ #if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp parallel for schedule(dynamic,4) shared(progress,status) + #pragma omp parallel for schedule(static,4) shared(progress,status) #endif for (y=0; y < (ssize_t) image->rows; y++) { @@ -3275,7 +3275,7 @@ MagickExport MagickBooleanType SigmoidalContrastImage(Image *image, image->filename); (void) ResetMagickMemory(sigmoidal_map,0,(MaxMap+1)*sizeof(*sigmoidal_map)); #if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp parallel for schedule(dynamic,4) shared(progress,status) + #pragma omp parallel for schedule(static,4) shared(progress,status) #endif for (i=0; i <= (ssize_t) MaxMap; i++) { @@ -3304,7 +3304,7 @@ MagickExport MagickBooleanType SigmoidalContrastImage(Image *image, Sigmoidal-contrast enhance colormap. */ #if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp parallel for schedule(dynamic,4) shared(progress,status) + #pragma omp parallel for schedule(static,4) shared(progress,status) #endif for (i=0; i < (ssize_t) image->colors; i++) { @@ -3329,7 +3329,7 @@ MagickExport MagickBooleanType SigmoidalContrastImage(Image *image, progress=0; image_view=AcquireCacheView(image); #if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp parallel for schedule(dynamic,4) shared(progress,status) + #pragma omp parallel for schedule(static,4) shared(progress,status) #endif for (y=0; y < (ssize_t) image->rows; y++) { diff --git a/MagickCore/feature.c b/MagickCore/feature.c index 150214911..058c3dd01 100644 --- a/MagickCore/feature.c +++ b/MagickCore/feature.c @@ -223,7 +223,7 @@ MagickExport ChannelFeatures *GetImageFeatures(const Image *image, status=MagickTrue; image_view=AcquireCacheView(image); #if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp parallel for schedule(dynamic,4) shared(status) + #pragma omp parallel for schedule(static,4) shared(status) #endif for (y=0; y < (ssize_t) image->rows; y++) { @@ -593,7 +593,7 @@ MagickExport ChannelFeatures *GetImageFeatures(const Image *image, Compute texture features. */ #if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp parallel for schedule(dynamic,4) shared(status) + #pragma omp parallel for schedule(static,4) shared(status) #endif for (i=0; i < 4; i++) { @@ -777,7 +777,7 @@ MagickExport ChannelFeatures *GetImageFeatures(const Image *image, Compute more texture features. */ #if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp parallel for schedule(dynamic,4) shared(status) + #pragma omp parallel for schedule(static,4) shared(status) #endif for (i=0; i < 4; i++) { @@ -852,7 +852,7 @@ MagickExport ChannelFeatures *GetImageFeatures(const Image *image, Compute more texture features. */ #if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp parallel for schedule(dynamic,4) shared(status) + #pragma omp parallel for schedule(static,4) shared(status) #endif for (i=0; i < 4; i++) { @@ -972,7 +972,7 @@ MagickExport ChannelFeatures *GetImageFeatures(const Image *image, (void) ResetMagickMemory(&variance,0,sizeof(variance)); (void) ResetMagickMemory(&sum_squares,0,sizeof(sum_squares)); #if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp parallel for schedule(dynamic,4) shared(status) + #pragma omp parallel for schedule(static,4) shared(status) #endif for (i=0; i < 4; i++) { @@ -1123,7 +1123,7 @@ MagickExport ChannelFeatures *GetImageFeatures(const Image *image, Compute more texture features. */ #if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp parallel for schedule(dynamic,4) shared(status) + #pragma omp parallel for schedule(static,4) shared(status) #endif for (i=0; i < 4; i++) { diff --git a/MagickCore/fx.c b/MagickCore/fx.c index 4607dc200..c9db13942 100644 --- a/MagickCore/fx.c +++ b/MagickCore/fx.c @@ -301,7 +301,7 @@ MagickExport Image *AddNoiseImage(const Image *image,const NoiseType noise_type, image_view=AcquireCacheView(image); noise_view=AcquireCacheView(noise_image); #if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp parallel for schedule(dynamic,4) shared(progress,status) + #pragma omp parallel for schedule(static,4) shared(progress,status) #endif for (y=0; y < (ssize_t) image->rows; y++) { @@ -462,7 +462,7 @@ MagickExport Image *BlueShiftImage(const Image *image,const double factor, image_view=AcquireCacheView(image); shift_view=AcquireCacheView(shift_image); #if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp parallel for schedule(dynamic,4) shared(progress,status) + #pragma omp parallel for schedule(static,4) shared(progress,status) #endif for (y=0; y < (ssize_t) image->rows; y++) { @@ -721,7 +721,7 @@ MagickExport Image *ColorizeImage(const Image *image,const char *blend, image_view=AcquireCacheView(image); colorize_view=AcquireCacheView(colorize_image); #if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp parallel for schedule(dynamic,4) shared(progress,status) + #pragma omp parallel for schedule(static,4) shared(progress,status) #endif for (y=0; y < (ssize_t) image->rows; y++) { @@ -967,7 +967,7 @@ MagickExport Image *ColorMatrixImage(const Image *image, image_view=AcquireCacheView(image); color_view=AcquireCacheView(color_image); #if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp parallel for schedule(dynamic,4) shared(progress,status) + #pragma omp parallel for schedule(static,4) shared(progress,status) #endif for (y=0; y < (ssize_t) image->rows; y++) { @@ -3066,7 +3066,7 @@ MagickExport Image *FxImage(const Image *image,const char *expression, image_view=AcquireCacheView(image); fx_view=AcquireCacheView(fx_image); #if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp parallel for schedule(dynamic,4) shared(progress,status) + #pragma omp parallel for schedule(static,4) shared(progress,status) #endif for (y=0; y < (ssize_t) fx_image->rows; y++) { @@ -3258,7 +3258,7 @@ MagickExport Image *ImplodeImage(const Image *image,const double amount, image_view=AcquireCacheView(image); implode_view=AcquireCacheView(implode_image); #if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp parallel for schedule(dynamic,4) shared(progress,status) + #pragma omp parallel for schedule(static,4) shared(progress,status) #endif for (y=0; y < (ssize_t) image->rows; y++) { @@ -3484,7 +3484,7 @@ MagickExport Image *MorphImages(const Image *image, image_view=AcquireCacheView(morph_image); morph_view=AcquireCacheView(morph_images); #if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp parallel for schedule(dynamic,4) shared(status) + #pragma omp parallel for schedule(static,4) shared(status) #endif for (y=0; y < (ssize_t) morph_images->rows; y++) { @@ -4120,7 +4120,7 @@ MagickExport Image *SepiaToneImage(const Image *image,const double threshold, image_view=AcquireCacheView(image); sepia_view=AcquireCacheView(sepia_image); #if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp parallel for schedule(dynamic,4) shared(progress,status) + #pragma omp parallel for schedule(static,4) shared(progress,status) #endif for (y=0; y < (ssize_t) image->rows; y++) { @@ -4409,7 +4409,7 @@ MagickExport Image *SketchImage(const Image *image,const double radius, random_info=AcquireRandomInfoThreadSet(); random_view=AcquireCacheView(random_image); #if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp parallel for schedule(dynamic,4) shared(status) + #pragma omp parallel for schedule(static,4) shared(status) #endif for (y=0; y < (ssize_t) random_image->rows; y++) { @@ -4577,7 +4577,7 @@ MagickExport MagickBooleanType SolarizeImage(Image *image, progress=0; image_view=AcquireCacheView(image); #if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp parallel for schedule(dynamic,4) shared(progress,status) + #pragma omp parallel for schedule(static,4) shared(progress,status) #endif for (y=0; y < (ssize_t) image->rows; y++) { @@ -5061,7 +5061,7 @@ MagickExport Image *SwirlImage(const Image *image,double degrees, image_view=AcquireCacheView(image); swirl_view=AcquireCacheView(swirl_image); #if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp parallel for schedule(dynamic,4) shared(progress,status) + #pragma omp parallel for schedule(static,4) shared(progress,status) #endif for (y=0; y < (ssize_t) image->rows; y++) { @@ -5269,7 +5269,7 @@ MagickExport Image *TintImage(const Image *image,const char *blend, image_view=AcquireCacheView(image); tint_view=AcquireCacheView(tint_image); #if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp parallel for schedule(dynamic,4) shared(progress,status) + #pragma omp parallel for schedule(static,4) shared(progress,status) #endif for (y=0; y < (ssize_t) image->rows; y++) { @@ -5561,7 +5561,7 @@ MagickExport Image *WaveImage(const Image *image,const double amplitude, (void) SetCacheViewVirtualPixelMethod(image_view, BackgroundVirtualPixelMethod); #if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp parallel for schedule(dynamic,4) shared(progress,status) + #pragma omp parallel for schedule(static,4) shared(progress,status) #endif for (y=0; y < (ssize_t) wave_image->rows; y++) { diff --git a/MagickCore/image.c b/MagickCore/image.c index 14a4ac12b..a1f8e511d 100644 --- a/MagickCore/image.c +++ b/MagickCore/image.c @@ -516,7 +516,7 @@ MagickExport Image *AppendImages(const Image *images, y_offset-=geometry.y; image_view=AcquireCacheView(image); #if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp parallel for schedule(dynamic,4) shared(status) omp_throttle(1) + #pragma omp parallel for schedule(static,4) shared(status) omp_throttle(1) #endif for (y=0; y < (ssize_t) image->rows; y++) { @@ -1801,7 +1801,7 @@ MagickExport MagickBooleanType IsHighDynamicRangeImage(const Image *image, status=MagickTrue; image_view=AcquireCacheView(image); #if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp parallel for schedule(dynamic,4) shared(status) + #pragma omp parallel for schedule(static,4) shared(status) #endif for (y=0; y < (ssize_t) image->rows; y++) { @@ -2053,7 +2053,7 @@ MagickExport Image *NewMagickImage(const ImageInfo *image_info, status=MagickTrue; image_view=AcquireCacheView(image); #if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp parallel for schedule(dynamic,4) shared(status) + #pragma omp parallel for schedule(static,4) shared(status) #endif for (y=0; y < (ssize_t) image->rows; y++) { @@ -2245,7 +2245,7 @@ MagickExport MagickBooleanType SeparateImage(Image *image, progress=0; image_view=AcquireCacheView(image); #if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp parallel for schedule(dynamic,4) shared(progress,status) + #pragma omp parallel for schedule(static,4) shared(progress,status) #endif for (y=0; y < (ssize_t) image->rows; y++) { @@ -2452,7 +2452,7 @@ MagickExport MagickBooleanType SetImageAlphaChannel(Image *image, background=image->background_color; image_view=AcquireCacheView(image); #if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp parallel for schedule(dynamic,4) shared(status) + #pragma omp parallel for schedule(static,4) shared(status) #endif for (y=0; y < (ssize_t) image->rows; y++) { @@ -2681,7 +2681,7 @@ MagickExport MagickBooleanType SetImageColor(Image *image, status=MagickTrue; image_view=AcquireCacheView(image); #if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp parallel for schedule(dynamic,4) shared(status) + #pragma omp parallel for schedule(static,4) shared(status) #endif for (y=0; y < (ssize_t) image->rows; y++) { @@ -3347,7 +3347,7 @@ MagickExport MagickBooleanType SetImageAlpha(Image *image,const Quantum alpha, status=MagickTrue; image_view=AcquireCacheView(image); #if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp parallel for schedule(dynamic,4) shared(status) + #pragma omp parallel for schedule(static,4) shared(status) #endif for (y=0; y < (ssize_t) image->rows; y++) { @@ -4006,7 +4006,7 @@ MagickExport MagickBooleanType SyncImage(Image *image,ExceptionInfo *exception) status=MagickTrue; image_view=AcquireCacheView(image); #if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp parallel for schedule(dynamic,4) shared(status) + #pragma omp parallel for schedule(static,4) shared(status) #endif for (y=0; y < (ssize_t) image->rows; y++) { diff --git a/MagickCore/morphology.c b/MagickCore/morphology.c index e8e448c14..ec8a7c332 100644 --- a/MagickCore/morphology.c +++ b/MagickCore/morphology.c @@ -2583,7 +2583,7 @@ static ssize_t MorphologyPrimitive(const Image *image,Image *morphology_image, x; #if defined(MAGICKCORE_OPENMP_SUPPORT) -#pragma omp parallel for schedule(dynamic,4) shared(progress,status) +#pragma omp parallel for schedule(static,4) shared(progress,status) #endif for (x=0; x < (ssize_t) image->columns; x++) { @@ -2758,7 +2758,7 @@ static ssize_t MorphologyPrimitive(const Image *image,Image *morphology_image, ** Normal handling of horizontal or rectangular kernels (row by row) */ #if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp parallel for schedule(dynamic,4) shared(progress,status) + #pragma omp parallel for schedule(static,4) shared(progress,status) #endif for (y=0; y < (ssize_t) image->rows; y++) { diff --git a/MagickCore/paint.c b/MagickCore/paint.c index c0f100aef..575fcd1df 100644 --- a/MagickCore/paint.c +++ b/MagickCore/paint.c @@ -596,7 +596,7 @@ MagickExport Image *OilPaintImage(const Image *image,const double radius, image_view=AcquireCacheView(image); paint_view=AcquireCacheView(paint_image); #if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp parallel for schedule(dynamic,4) shared(progress,status) + #pragma omp parallel for schedule(static,4) shared(progress,status) #endif for (y=0; y < (ssize_t) image->rows; y++) { @@ -777,7 +777,7 @@ MagickExport MagickBooleanType OpaquePaintImage(Image *image, GetPixelInfo(image,&zero); image_view=AcquireCacheView(image); #if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp parallel for schedule(dynamic,4) shared(progress,status) + #pragma omp parallel for schedule(static,4) shared(progress,status) #endif for (y=0; y < (ssize_t) image->rows; y++) { @@ -914,7 +914,7 @@ MagickExport MagickBooleanType TransparentPaintImage(Image *image, GetPixelInfo(image,&zero); image_view=AcquireCacheView(image); #if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp parallel for schedule(dynamic,4) shared(progress,status) + #pragma omp parallel for schedule(static,4) shared(progress,status) #endif for (y=0; y < (ssize_t) image->rows; y++) { @@ -1040,7 +1040,7 @@ MagickExport MagickBooleanType TransparentPaintImageChroma(Image *image, progress=0; image_view=AcquireCacheView(image); #if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp parallel for schedule(dynamic,4) shared(progress,status) + #pragma omp parallel for schedule(static,4) shared(progress,status) #endif for (y=0; y < (ssize_t) image->rows; y++) { diff --git a/MagickCore/prepress.c b/MagickCore/prepress.c index 7b6aea140..fe79d4e1e 100644 --- a/MagickCore/prepress.c +++ b/MagickCore/prepress.c @@ -110,7 +110,7 @@ MagickExport double GetImageTotalInkDensity(Image *image, total_ink_density=0.0; image_view=AcquireCacheView(image); #if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp parallel for schedule(dynamic,4) shared(status) + #pragma omp parallel for schedule(static,4) shared(status) #endif for (y=0; y < (ssize_t) image->rows; y++) { diff --git a/MagickCore/profile.c b/MagickCore/profile.c index bd4836f78..529c505bc 100644 --- a/MagickCore/profile.c +++ b/MagickCore/profile.c @@ -6037,7 +6037,7 @@ MagickExport MagickBooleanType ProfileImage(Image *image,const char *name, progress=0; image_view=AcquireCacheView(image); #if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp parallel for schedule(dynamic,4) shared(status) + #pragma omp parallel for schedule(static,4) shared(status) #endif for (y=0; y < (ssize_t) image->rows; y++) { diff --git a/MagickCore/quantize.c b/MagickCore/quantize.c index 1d6e97f18..d607f5a72 100644 --- a/MagickCore/quantize.c +++ b/MagickCore/quantize.c @@ -544,7 +544,7 @@ static MagickBooleanType AssignImageColors(Image *image,CubeInfo *cube_info, status=MagickTrue; image_view=AcquireCacheView(image); #if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp parallel for schedule(dynamic,4) shared(status) + #pragma omp parallel for schedule(static,4) shared(status) #endif for (y=0; y < (ssize_t) image->rows; y++) { @@ -2376,7 +2376,7 @@ MagickExport MagickBooleanType PosterizeImage(Image *image,const size_t levels, (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); if (image->storage_class == PseudoClass) #if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp parallel for schedule(dynamic,4) shared(progress,status) + #pragma omp parallel for schedule(static,4) shared(progress,status) #endif for (i=0; i < (ssize_t) image->colors; i++) { @@ -2399,7 +2399,7 @@ MagickExport MagickBooleanType PosterizeImage(Image *image,const size_t levels, progress=0; image_view=AcquireCacheView(image); #if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp parallel for schedule(dynamic,4) shared(progress,status) + #pragma omp parallel for schedule(static,4) shared(progress,status) #endif for (y=0; y < (ssize_t) image->rows; y++) { @@ -3295,7 +3295,7 @@ static MagickBooleanType SetGrayscaleImage(Image *image, status=MagickTrue; image_view=AcquireCacheView(image); #if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp parallel for schedule(dynamic,4) shared(status) + #pragma omp parallel for schedule(static,4) shared(status) #endif for (y=0; y < (ssize_t) image->rows; y++) { @@ -3369,7 +3369,7 @@ static MagickBooleanType SetGrayscaleImage(Image *image, status=MagickTrue; image_view=AcquireCacheView(image); #if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp parallel for schedule(dynamic,4) shared(status) + #pragma omp parallel for schedule(static,4) shared(status) #endif for (y=0; y < (ssize_t) image->rows; y++) { diff --git a/MagickCore/resize.c b/MagickCore/resize.c index 685c863ef..689889e5f 100644 --- a/MagickCore/resize.c +++ b/MagickCore/resize.c @@ -1180,7 +1180,7 @@ MagickExport Image *AdaptiveResizeImage(const Image *image, image_view=AcquireCacheView(image); resize_view=AcquireCacheView(resize_image); #if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp parallel for schedule(dynamic,4) shared(progress,status) omp_throttle(1) + #pragma omp parallel for schedule(static,4) shared(progress,status) omp_throttle(1) #endif for (y=0; y < (ssize_t) resize_image->rows; y++) { @@ -2654,7 +2654,7 @@ MagickExport Image *SampleImage(const Image *image,const size_t columns, image_view=AcquireCacheView(image); sample_view=AcquireCacheView(sample_image); #if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp parallel for schedule(dynamic,4) shared(progress,status) omp_throttle(1) + #pragma omp parallel for schedule(static,4) shared(progress,status) omp_throttle(1) #endif for (y=0; y < (ssize_t) sample_image->rows; y++) { diff --git a/MagickCore/segment.c b/MagickCore/segment.c index 1d19cc92d..1af173421 100644 --- a/MagickCore/segment.c +++ b/MagickCore/segment.c @@ -530,7 +530,7 @@ static MagickBooleanType Classify(Image *image,short **extrema, */ image_view=AcquireCacheView(image); #if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp parallel for schedule(dynamic,4) shared(progress,status) + #pragma omp parallel for schedule(static,4) shared(progress,status) #endif for (y=0; y < (ssize_t) image->rows; y++) { diff --git a/MagickCore/shear.c b/MagickCore/shear.c index 8d799d865..a610332a1 100644 --- a/MagickCore/shear.c +++ b/MagickCore/shear.c @@ -572,7 +572,7 @@ static void RadonProjection(RadonInfo *source_cells, q=swap; } #if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp parallel for schedule(dynamic,4) + #pragma omp parallel for schedule(static,4) #endif for (x=0; x < (ssize_t) p->width; x++) { @@ -652,7 +652,7 @@ static MagickBooleanType RadonTransform(const Image *image, status=MagickTrue; image_view=AcquireCacheView(image); #if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp parallel for schedule(dynamic,4) shared(status) + #pragma omp parallel for schedule(static,4) shared(status) #endif for (y=0; y < (ssize_t) image->rows; y++) { @@ -701,7 +701,7 @@ static MagickBooleanType RadonTransform(const Image *image, RadonProjection(source_cells,destination_cells,-1,projection); (void) ResetRadonCells(source_cells); #if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp parallel for schedule(dynamic,4) shared(status) + #pragma omp parallel for schedule(static,4) shared(status) #endif for (y=0; y < (ssize_t) image->rows; y++) { @@ -1023,7 +1023,7 @@ MagickExport Image *IntegralRotateImage(const Image *image,size_t rotations, GetPixelCacheTileSize(image,&tile_width,&tile_height); tile_width=image->columns; #if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp parallel for schedule(dynamic,4) shared(progress, status) omp_throttle(1) + #pragma omp parallel for schedule(static,4) shared(progress, status) omp_throttle(1) #endif for (tile_y=0; tile_y < (ssize_t) image->rows; tile_y+=(ssize_t) tile_height) { @@ -1141,7 +1141,7 @@ MagickExport Image *IntegralRotateImage(const Image *image,size_t rotations, Rotate 180 degrees. */ #if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp parallel for schedule(dynamic,4) shared(progress,status) omp_throttle(1) + #pragma omp parallel for schedule(static,4) shared(progress,status) omp_throttle(1) #endif for (y=0; y < (ssize_t) image->rows; y++) { @@ -1233,7 +1233,7 @@ MagickExport Image *IntegralRotateImage(const Image *image,size_t rotations, GetPixelCacheTileSize(image,&tile_width,&tile_height); tile_width=image->columns; #if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp parallel for schedule(dynamic,4) shared(progress,status) omp_throttle(1) + #pragma omp parallel for schedule(static,4) shared(progress,status) omp_throttle(1) #endif for (tile_y=0; tile_y < (ssize_t) image->rows; tile_y+=(ssize_t) tile_height) { @@ -1429,7 +1429,7 @@ static MagickBooleanType XShearImage(Image *image,const MagickRealType degrees, progress=0; image_view=AcquireCacheView(image); #if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp parallel for schedule(dynamic,4) shared(progress, status) + #pragma omp parallel for schedule(static,4) shared(progress, status) #endif for (y=0; y < (ssize_t) height; y++) { @@ -1644,7 +1644,7 @@ static MagickBooleanType YShearImage(Image *image,const MagickRealType degrees, background=image->background_color; image_view=AcquireCacheView(image); #if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp parallel for schedule(dynamic,4) shared(progress, status) + #pragma omp parallel for schedule(static,4) shared(progress, status) #endif for (x=0; x < (ssize_t) width; x++) { diff --git a/MagickCore/statistic.c b/MagickCore/statistic.c index 222b5aa29..9023de096 100644 --- a/MagickCore/statistic.c +++ b/MagickCore/statistic.c @@ -495,7 +495,7 @@ MagickExport Image *EvaluateImages(const Image *images, if (op == MedianEvaluateOperator) { #if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp parallel for schedule(dynamic) shared(progress,status) + #pragma omp parallel for schedule(static) shared(progress,status) #endif for (y=0; y < (ssize_t) evaluate_image->rows; y++) { @@ -602,7 +602,7 @@ MagickExport Image *EvaluateImages(const Image *images, else { #if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp parallel for schedule(dynamic) shared(progress,status) + #pragma omp parallel for schedule(static) shared(progress,status) #endif for (y=0; y < (ssize_t) evaluate_image->rows; y++) { @@ -793,7 +793,7 @@ MagickExport MagickBooleanType EvaluateImage(Image *image, random_info=AcquireRandomInfoThreadSet(); image_view=AcquireCacheView(image); #if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp parallel for schedule(dynamic,4) shared(progress,status) + #pragma omp parallel for schedule(static,4) shared(progress,status) #endif for (y=0; y < (ssize_t) image->rows; y++) { @@ -1018,7 +1018,7 @@ MagickExport MagickBooleanType FunctionImage(Image *image, progress=0; image_view=AcquireCacheView(image); #if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp parallel for schedule(dynamic,4) shared(progress,status) + #pragma omp parallel for schedule(static,4) shared(progress,status) #endif for (y=0; y < (ssize_t) image->rows; y++) { @@ -1276,7 +1276,7 @@ MagickExport MagickBooleanType GetImageKurtosis(const Image *image, sum_fourth_power=0.0; image_view=AcquireCacheView(image); #if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp parallel for schedule(dynamic) shared(status) omp_throttle(1) + #pragma omp parallel for schedule(static) shared(status) omp_throttle(1) #endif for (y=0; y < (ssize_t) image->rows; y++) { @@ -1399,7 +1399,7 @@ MagickExport MagickBooleanType GetImageRange(const Image *image,double *minima, *minima=MagickHuge; image_view=AcquireCacheView(image); #if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp parallel for schedule(dynamic) shared(status) omp_throttle(1) + #pragma omp parallel for schedule(static) shared(status) omp_throttle(1) #endif for (y=0; y < (ssize_t) image->rows; y++) { @@ -2210,7 +2210,7 @@ MagickExport Image *StatisticImage(const Image *image,const StatisticType type, image_view=AcquireCacheView(image); statistic_view=AcquireCacheView(statistic_image); #if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp parallel for schedule(dynamic,4) shared(progress,status) + #pragma omp parallel for schedule(static,4) shared(progress,status) #endif for (y=0; y < (ssize_t) statistic_image->rows; y++) { diff --git a/MagickCore/threshold.c b/MagickCore/threshold.c index 5673ce115..44190c0cb 100644 --- a/MagickCore/threshold.c +++ b/MagickCore/threshold.c @@ -204,7 +204,7 @@ MagickExport Image *AdaptiveThresholdImage(const Image *image, image_view=AcquireCacheView(image); threshold_view=AcquireCacheView(threshold_image); #if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp parallel for schedule(dynamic,4) shared(progress,status) + #pragma omp parallel for schedule(static,4) shared(progress,status) #endif for (y=0; y < (ssize_t) image->rows; y++) { @@ -384,7 +384,7 @@ MagickExport MagickBooleanType BilevelImage(Image *image,const double threshold, progress=0; image_view=AcquireCacheView(image); #if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp parallel for schedule(dynamic,4) shared(progress,status) + #pragma omp parallel for schedule(static,4) shared(progress,status) #endif for (y=0; y < (ssize_t) image->rows; y++) { @@ -530,7 +530,7 @@ MagickExport MagickBooleanType BlackThresholdImage(Image *image, progress=0; image_view=AcquireCacheView(image); #if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp parallel for schedule(dynamic,4) shared(progress,status) + #pragma omp parallel for schedule(static,4) shared(progress,status) #endif for (y=0; y < (ssize_t) image->rows; y++) { @@ -678,7 +678,7 @@ MagickExport MagickBooleanType ClampImage(Image *image,ExceptionInfo *exception) progress=0; image_view=AcquireCacheView(image); #if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp parallel for schedule(dynamic,4) shared(progress,status) + #pragma omp parallel for schedule(static,4) shared(progress,status) #endif for (y=0; y < (ssize_t) image->rows; y++) { @@ -1296,7 +1296,7 @@ MagickExport MagickBooleanType OrderedPosterizeImage(Image *image, progress=0; image_view=AcquireCacheView(image); #if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp parallel for schedule(dynamic,4) shared(progress,status) + #pragma omp parallel for schedule(static,4) shared(progress,status) #endif for (y=0; y < (ssize_t) image->rows; y++) { @@ -1465,7 +1465,7 @@ MagickExport MagickBooleanType RandomThresholdImage(Image *image, random_info=AcquireRandomInfoThreadSet(); image_view=AcquireCacheView(image); #if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp parallel for schedule(dynamic,4) shared(progress,status) + #pragma omp parallel for schedule(static,4) shared(progress,status) #endif for (y=0; y < (ssize_t) image->rows; y++) { @@ -1627,7 +1627,7 @@ MagickExport MagickBooleanType WhiteThresholdImage(Image *image, progress=0; image_view=AcquireCacheView(image); #if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp parallel for schedule(dynamic,4) shared(progress,status) + #pragma omp parallel for schedule(static,4) shared(progress,status) #endif for (y=0; y < (ssize_t) image->rows; y++) { diff --git a/MagickCore/transform.c b/MagickCore/transform.c index 89e97a84d..c151b6ce0 100644 --- a/MagickCore/transform.c +++ b/MagickCore/transform.c @@ -160,7 +160,7 @@ MagickExport Image *ChopImage(const Image *image,const RectangleInfo *chop_info, image_view=AcquireCacheView(image); chop_view=AcquireCacheView(chop_image); #if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp parallel for schedule(dynamic,4) shared(progress,status) omp_throttle(1) + #pragma omp parallel for schedule(static,4) shared(progress,status) omp_throttle(1) #endif for (y=0; y < (ssize_t) extent.y; y++) { @@ -230,7 +230,7 @@ MagickExport Image *ChopImage(const Image *image,const RectangleInfo *chop_info, Extract chop image. */ #if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp parallel for schedule(dynamic,4) shared(progress,status) omp_throttle(1) + #pragma omp parallel for schedule(static,4) shared(progress,status) omp_throttle(1) #endif for (y=0; y < (ssize_t) (image->rows-(extent.y+extent.height)); y++) { @@ -585,7 +585,7 @@ MagickExport Image *CropImage(const Image *image,const RectangleInfo *geometry, image_view=AcquireCacheView(image); crop_view=AcquireCacheView(crop_image); #if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp parallel for schedule(dynamic,4) shared(progress,status) omp_throttle(1) + #pragma omp parallel for schedule(static,4) shared(progress,status) omp_throttle(1) #endif for (y=0; y < (ssize_t) crop_image->rows; y++) { @@ -939,7 +939,7 @@ MagickExport Image *ExcerptImage(const Image *image, image_view=AcquireCacheView(image); excerpt_view=AcquireCacheView(excerpt_image); #if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp parallel for schedule(dynamic,4) shared(progress,status) + #pragma omp parallel for schedule(static,4) shared(progress,status) #endif for (y=0; y < (ssize_t) excerpt_image->rows; y++) { @@ -1140,7 +1140,7 @@ MagickExport Image *FlipImage(const Image *image,ExceptionInfo *exception) image_view=AcquireCacheView(image); flip_view=AcquireCacheView(flip_image); #if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp parallel for schedule(dynamic,4) shared(progress,status) omp_throttle(1) + #pragma omp parallel for schedule(static,4) shared(progress,status) omp_throttle(1) #endif for (y=0; y < (ssize_t) flip_image->rows; y++) { @@ -1280,7 +1280,7 @@ MagickExport Image *FlopImage(const Image *image,ExceptionInfo *exception) image_view=AcquireCacheView(image); flop_view=AcquireCacheView(flop_image); #if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp parallel for schedule(dynamic,4) shared(progress,status) omp_throttle(1) + #pragma omp parallel for schedule(static,4) shared(progress,status) omp_throttle(1) #endif for (y=0; y < (ssize_t) flop_image->rows; y++) { @@ -1404,7 +1404,7 @@ static inline MagickBooleanType CopyImageRegion(Image *destination, source_view=AcquireCacheView(source); destination_view=AcquireCacheView(destination); #if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp parallel for schedule(dynamic,4) shared(status) + #pragma omp parallel for schedule(static,4) shared(status) #endif for (y=0; y < (ssize_t) rows; y++) { @@ -1727,7 +1727,7 @@ MagickExport Image *SpliceImage(const Image *image, image_view=AcquireCacheView(image); splice_view=AcquireCacheView(splice_image); #if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp parallel for schedule(dynamic,4) shared(progress,status) + #pragma omp parallel for schedule(static,4) shared(progress,status) #endif for (y=0; y < (ssize_t) splice_geometry.y; y++) { @@ -1819,7 +1819,7 @@ MagickExport Image *SpliceImage(const Image *image, } } #if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp parallel for schedule(dynamic,4) shared(progress,status) + #pragma omp parallel for schedule(static,4) shared(progress,status) #endif for (y=(ssize_t) (splice_geometry.y+splice_geometry.height); y < (ssize_t) splice_image->rows; y++) @@ -2158,7 +2158,7 @@ MagickExport Image *TransposeImage(const Image *image,ExceptionInfo *exception) image_view=AcquireCacheView(image); transpose_view=AcquireCacheView(transpose_image); #if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp parallel for schedule(dynamic,4) shared(progress,status) + #pragma omp parallel for schedule(static,4) shared(progress,status) #endif for (y=0; y < (ssize_t) image->rows; y++) { @@ -2301,7 +2301,7 @@ MagickExport Image *TransverseImage(const Image *image,ExceptionInfo *exception) image_view=AcquireCacheView(image); transverse_view=AcquireCacheView(transverse_image); #if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp parallel for schedule(dynamic,4) shared(progress,status) + #pragma omp parallel for schedule(static,4) shared(progress,status) #endif for (y=0; y < (ssize_t) image->rows; y++) { diff --git a/filters/analyze.c b/filters/analyze.c index d3958276a..1e4a78580 100644 --- a/filters/analyze.c +++ b/filters/analyze.c @@ -145,7 +145,7 @@ ModuleExport size_t analyzeImage(Image **images,const int argc, status=MagickTrue; image_view=AcquireCacheView(image); #if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp parallel for schedule(dynamic,4) shared(status) + #pragma omp parallel for schedule(static,4) shared(status) #endif for (y=0; y < (ssize_t) image->rows; y++) { -- 2.40.0