From: cristy Date: Fri, 11 Sep 2009 19:51:45 +0000 (+0000) Subject: (no commit message) X-Git-Tag: 7.0.1-0~10722 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=0749099f0ad33fc32ef5de50d65dad5dd1e7fb7a;p=imagemagick --- diff --git a/coders/dpx.c b/coders/dpx.c index 69167d146..083f98860 100644 --- a/coders/dpx.c +++ b/coders/dpx.c @@ -1155,7 +1155,7 @@ static Image *ReadDPXImage(const ImageInfo *image_info,ExceptionInfo *exception) MagickTrue : MagickFalse); image_view=AcquireCacheView(image); #if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP > 200505) - #pragma omp parallel for schedule(dynamic,1) shared(row,status,quantum_type) + #pragma omp parallel for schedule(static,1) shared(row,status,quantum_type) #endif for (y=0; y < (long) image->rows; y++) { diff --git a/coders/hald.c b/coders/hald.c index 8cd2989d8..732101f34 100644 --- a/coders/hald.c +++ b/coders/hald.c @@ -126,7 +126,7 @@ static Image *ReadHALDImage(const ImageInfo *image_info, image->rows=(unsigned long) (level*cube_size); image_view=AcquireCacheView(image); #if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp parallel for schedule(dynamic,4) shared(status) + #pragma omp parallel for schedule(static,1) shared(status) #endif for (y=0; y < (long) image->rows; y+=(long) level) { diff --git a/coders/pnm.c b/coders/pnm.c index 64b1c2b6f..e8b0fdfe7 100644 --- a/coders/pnm.c +++ b/coders/pnm.c @@ -594,7 +594,7 @@ static Image *ReadPNMImage(const ImageInfo *image_info,ExceptionInfo *exception) extent=GetQuantumExtent(image,quantum_info,quantum_type); image_view=AcquireCacheView(image); #if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP > 200505) - #pragma omp parallel for schedule(dynamic,1) shared(row,status,quantum_type) + #pragma omp parallel for schedule(static,1) shared(row,status,quantum_type) #endif for (y=0; y < (long) image->rows; y++) { @@ -676,7 +676,7 @@ static Image *ReadPNMImage(const ImageInfo *image_info,ExceptionInfo *exception) ThrowReaderException(ResourceLimitError,"MemoryAllocationFailed"); image_view=AcquireCacheView(image); #if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP > 200505) - #pragma omp parallel for schedule(dynamic,1) shared(row,status,quantum_type) + #pragma omp parallel for schedule(static,1) shared(row,status,quantum_type) #endif for (y=0; y < (long) image->rows; y++) { @@ -794,7 +794,7 @@ static Image *ReadPNMImage(const ImageInfo *image_info,ExceptionInfo *exception) ThrowReaderException(ResourceLimitError,"MemoryAllocationFailed"); image_view=AcquireCacheView(image); #if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP > 200505) - #pragma omp parallel for schedule(dynamic,1) shared(row,status,type) + #pragma omp parallel for schedule(static,1) shared(row,status,type) #endif for (y=0; y < (long) image->rows; y++) { @@ -968,7 +968,7 @@ static Image *ReadPNMImage(const ImageInfo *image_info,ExceptionInfo *exception) ThrowReaderException(ResourceLimitError,"MemoryAllocationFailed"); image_view=AcquireCacheView(image); #if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP > 200505) - #pragma omp parallel for schedule(dynamic,1) shared(row,status,quantum_type) + #pragma omp parallel for schedule(static,1) shared(row,status,quantum_type) #endif for (y=0; y < (long) image->rows; y++) { @@ -1211,7 +1211,7 @@ static Image *ReadPNMImage(const ImageInfo *image_info,ExceptionInfo *exception) extent=GetQuantumExtent(image,quantum_info,quantum_type); image_view=AcquireCacheView(image); #if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP > 200505) - #pragma omp parallel for schedule(dynamic,1) shared(row,status,quantum_type) + #pragma omp parallel for schedule(static,1) shared(row,status,quantum_type) #endif for (y=0; y < (long) image->rows; y++) { diff --git a/magick/colorspace.c b/magick/colorspace.c index 2611ed2b6..c0123db38 100644 --- a/magick/colorspace.c +++ b/magick/colorspace.c @@ -224,7 +224,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,1) shared(status) #endif for (y=0; y < (long) image->rows; y++) { @@ -277,7 +277,7 @@ MagickExport MagickBooleanType RGBTransformImage(Image *image, GetMagickPixelPacket(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,1) shared(status) #endif for (y=0; y < (long) image->rows; y++) { @@ -334,7 +334,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,1) shared(status) #endif for (y=0; y < (long) image->rows; y++) { @@ -390,7 +390,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,1) shared(status) #endif for (y=0; y < (long) image->rows; y++) { @@ -446,7 +446,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,1) shared(status) #endif for (y=0; y < (long) image->rows; y++) { @@ -502,7 +502,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,1) shared(status) #endif for (y=0; y < (long) image->rows; y++) { @@ -594,7 +594,7 @@ MagickExport MagickBooleanType RGBTransformImage(Image *image, black=pow(10.0,(reference_black-reference_white)*(gamma/density)* 0.002/0.6); #if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp parallel for schedule(dynamic,4) + #pragma omp parallel for schedule(static,1) #endif for (i=0; i <= (long) MaxMap; i++) logmap[i]=ScaleMapToQuantum((MagickRealType) (MaxMap*(reference_white+ @@ -602,7 +602,7 @@ MagickExport MagickBooleanType RGBTransformImage(Image *image, 0.002/0.6))/1024.0+0.5)); image_view=AcquireCacheView(image); #if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp parallel for schedule(dynamic,4) shared(status) + #pragma omp parallel for schedule(static,1) shared(status) #endif for (y=0; y < (long) image->rows; y++) { @@ -671,7 +671,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,1) #endif for (i=0; i <= (long) MaxMap; i++) { @@ -696,7 +696,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,1) #endif for (i=0; i <= (long) MaxMap; i++) { @@ -729,7 +729,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,1) #endif for (i=0; i <= (long) MaxMap; i++) { @@ -753,7 +753,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,1) #endif for (i=0; i <= (long) MaxMap; i++) { @@ -784,7 +784,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,1) #endif for (i=0; i <= (long) MaxMap; i++) { @@ -810,7 +810,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,1) #endif for (i=0; i <= (long) MaxMap; i++) { @@ -844,7 +844,7 @@ MagickExport MagickBooleanType RGBTransformImage(Image *image, Z = 0.0193324*R+0.1191930*G+0.9504440*B */ #if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp parallel for schedule(dynamic,4) + #pragma omp parallel for schedule(static,1) #endif for (i=0; i <= (long) MaxMap; i++) { @@ -914,7 +914,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,1) #endif for (i=0; i <= (long) MaxMap; i++) { @@ -945,7 +945,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,1) #endif for (i=0; i <= (long) MaxMap; i++) { @@ -977,7 +977,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,1) #endif for (i=0; i <= (long) MaxMap; i++) { @@ -1007,7 +1007,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,1) shared(status) #endif for (y=0; y < (long) image->rows; y++) { @@ -1420,7 +1420,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,1) shared(status) #endif for (y=0; y < (long) image->rows; y++) { @@ -1476,7 +1476,7 @@ MagickExport MagickBooleanType TransformRGBImage(Image *image, GetMagickPixelPacket(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,1) shared(status) #endif for (y=0; y < (long) image->rows; y++) { @@ -1536,7 +1536,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,1) shared(status) #endif for (y=0; y < (long) image->rows; y++) { @@ -1594,7 +1594,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,1) shared(status) #endif for (y=0; y < (long) image->rows; y++) { @@ -1652,7 +1652,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,1) shared(status) #endif for (y=0; y < (long) image->rows; y++) { @@ -1710,7 +1710,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,1) shared(status) #endif for (y=0; y < (long) image->rows; y++) { @@ -1811,7 +1811,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,1) shared(status) #endif for (y=0; y < (long) image->rows; y++) { @@ -1890,7 +1890,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,1) #endif for (i=0; i <= (long) MaxMap; i++) { @@ -1925,7 +1925,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,1) #endif for (i=0; i <= (long) MaxMap; i++) { @@ -1958,7 +1958,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,1) #endif for (i=0; i <= (long) MaxMap; i++) { @@ -1988,7 +1988,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,1) #endif for (i=0; i <= (long) MaxMap; i++) { @@ -2014,7 +2014,7 @@ MagickExport MagickBooleanType TransformRGBImage(Image *image, B = 0.0556352*X-0.2039960*Y+1.0570700*Z */ #if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp parallel for schedule(dynamic,4) + #pragma omp parallel for schedule(static,1) #endif for (i=0; i <= (long) MaxMap; i++) { @@ -2042,7 +2042,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,1) #endif for (i=0; i <= (long) MaxMap; i++) { @@ -2075,7 +2075,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,1) #endif for (i=0; i <= (long) MaxMap; i++) { @@ -2110,7 +2110,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,1) #endif for (i=0; i <= (long) MaxMap; i++) { @@ -2144,7 +2144,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,1) #endif for (i=0; i <= (long) MaxMap; i++) { @@ -2178,7 +2178,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,1) shared(status) #endif for (y=0; y < (long) image->rows; y++) { @@ -2287,7 +2287,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,1) shared(status) #endif for (i=0; i < (long) image->colors; i++) { diff --git a/magick/compare.c b/magick/compare.c index 6e05119e5..8271a2b9a 100644 --- a/magick/compare.c +++ b/magick/compare.c @@ -198,7 +198,7 @@ MagickExport Image *CompareImageChannels(Image *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,1) shared(status) #endif for (y=0; y < (long) image->rows; y++) { @@ -370,7 +370,7 @@ static MagickBooleanType GetAbsoluteError(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,1) shared(status) #endif for (y=0; y < (long) image->rows; y++) { @@ -486,7 +486,7 @@ static MagickBooleanType GetMeanAbsoluteError(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,1) shared(status) #endif for (y=0; y < (long) image->rows; y++) { @@ -723,7 +723,7 @@ static MagickBooleanType GetMeanSquaredError(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,1) shared(status) #endif for (y=0; y < (long) image->rows; y++) { @@ -829,7 +829,7 @@ static MagickBooleanType GetPeakAbsoluteError(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,1) shared(status) #endif for (y=0; y < (long) image->rows; y++) { @@ -1405,7 +1405,7 @@ static double GetSimilarityMetric(const Image *image,const Image *reference, image_view=AcquireCacheView(image); reference_view=AcquireCacheView(reference); #if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp parallel for schedule(dynamic,4) shared(status) + #pragma omp parallel for schedule(static,1) shared(status) #endif for (y=0; y < (long) reference->rows; y++) { @@ -1524,7 +1524,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,1) shared(progress,status) #endif for (y=0; y < (long) (image->rows-reference->rows+1); y++) { diff --git a/magick/composite.c b/magick/composite.c index ff3e831a1..c51da7e05 100644 --- a/magick/composite.c +++ b/magick/composite.c @@ -1768,7 +1768,7 @@ MagickExport MagickBooleanType CompositeImageChannel(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,1) shared(progress,status) #endif for (y=0; y < (long) image->rows; y++) { diff --git a/magick/decorate.c b/magick/decorate.c index d89b6df8e..2818feb34 100644 --- a/magick/decorate.c +++ b/magick/decorate.c @@ -402,7 +402,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,8) shared(progress,status) + #pragma omp parallel for schedule(static,1) shared(progress,status) #endif for (y=0; y < (long) image->rows; y++) { @@ -692,7 +692,7 @@ MagickExport MagickBooleanType RaiseImage(Image *image, exception=(&image->exception); 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,1) shared(progress,status) #endif for (y=0; y < (long) raise_info->height; y++) { @@ -759,7 +759,7 @@ MagickExport MagickBooleanType RaiseImage(Image *image, } } #if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp parallel for schedule(dynamic,4) shared(progress,status) + #pragma omp parallel for schedule(static,1) shared(progress,status) #endif for (y=(long) raise_info->height; y < (long) (image->rows-raise_info->height); y++) { @@ -815,7 +815,7 @@ MagickExport MagickBooleanType RaiseImage(Image *image, } } #if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp parallel for schedule(dynamic,4) shared(progress,status) + #pragma omp parallel for schedule(static,1) shared(progress,status) #endif for (y=(long) (image->rows-raise_info->height); y < (long) image->rows; y++) { diff --git a/magick/deprecate.c b/magick/deprecate.c index 7a1e37f63..81e564291 100644 --- a/magick/deprecate.c +++ b/magick/deprecate.c @@ -1706,7 +1706,7 @@ MagickExport Image *ExtractSubimageFromImage(Image *image, similarity_threshold=image->columns*image->rows; SetGeometry(reference,&offset); #if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp parallel for schedule(dynamic,4) + #pragma omp parallel for schedule(static,1) #endif for (y=0; y < (long) (image->rows-reference->rows); y++) { diff --git a/magick/distort.c b/magick/distort.c index c89d79969..8dc73a405 100644 --- a/magick/distort.c +++ b/magick/distort.c @@ -1870,7 +1870,7 @@ MagickExport Image *DistortImage(const Image *image,DistortImageMethod method, resample_filter=AcquireResampleFilterThreadSet(image,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,1) shared(progress,status) #endif for (j=0; j < (long) distort_image->rows; j++) { @@ -2425,7 +2425,7 @@ MagickExport Image *SparseColorImage(const Image *image, GetMagickPixelPacket(sparse_image,&zero); 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,1) shared(progress,status) #endif for (j=0; j < (long) sparse_image->rows; j++) { diff --git a/magick/draw.c b/magick/draw.c index 193a325c0..b63dea78a 100644 --- a/magick/draw.c +++ b/magick/draw.c @@ -1169,7 +1169,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) shared(status) + #pragma omp parallel for schedule(static,1) shared(status) #endif for (y=(long) (edge.y1+0.5); y <= (long) (edge.y2+0.5); y++) { @@ -3273,7 +3273,7 @@ MagickExport MagickBooleanType DrawGradientImage(Image *image, GetMagickPixelPacket(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,1) shared(status) #endif for (y=bounding_box.y; y < (long) bounding_box.height; y++) { @@ -3928,7 +3928,7 @@ static MagickBooleanType DrawPolygonPrimitive(Image *image, if (image->matte == MagickFalse) (void) SetImageAlphaChannel(image,OpaqueAlphaChannel); #if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp parallel for schedule(dynamic) shared(status) + #pragma omp parallel for schedule(static,1) shared(status) #endif for (y=(long) (bounds.y1+0.5); y <= (long) (bounds.y2+0.5); y++) { diff --git a/magick/effect.c b/magick/effect.c index adb43b5ed..d3bbc526d 100644 --- a/magick/effect.c +++ b/magick/effect.c @@ -269,7 +269,7 @@ MagickExport Image *AdaptiveBlurImageChannel(const Image *image, edge_view=AcquireCacheView(edge_image); blur_view=AcquireCacheView(blur_image); #if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp parallel for schedule(dynamic) shared(progress,status) + #pragma omp parallel for schedule(static,1) shared(progress,status) #endif for (y=0; y < (long) blur_image->rows; y++) { @@ -587,7 +587,7 @@ MagickExport Image *AdaptiveSharpenImageChannel(const Image *image, edge_view=AcquireCacheView(edge_image); sharp_view=AcquireCacheView(sharp_image); #if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp parallel for schedule(dynamic) shared(progress,status) + #pragma omp parallel for schedule(static,1) shared(progress,status) #endif for (y=0; y < (long) sharp_image->rows; y++) { @@ -908,7 +908,7 @@ MagickExport Image *BlurImageChannel(const Image *image, image_view=AcquireCacheView(image); blur_view=AcquireCacheView(blur_image); #if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp parallel for schedule(dynamic) shared(progress,status) + #pragma omp parallel for schedule(static,1) shared(progress,status) #endif for (y=0; y < (long) blur_image->rows; y++) { @@ -1499,7 +1499,7 @@ MagickExport Image *DespeckleImage(const Image *image,ExceptionInfo *exception) image_view=AcquireCacheView(image); despeckle_view=AcquireCacheView(despeckle_image); #if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp parallel for schedule(dynamic,4) shared(status) + #pragma omp parallel for schedule(static,1) shared(status) #endif for (channel=0; channel <= 3; channel++) { @@ -2244,7 +2244,7 @@ MagickExport Image *MedianFilterImage(const Image *image,const double radius, image_view=AcquireCacheView(image); median_view=AcquireCacheView(median_image); #if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp parallel for schedule(dynamic) shared(progress,status) + #pragma omp parallel for schedule(static,1) shared(progress,status) #endif for (y=0; y < (long) median_image->rows; y++) { @@ -2516,7 +2516,7 @@ MagickExport Image *MotionBlurImageChannel(const Image *image, image_view=AcquireCacheView(image); blur_view=AcquireCacheView(blur_image); #if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp parallel for schedule(dynamic) shared(progress,status) + #pragma omp parallel for schedule(static,1) shared(progress,status) #endif for (y=0; y < (long) image->rows; y++) { @@ -3291,7 +3291,7 @@ MagickExport Image *RadialBlurImageChannel(const Image *image, image_view=AcquireCacheView(image); blur_view=AcquireCacheView(blur_image); #if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp parallel for schedule(dynamic) shared(progress,status) + #pragma omp parallel for schedule(static,1) shared(progress,status) #endif for (y=0; y < (long) blur_image->rows; y++) { @@ -3602,7 +3602,7 @@ MagickExport Image *ReduceNoiseImage(const Image *image,const double radius, image_view=AcquireCacheView(image); noise_view=AcquireCacheView(noise_image); #if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp parallel for schedule(dynamic) shared(progress,status) + #pragma omp parallel for schedule(static,1) shared(progress,status) #endif for (y=0; y < (long) noise_image->rows; y++) { @@ -3859,7 +3859,7 @@ MagickExport Image *SelectiveBlurImageChannel(const Image *image, image_view=AcquireCacheView(image); blur_view=AcquireCacheView(blur_image); #if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp parallel for schedule(dynamic) shared(progress,status) + #pragma omp parallel for schedule(static,1) shared(progress,status) #endif for (y=0; y < (long) image->rows; y++) { @@ -4195,7 +4195,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) shared(progress,status) + #pragma omp parallel for schedule(static,1) shared(progress,status) #endif for (y=0; y < (long) image->rows; y++) { @@ -4492,7 +4492,7 @@ MagickExport Image *SpreadImage(const Image *image,const double radius, random_info=AcquireRandomInfoThreadSet(); image_view=AcquireCacheView(spread_image); #if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp parallel for schedule(dynamic,8) shared(progress,status) + #pragma omp parallel for schedule(static,1) shared(progress,status) #endif for (y=0; y < (long) spread_image->rows; y++) { @@ -4651,7 +4651,7 @@ MagickExport Image *UnsharpMaskImageChannel(const Image *image, image_view=AcquireCacheView(image); unsharp_view=AcquireCacheView(unsharp_image); #if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp parallel for schedule(dynamic) shared(progress,status) + #pragma omp parallel for schedule(static,1) shared(progress,status) #endif for (y=0; y < (long) image->rows; y++) { diff --git a/magick/enhance.c b/magick/enhance.c index 6c5b9b724..5f012b8fd 100644 --- a/magick/enhance.c +++ b/magick/enhance.c @@ -460,7 +460,7 @@ MagickExport MagickBooleanType ColorDecisionListImage(Image *image, ThrowBinaryException(ResourceLimitError,"MemoryAllocationFailed", image->filename); #if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp parallel for schedule(guided) + #pragma omp parallel for schedule(static,1) #endif for (i=0; i <= (long) MaxMap; i++) { @@ -480,7 +480,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,1) shared(progress,status) #endif for (i=0; i < (long) image->colors; i++) { @@ -506,7 +506,7 @@ MagickExport MagickBooleanType ColorDecisionListImage(Image *image, exception=(&image->exception); 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,1) shared(progress,status) #endif for (y=0; y < (long) image->rows; y++) { @@ -654,7 +654,7 @@ MagickExport MagickBooleanType ClutImageChannel(Image *image, exception); 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,1) shared(progress,status) #endif for (y=0; y < (long) image->rows; y++) { @@ -887,7 +887,7 @@ MagickExport MagickBooleanType ContrastImage(Image *image, exception=(&image->exception); 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,1) shared(progress,status) #endif for (y=0; y < (long) image->rows; y++) { @@ -1225,7 +1225,7 @@ MagickExport MagickBooleanType ContrastStretchImageChannel(Image *image, */ (void) ResetMagickMemory(stretch_map,0,(MaxMap+1)*sizeof(*stretch_map)); #if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp parallel for schedule(dynamic,4) shared(progress,status) + #pragma omp parallel for schedule(static,1) shared(progress,status) #endif for (i=0; i <= (long) MaxMap; i++) { @@ -1307,7 +1307,7 @@ MagickExport MagickBooleanType ContrastStretchImageChannel(Image *image, Stretch colormap. */ #if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp parallel for schedule(dynamic,4) shared(progress,status) + #pragma omp parallel for schedule(static,1) shared(progress,status) #endif for (i=0; i < (long) image->colors; i++) { @@ -1343,7 +1343,7 @@ MagickExport MagickBooleanType ContrastStretchImageChannel(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,1) shared(progress,status) #endif for (y=0; y < (long) image->rows; y++) { @@ -1522,7 +1522,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,1) shared(progress,status) #endif for (y=0; y < (long) image->rows; y++) { @@ -1755,7 +1755,7 @@ MagickExport MagickBooleanType EqualizeImageChannel(Image *image, white=map[(int) MaxMap]; (void) ResetMagickMemory(equalize_map,0,(MaxMap+1)*sizeof(*equalize_map)); #if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp parallel for schedule(dynamic,4) shared(progress,status) + #pragma omp parallel for schedule(static,1) shared(progress,status) #endif for (i=0; i <= (long) MaxMap; i++) { @@ -1786,7 +1786,7 @@ MagickExport MagickBooleanType EqualizeImageChannel(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,1) shared(progress,status) #endif for (i=0; i < (long) image->colors; i++) { @@ -1813,7 +1813,7 @@ MagickExport MagickBooleanType EqualizeImageChannel(Image *image, exception=(&image->exception); 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,1) shared(progress,status) #endif for (y=0; y < (long) image->rows; y++) { @@ -1989,7 +1989,7 @@ MagickExport MagickBooleanType GammaImageChannel(Image *image, (void) ResetMagickMemory(gamma_map,0,(MaxMap+1)*sizeof(*gamma_map)); if (gamma != 0.0) #if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp parallel for schedule(guided) + #pragma omp parallel for schedule(static,1) #endif for (i=0; i <= (long) MaxMap; i++) gamma_map[i]=RoundToQuantum((MagickRealType) ScaleMapToQuantum(( @@ -2000,7 +2000,7 @@ MagickExport MagickBooleanType GammaImageChannel(Image *image, Gamma-correct colormap. */ #if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp parallel for schedule(dynamic,4) shared(progress,status) + #pragma omp parallel for schedule(static,1) shared(progress,status) #endif for (i=0; i < (long) image->colors; i++) { @@ -2033,7 +2033,7 @@ MagickExport MagickBooleanType GammaImageChannel(Image *image, exception=(&image->exception); 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,1) shared(progress,status) #endif for (y=0; y < (long) image->rows; y++) { @@ -2212,7 +2212,7 @@ MagickExport MagickBooleanType HaldClutImageChannel(Image *image, exception); 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,1) shared(progress,status) #endif for (y=0; y < (long) image->rows; y++) { @@ -2470,7 +2470,7 @@ MagickExport MagickBooleanType LevelImageChannel(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,1) shared(progress,status) #endif for (i=0; i < (long) image->colors; i++) { @@ -2494,7 +2494,7 @@ MagickExport MagickBooleanType LevelImageChannel(Image *image, exception=(&image->exception); 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,1) shared(progress,status) #endif for (y=0; y < (long) image->rows; y++) { @@ -2627,7 +2627,7 @@ MagickExport MagickBooleanType LevelizeImageChannel(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,1) shared(progress,status) #endif for (i=0; i < (long) image->colors; i++) { @@ -2651,7 +2651,7 @@ MagickExport MagickBooleanType LevelizeImageChannel(Image *image, exception=(&image->exception); 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,1) shared(progress,status) #endif for (y=0; y < (long) image->rows; y++) { @@ -3086,7 +3086,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,1) shared(progress,status) #endif for (i=0; i < (long) image->colors; i++) switch (colorspace) @@ -3123,7 +3123,7 @@ MagickExport MagickBooleanType ModulateImage(Image *image,const char *modulate) exception=(&image->exception); 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,1) shared(progress,status) #endif for (y=0; y < (long) image->rows; y++) { @@ -3258,7 +3258,7 @@ MagickExport MagickBooleanType NegateImageChannel(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,1) shared(progress,status) #endif for (i=0; i < (long) image->colors; i++) { @@ -3287,7 +3287,7 @@ MagickExport MagickBooleanType NegateImageChannel(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,1) shared(progress,status) #endif for (y=0; y < (long) image->rows; y++) { @@ -3357,7 +3357,7 @@ MagickExport MagickBooleanType NegateImageChannel(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,1) shared(progress,status) #endif for (y=0; y < (long) image->rows; y++) { @@ -3566,7 +3566,7 @@ MagickExport MagickBooleanType SigmoidalContrastImageChannel(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,1) shared(progress,status) #endif for (i=0; i <= (long) MaxMap; i++) { @@ -3596,7 +3596,7 @@ MagickExport MagickBooleanType SigmoidalContrastImageChannel(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,1) shared(progress,status) #endif for (i=0; i < (long) image->colors; i++) { @@ -3622,7 +3622,7 @@ MagickExport MagickBooleanType SigmoidalContrastImageChannel(Image *image, exception=(&image->exception); 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,1) shared(progress,status) #endif for (y=0; y < (long) image->rows; y++) { diff --git a/magick/fourier.c b/magick/fourier.c index bbb7996e7..e5267c08e 100644 --- a/magick/fourier.c +++ b/magick/fourier.c @@ -654,7 +654,7 @@ MagickExport Image *ForwardFourierTransformImage(const Image *image, status=MagickTrue; is_gray=IsGrayImage(image,exception); #if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp parallel for schedule(dynamic,1) shared(status) + #pragma omp parallel for schedule(static,1) shared(status) #endif for (i=0L; i < 5L; i++) { @@ -1197,7 +1197,7 @@ MagickExport Image *InverseFourierTransformImage(const Image *images, if ((is_gray != MagickFalse) && (images->next != (Image *) NULL)) is_gray=IsGrayImage(images->next,exception); #if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp parallel for schedule(dynamic,1) shared(status) + #pragma omp parallel for schedule(static,1) shared(status) #endif for (i=0L; i < 5L; i++) { diff --git a/magick/fx.c b/magick/fx.c index 1dc9ce93a..a00771e85 100644 --- a/magick/fx.c +++ b/magick/fx.c @@ -333,7 +333,7 @@ MagickExport Image *AddNoiseImageChannel(const Image *image, image_view=AcquireCacheView(image); noise_view=AcquireCacheView(noise_image); #if defined(MAGICKCORE_OPENMP_SUPPORT_DEBUG) - #pragma omp parallel for schedule(dynamic,4) shared(progress,status) + #pragma omp parallel for schedule(static,1) shared(progress,status) #endif for (y=0; y < (long) image->rows; y++) { @@ -489,7 +489,7 @@ MagickExport Image *BlueShiftImage(const Image *image,const double factor, image_view=AcquireCacheView(image); shift_view=AcquireCacheView(shift_image); #if defined(MAGICKCORE_OPENMP_SUPPORT_DEBUG) - #pragma omp parallel for schedule(dynamic,4) shared(progress,status) + #pragma omp parallel for schedule(static,1) shared(progress,status) #endif for (y=0; y < (long) image->rows; y++) { @@ -736,7 +736,7 @@ MagickExport Image *ColorizeImage(const Image *image,const char *opacity, image_view=AcquireCacheView(image); colorize_view=AcquireCacheView(colorize_image); #if defined(MAGICKCORE_OPENMP_SUPPORT_DEBUG) - #pragma omp parallel for schedule(dynamic,4) shared(progress,status) + #pragma omp parallel for schedule(static,1) shared(progress,status) #endif for (y=0; y < (long) image->rows; y++) { @@ -958,7 +958,7 @@ MagickExport Image *ConvolveImageChannel(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,1) shared(progress,status) #endif for (y=0; y < (long) image->rows; y++) { @@ -1473,7 +1473,7 @@ MagickExport MagickBooleanType EvaluateImageChannel(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,1) shared(progress,status) #endif for (y=0; y < (long) image->rows; y++) { @@ -1705,7 +1705,7 @@ MagickExport MagickBooleanType FunctionImageChannel(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,1) shared(progress,status) #endif for (y=0; y < (long) image->rows; y++) { @@ -3541,7 +3541,7 @@ MagickExport Image *FxImageChannel(const Image *image,const ChannelType channel, progress=0; 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,1) shared(progress,status) #endif for (y=0; y < (long) fx_image->rows; y++) { @@ -3744,7 +3744,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,1) shared(progress,status) #endif for (y=0; y < (long) image->rows; y++) { @@ -3966,7 +3966,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,1) shared(status) #endif for (y=0; y < (long) morph_images->rows; y++) { @@ -4593,7 +4593,7 @@ MagickExport Image *RecolorImage(const Image *image,const unsigned long order, image_view=AcquireCacheView(image); recolor_view=AcquireCacheView(recolor_image); #if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp parallel for schedule(dynamic,4) shared(progress,status) + #pragma omp parallel for schedule(static,1) shared(progress,status) #endif for (y=0; y < (long) image->rows; y++) { @@ -4806,7 +4806,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,1) shared(progress,status) #endif for (y=0; y < (long) image->rows; y++) { @@ -4964,7 +4964,7 @@ MagickExport Image *ShadowImage(const Image *image,const double opacity, progress=0; image_view=AcquireCacheView(border_image); #if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp parallel for schedule(dynamic,4) shared(progress,status) + #pragma omp parallel for schedule(static,1) shared(progress,status) #endif for (y=0; y < (long) border_image->rows; y++) { @@ -5253,7 +5253,7 @@ MagickExport MagickBooleanType SolarizeImage(Image *image, exception=(&image->exception); 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,1) shared(progress,status) #endif for (y=0; y < (long) image->rows; y++) { @@ -5694,7 +5694,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,8) shared(progress,status) + #pragma omp parallel for schedule(static,1) shared(progress,status) #endif for (y=0; y < (long) image->rows; y++) { @@ -5891,7 +5891,7 @@ MagickExport Image *TintImage(const Image *image,const char *opacity, 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,1) shared(progress,status) #endif for (y=0; y < (long) image->rows; y++) { @@ -6157,7 +6157,7 @@ MagickExport Image *WaveImage(const Image *image,const double amplitude, resample_filter=AcquireResampleFilterThreadSet(image,MagickTrue,exception); wave_view=AcquireCacheView(wave_image); #if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp parallel for schedule(dynamic,4) shared(progress,status) + #pragma omp parallel for schedule(static,1) shared(progress,status) #endif for (y=0; y < (long) wave_image->rows; y++) { diff --git a/magick/image.c b/magick/image.c index 01f4f7f93..e02d0ebcc 100644 --- a/magick/image.c +++ b/magick/image.c @@ -549,7 +549,7 @@ MagickExport Image *AppendImages(const Image *image, y_offset-=geometry.y; image_view=AcquireCacheView(image); #if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp parallel for schedule(dynamic,4) shared(status) + #pragma omp parallel for schedule(static,1) shared(status) #endif for (y=0; y < (long) image->rows; y++) { @@ -761,7 +761,7 @@ MagickExport Image *AverageImages(const Image *image,ExceptionInfo *exception) number_images=GetImageListLength(image); average_view=AcquireCacheView(average_image); #if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp parallel for schedule(dynamic) shared(progress,status) + #pragma omp parallel for schedule(static,1) shared(progress,status) #endif for (y=0; y < (long) average_image->rows; y++) { @@ -1341,7 +1341,7 @@ MagickExport Image *CombineImages(const Image *image,const ChannelType channel, progress=0; combine_view=AcquireCacheView(combine_image); #if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp parallel for schedule(dynamic,4) shared(progress,status) + #pragma omp parallel for schedule(static,1) shared(progress,status) #endif for (y=0; y < (long) combine_image->rows; y++) { @@ -1529,7 +1529,7 @@ MagickExport MagickBooleanType CycleColormapImage(Image *image, exception=(&image->exception); image_view=AcquireCacheView(image); #if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp parallel for schedule(dynamic,4) shared(status) + #pragma omp parallel for schedule(static,1) shared(status) #endif for (y=0; y < (long) image->rows; y++) { @@ -2288,7 +2288,7 @@ MagickExport MagickBooleanType IsHighDynamicRangeImage(const Image *image, GetMagickPixelPacket(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,1) shared(status) #endif for (y=0; y < (long) image->rows; y++) { @@ -2748,7 +2748,7 @@ MagickExport MagickBooleanType SeparateImageChannel(Image *image, exception=(&image->exception); 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,1) shared(progress,status) #endif for (y=0; y < (long) image->rows; y++) { @@ -3035,7 +3035,7 @@ MagickExport MagickBooleanType SetImageAlphaChannel(Image *image, exception=(&image->exception); image_view=AcquireCacheView(image); #if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp parallel for schedule(dynamic,4) shared(status) + #pragma omp parallel for schedule(static,1) shared(status) #endif for (y=0; y < (long) image->rows; y++) { @@ -3212,7 +3212,7 @@ MagickExport MagickBooleanType SetImageBackgroundColor(Image *image) exception=(&image->exception); image_view=AcquireCacheView(image); #if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp parallel for schedule(dynamic,4) shared(status) + #pragma omp parallel for schedule(static,1) shared(status) #endif for (y=0; y < (long) image->rows; y++) { @@ -3879,7 +3879,7 @@ MagickExport MagickBooleanType SetImageOpacity(Image *image, exception=(&image->exception); image_view=AcquireCacheView(image); #if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp parallel for schedule(dynamic,4) shared(status) + #pragma omp parallel for schedule(static,1) shared(status) #endif for (y=0; y < (long) image->rows; y++) { @@ -4210,7 +4210,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,1) shared(status) #endif for (i=0; i < (long) image->colors; i++) image->colormap[i].opacity=(IndexPacket) i; @@ -4223,7 +4223,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,1) shared(status) #endif for (i=0; i < (long) image->colors; i++) pixels[(long) image->colormap[i].opacity]=(unsigned short) i; diff --git a/magick/paint.c b/magick/paint.c index 89e71aa9b..1ae2aa41e 100644 --- a/magick/paint.c +++ b/magick/paint.c @@ -601,7 +601,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,1) shared(progress,status) #endif for (y=0; y < (long) image->rows; y++) { @@ -790,7 +790,7 @@ MagickExport MagickBooleanType OpaquePaintImageChannel(Image *image, GetMagickPixelPacket(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,1) shared(progress,status) #endif for (y=0; y < (long) image->rows; y++) { @@ -932,7 +932,7 @@ MagickExport MagickBooleanType TransparentPaintImage(Image *image, GetMagickPixelPacket(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,1) shared(progress,status) #endif for (y=0; y < (long) image->rows; y++) { @@ -1062,7 +1062,7 @@ MagickExport MagickBooleanType TransparentPaintImageChroma(Image *image, exception=(&image->exception); 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,1) shared(progress,status) #endif for (y=0; y < (long) image->rows; y++) { diff --git a/magick/prepress.c b/magick/prepress.c index 139382ad7..0fe46f1a0 100644 --- a/magick/prepress.c +++ b/magick/prepress.c @@ -109,7 +109,7 @@ MagickExport double GetImageTotalInkDensity(Image *image) exception=(&image->exception); image_view=AcquireCacheView(image); #if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp parallel for schedule(dynamic,4) shared(status) + #pragma omp parallel for schedule(static,1) shared(status) #endif for (y=0; y < (long) image->rows; y++) { diff --git a/magick/profile.c b/magick/profile.c index cafda0286..f6e100b86 100644 --- a/magick/profile.c +++ b/magick/profile.c @@ -1154,7 +1154,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,1) shared(status) #endif for (y=0; y < (long) image->rows; y++) { diff --git a/magick/quantize.c b/magick/quantize.c index 584e81577..0eeeb3fb4 100644 --- a/magick/quantize.c +++ b/magick/quantize.c @@ -3022,7 +3022,7 @@ static MagickBooleanType SetGrayscaleImage(Image *image) exception=(&image->exception); image_view=AcquireCacheView(image); #if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp parallel for schedule(dynamic,4) shared(status) + #pragma omp parallel for schedule(static,1) shared(status) #endif for (y=0; y < (long) image->rows; y++) { @@ -3098,7 +3098,7 @@ static MagickBooleanType SetGrayscaleImage(Image *image) exception=(&image->exception); image_view=AcquireCacheView(image); #if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp parallel for schedule(dynamic,4) shared(status) + #pragma omp parallel for schedule(static,1) shared(status) #endif for (y=0; y < (long) image->rows; y++) { diff --git a/magick/resize.c b/magick/resize.c index f763c996e..cde2531e4 100644 --- a/magick/resize.c +++ b/magick/resize.c @@ -2335,7 +2335,7 @@ MagickExport Image *SampleImage(const Image *image,const unsigned long columns, image_view=AcquireCacheView(image); sample_view=AcquireCacheView(sample_image); #if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp parallel for schedule(dynamic) shared(progress,status) + #pragma omp parallel for schedule(static,1) shared(progress,status) #endif for (y=0; y < (long) sample_image->rows; y++) { diff --git a/magick/segment.c b/magick/segment.c index 4ea18ba40..310bcb107 100644 --- a/magick/segment.c +++ b/magick/segment.c @@ -518,7 +518,7 @@ static MagickBooleanType Classify(Image *image,short **extrema, exception=(&image->exception); image_view=AcquireCacheView(image); #if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp parallel for schedule(dynamic,8) shared(progress,status) + #pragma omp parallel for schedule(static,1) shared(progress,status) #endif for (y=0; y < (long) image->rows; y++) { diff --git a/magick/shear.c b/magick/shear.c index c646da42e..eab86fb35 100644 --- a/magick/shear.c +++ b/magick/shear.c @@ -706,7 +706,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,1) shared(status) #endif for (y=0; y < (long) image->rows; y++) { @@ -757,7 +757,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,1) shared(status) #endif for (y=0; y < (long) image->rows; y++) { @@ -1451,7 +1451,7 @@ static MagickBooleanType XShearImage(Image *image,const MagickRealType degrees, exception=(&image->exception); image_view=AcquireCacheView(image); #if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp parallel for schedule(dynamic,8) shared(progress, status) + #pragma omp parallel for schedule(static,1) shared(progress, status) #endif for (y=0; y < (long) height; y++) { @@ -1671,7 +1671,7 @@ static MagickBooleanType YShearImage(Image *image,const MagickRealType degrees, exception=(&image->exception); image_view=AcquireCacheView(image); #if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp parallel for schedule(dynamic,8) shared(progress, status) + #pragma omp parallel for schedule(static,1) shared(progress, status) #endif for (x=0; x < (long) width; x++) { diff --git a/magick/statistic.c b/magick/statistic.c index ac227ac5f..43f9a291b 100644 --- a/magick/statistic.c +++ b/magick/statistic.c @@ -168,7 +168,7 @@ MagickExport RectangleInfo GetImageBoundingBox(const Image *image, status=MagickTrue; GetMagickPixelPacket(image,&zero); #if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp parallel for schedule(dynamic,4) shared(status) + #pragma omp parallel for schedule(static,1) shared(status) #endif for (y=0; y < (long) image->rows; y++) { @@ -324,7 +324,7 @@ MagickExport unsigned long GetImageChannelDepth(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,1) shared(status) #endif for (i=0; i < (long) image->colors; i++) { @@ -365,7 +365,7 @@ MagickExport unsigned long GetImageChannelDepth(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,1) shared(status) #endif for (y=0; y < (long) image->rows; y++) { @@ -1324,7 +1324,7 @@ MagickExport MagickBooleanType SetImageChannelDepth(Image *image, exception=(&image->exception); image_view=AcquireCacheView(image); #if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp parallel for schedule(dynamic,4) shared(status) + #pragma omp parallel for schedule(static,1) shared(status) #endif for (y=0; y < (long) image->rows; y++) { @@ -1383,7 +1383,7 @@ MagickExport MagickBooleanType SetImageChannelDepth(Image *image, p=image->colormap; range=GetQuantumRange(depth); #if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp parallel for schedule(dynamic,4) shared(status) + #pragma omp parallel for schedule(static,1) shared(status) #endif for (i=0; i < (long) image->colors; i++) { diff --git a/magick/threshold.c b/magick/threshold.c index 88c78e459..b1d376553 100644 --- a/magick/threshold.c +++ b/magick/threshold.c @@ -192,7 +192,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,1) shared(progress,status) #endif for (y=0; y < (long) image->rows; y++) { @@ -386,7 +386,7 @@ MagickExport MagickBooleanType BilevelImageChannel(Image *image, exception=(&image->exception); 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,1) shared(progress,status) #endif for (y=0; y < (long) image->rows; y++) { @@ -572,7 +572,7 @@ MagickExport MagickBooleanType BlackThresholdImageChannel(Image *image, progress=0; image_view=AcquireCacheView(image); #if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp parallel for schedule(dynamic,8) shared(progress,status) + #pragma omp parallel for schedule(static,1) shared(progress,status) #endif for (y=0; y < (long) image->rows; y++) { @@ -1322,7 +1322,7 @@ printf("DEBUG levels r=%ld g=%ld b=%ld a=%ld i=%ld\n", 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,1) shared(progress,status) #endif for (y=0; y < (long) image->rows; y++) { @@ -1541,7 +1541,7 @@ MagickExport MagickBooleanType RandomThresholdImageChannel(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,1) shared(progress,status) #endif for (y=0; y < (long) image->rows; y++) { @@ -1618,7 +1618,7 @@ MagickExport MagickBooleanType RandomThresholdImageChannel(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,1) shared(progress,status) #endif for (y=0; y < (long) image->rows; y++) { @@ -1845,7 +1845,7 @@ MagickExport MagickBooleanType WhiteThresholdImageChannel(Image *image, progress=0; image_view=AcquireCacheView(image); #if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp parallel for schedule(dynamic,8) shared(progress,status) + #pragma omp parallel for schedule(static,1) shared(progress,status) #endif for (y=0; y < (long) image->rows; y++) { diff --git a/magick/transform.c b/magick/transform.c index d956cc094..4d66e9791 100644 --- a/magick/transform.c +++ b/magick/transform.c @@ -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) + #pragma omp parallel for schedule(static,1) shared(progress,status) #endif for (y=0; y < (long) crop_image->rows; y++) { @@ -713,7 +713,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,1) shared(progress,status) #endif for (y=0; y < (long) excerpt_image->rows; y++) { @@ -894,7 +894,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) + #pragma omp parallel for schedule(static,1) shared(progress,status) #endif for (y=0; y < (long) flip_image->rows; y++) { @@ -1012,7 +1012,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) + #pragma omp parallel for schedule(static,1) shared(progress,status) #endif for (y=0; y < (long) flop_image->rows; y++) { @@ -1123,7 +1123,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,1) shared(status) #endif for (y=0; y < (long) rows; y++) { @@ -1438,7 +1438,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,1) shared(progress,status) #endif for (y=0; y < (long) splice_geometry.y; y++) { @@ -1513,7 +1513,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,1) shared(progress,status) #endif for (y=(long) (splice_geometry.y+splice_geometry.height); y < (long) splice_image->rows; y++) @@ -1875,7 +1875,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,1) shared(progress,status) #endif for (y=0; y < (long) image->rows; y++) { @@ -2003,7 +2003,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,1) shared(progress,status) #endif for (y=0; y < (long) image->rows; y++) { diff --git a/wand/pixel-view.c b/wand/pixel-view.c index 404dd1ca9..cb664f48b 100644 --- a/wand/pixel-view.c +++ b/wand/pixel-view.c @@ -285,7 +285,7 @@ WandExport MagickBooleanType DuplexTransferPixelViewIterator( progress=0; exception=destination->exception; #if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp parallel for schedule(dynamic) shared(progress,status) + #pragma omp parallel for schedule(static,1) shared(progress,status) #endif for (y=source->region.y; y < (long) source->region.height; y++) { @@ -545,7 +545,7 @@ WandExport MagickBooleanType GetPixelViewIterator(PixelView *source, status=MagickTrue; progress=0; #if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp parallel for schedule(dynamic) shared(progress,status) + #pragma omp parallel for schedule(static,1) shared(progress,status) #endif for (y=source->region.y; y < (long) source->region.height; y++) { @@ -991,7 +991,7 @@ WandExport MagickBooleanType SetPixelViewIterator(PixelView *destination, progress=0; exception=destination->exception; #if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp parallel for schedule(dynamic) shared(progress,status) + #pragma omp parallel for schedule(static,1) shared(progress,status) #endif for (y=destination->region.y; y < (long) destination->region.height; y++) { @@ -1125,7 +1125,7 @@ WandExport MagickBooleanType TransferPixelViewIterator(PixelView *source, progress=0; exception=destination->exception; #if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp parallel for schedule(dynamic) shared(progress,status) + #pragma omp parallel for schedule(static,1) shared(progress,status) #endif for (y=source->region.y; y < (long) source->region.height; y++) { @@ -1283,7 +1283,7 @@ WandExport MagickBooleanType UpdatePixelViewIterator(PixelView *source, progress=0; exception=source->exception; #if defined(MAGICKCORE_OPENMP_SUPPORT) - #pragma omp parallel for schedule(dynamic) shared(progress,status) + #pragma omp parallel for schedule(static,1) shared(progress,status) #endif for (y=source->region.y; y < (long) source->region.height; y++) {