From: cristy Date: Wed, 4 Nov 2009 03:03:49 +0000 (+0000) Subject: (no commit message) X-Git-Tag: 7.0.1-0~10418 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=b5d5f725fef80ff5d50db3111c05a1a521b81e7f;p=imagemagick --- diff --git a/coders/dpx.c b/coders/dpx.c index cc18c0271..bf883326b 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 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/pnm.c b/coders/pnm.c index 107320d56..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 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 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 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 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 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/attribute.c b/magick/attribute.c index 723bfc327..52ac65988 100644 --- a/magick/attribute.c +++ b/magick/attribute.c @@ -168,8 +168,8 @@ MagickExport RectangleInfo GetImageBoundingBox(const Image *image, &target[2]); status=MagickTrue; GetMagickPixelPacket(image,&zero); -#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) - #pragma omp parallel for shared(status) +#if defined(MAGICKCORE_OPENMP_SUPPORT) + #pragma omp parallel for schedule(dynamic,4) shared(status) #endif for (y=0; y < (long) image->rows; y++) { @@ -190,7 +190,7 @@ MagickExport RectangleInfo GetImageBoundingBox(const Image *image, if (status == MagickFalse) continue; -#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) # pragma omp critical (MagickCore_GetImageBoundingBox) #endif bounding_box=bounds; @@ -219,7 +219,7 @@ MagickExport RectangleInfo GetImageBoundingBox(const Image *image, bounding_box.height=(unsigned long) y; p++; } -#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) # pragma omp critical (MagickCore_GetImageBoundingBox) #endif { @@ -324,8 +324,8 @@ MagickExport unsigned long GetImageChannelDepth(const Image *image, i; p=image->colormap; -#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) - #pragma omp parallel for shared(status) +#if defined(MAGICKCORE_OPENMP_SUPPORT) + #pragma omp parallel for schedule(dynamic,4) shared(status) #endif for (i=0; i < (long) image->colors; i++) { @@ -365,8 +365,8 @@ MagickExport unsigned long GetImageChannelDepth(const Image *image, return(depth); } image_view=AcquireCacheView(image); -#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) - #pragma omp parallel for shared(status) +#if defined(MAGICKCORE_OPENMP_SUPPORT) + #pragma omp parallel for schedule(dynamic,4) shared(status) #endif for (y=0; y < (long) image->rows; y++) { @@ -910,8 +910,8 @@ MagickExport MagickBooleanType SetImageChannelDepth(Image *image, range=GetQuantumRange(depth); exception=(&image->exception); image_view=AcquireCacheView(image); -#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) - #pragma omp parallel for shared(status) +#if defined(MAGICKCORE_OPENMP_SUPPORT) + #pragma omp parallel for schedule(dynamic,4) shared(status) #endif for (y=0; y < (long) image->rows; y++) { @@ -969,8 +969,8 @@ MagickExport MagickBooleanType SetImageChannelDepth(Image *image, p=image->colormap; range=GetQuantumRange(depth); -#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) - #pragma omp parallel for shared(status) +#if defined(MAGICKCORE_OPENMP_SUPPORT) + #pragma omp parallel for schedule(dynamic,4) shared(status) #endif for (i=0; i < (long) image->colors; i++) { diff --git a/magick/colormap.c b/magick/colormap.c index 856e1a7ce..97c3343f7 100644 --- a/magick/colormap.c +++ b/magick/colormap.c @@ -118,8 +118,8 @@ MagickExport MagickBooleanType CycleColormapImage(Image *image, status=MagickTrue; exception=(&image->exception); image_view=AcquireCacheView(image); -#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) - #pragma omp parallel for shared(status) +#if defined(MAGICKCORE_OPENMP_SUPPORT) + #pragma omp parallel for schedule(dynamic,4) shared(status) #endif for (y=0; y < (long) image->rows; y++) { @@ -247,8 +247,8 @@ MagickExport MagickBooleanType SortColormapByIntensity(Image *image) /* Assign index values to colormap entries. */ -#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) - #pragma omp parallel for shared(status) +#if defined(MAGICKCORE_OPENMP_SUPPORT) + #pragma omp parallel for schedule(dynamic,4) shared(status) #endif for (i=0; i < (long) image->colors; i++) image->colormap[i].opacity=(IndexPacket) i; @@ -260,8 +260,8 @@ MagickExport MagickBooleanType SortColormapByIntensity(Image *image) /* Update image colormap indexes to sorted colormap order. */ -#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) - #pragma omp parallel for shared(status) +#if defined(MAGICKCORE_OPENMP_SUPPORT) + #pragma omp parallel for schedule(dynamic,4) shared(status) #endif for (i=0; i < (long) image->colors; i++) pixels[(long) image->colormap[i].opacity]=(unsigned short) i; diff --git a/magick/colorspace.c b/magick/colorspace.c index 5f5d73418..eb5ae730f 100644 --- a/magick/colorspace.c +++ b/magick/colorspace.c @@ -223,8 +223,8 @@ MagickExport MagickBooleanType RGBTransformImage(Image *image, return(MagickFalse); } image_view=AcquireCacheView(image); -#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) - #pragma omp parallel for shared(status) +#if defined(MAGICKCORE_OPENMP_SUPPORT) + #pragma omp parallel for schedule(dynamic,4) shared(status) #endif for (y=0; y < (long) image->rows; y++) { @@ -276,8 +276,8 @@ MagickExport MagickBooleanType RGBTransformImage(Image *image, } GetMagickPixelPacket(image,&zero); image_view=AcquireCacheView(image); -#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) - #pragma omp parallel for shared(status) +#if defined(MAGICKCORE_OPENMP_SUPPORT) + #pragma omp parallel for schedule(dynamic,4) shared(status) #endif for (y=0; y < (long) image->rows; y++) { @@ -333,8 +333,8 @@ MagickExport MagickBooleanType RGBTransformImage(Image *image, return(MagickFalse); } image_view=AcquireCacheView(image); -#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) - #pragma omp parallel for shared(status) +#if defined(MAGICKCORE_OPENMP_SUPPORT) + #pragma omp parallel for schedule(dynamic,4) shared(status) #endif for (y=0; y < (long) image->rows; y++) { @@ -389,8 +389,8 @@ MagickExport MagickBooleanType RGBTransformImage(Image *image, return(MagickFalse); } image_view=AcquireCacheView(image); -#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) - #pragma omp parallel for shared(status) +#if defined(MAGICKCORE_OPENMP_SUPPORT) + #pragma omp parallel for schedule(dynamic,4) shared(status) #endif for (y=0; y < (long) image->rows; y++) { @@ -445,8 +445,8 @@ MagickExport MagickBooleanType RGBTransformImage(Image *image, return(MagickFalse); } image_view=AcquireCacheView(image); -#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) - #pragma omp parallel for shared(status) +#if defined(MAGICKCORE_OPENMP_SUPPORT) + #pragma omp parallel for schedule(dynamic,4) shared(status) #endif for (y=0; y < (long) image->rows; y++) { @@ -501,8 +501,8 @@ MagickExport MagickBooleanType RGBTransformImage(Image *image, return(MagickFalse); } image_view=AcquireCacheView(image); -#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) - #pragma omp parallel for shared(status) +#if defined(MAGICKCORE_OPENMP_SUPPORT) + #pragma omp parallel for schedule(dynamic,4) shared(status) #endif for (y=0; y < (long) image->rows; y++) { @@ -593,16 +593,16 @@ MagickExport MagickBooleanType RGBTransformImage(Image *image, image->filename); black=pow(10.0,(reference_black-reference_white)*(gamma/density)* 0.002/0.6); -#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) - #pragma omp parallel for +#if defined(MAGICKCORE_OPENMP_SUPPORT) + #pragma omp parallel for schedule(dynamic,4) #endif for (i=0; i <= (long) MaxMap; i++) logmap[i]=ScaleMapToQuantum((MagickRealType) (MaxMap*(reference_white+ log10(black+((MagickRealType) i/MaxMap)*(1.0-black))/((gamma/density)* 0.002/0.6))/1024.0+0.5)); image_view=AcquireCacheView(image); -#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) - #pragma omp parallel for shared(status) +#if defined(MAGICKCORE_OPENMP_SUPPORT) + #pragma omp parallel for schedule(dynamic,4) shared(status) #endif for (y=0; y < (long) image->rows; y++) { @@ -670,8 +670,8 @@ 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) && (_OPENMP >= 200203) - #pragma omp parallel for +#if defined(MAGICKCORE_OPENMP_SUPPORT) + #pragma omp parallel for schedule(dynamic,4) #endif for (i=0; i <= (long) MaxMap; i++) { @@ -695,8 +695,8 @@ MagickExport MagickBooleanType RGBTransformImage(Image *image, G = 0.29900*R+0.58700*G+0.11400*B */ -#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) - #pragma omp parallel for +#if defined(MAGICKCORE_OPENMP_SUPPORT) + #pragma omp parallel for schedule(dynamic,4) #endif for (i=0; i <= (long) MaxMap; i++) { @@ -728,8 +728,8 @@ 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) && (_OPENMP >= 200203) - #pragma omp parallel for +#if defined(MAGICKCORE_OPENMP_SUPPORT) + #pragma omp parallel for schedule(dynamic,4) #endif for (i=0; i <= (long) MaxMap; i++) { @@ -752,8 +752,8 @@ MagickExport MagickBooleanType RGBTransformImage(Image *image, G = 0.21260*R+0.71520*G+0.07220*B */ -#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) - #pragma omp parallel for +#if defined(MAGICKCORE_OPENMP_SUPPORT) + #pragma omp parallel for schedule(dynamic,4) #endif for (i=0; i <= (long) MaxMap; i++) { @@ -783,8 +783,8 @@ 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) && (_OPENMP >= 200203) - #pragma omp parallel for +#if defined(MAGICKCORE_OPENMP_SUPPORT) + #pragma omp parallel for schedule(dynamic,4) #endif for (i=0; i <= (long) MaxMap; i++) { @@ -809,8 +809,8 @@ MagickExport MagickBooleanType RGBTransformImage(Image *image, G = 0.0*R+0.1*G+0.0*B B = 0.0*R+0.0*G+1.0*B */ -#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) - #pragma omp parallel for +#if defined(MAGICKCORE_OPENMP_SUPPORT) + #pragma omp parallel for schedule(dynamic,4) #endif for (i=0; i <= (long) MaxMap; i++) { @@ -843,8 +843,8 @@ MagickExport MagickBooleanType RGBTransformImage(Image *image, Y = 0.2126729*R+0.7151522*G+0.0721750*B Z = 0.0193339*R+0.1191920*G+0.9503041*B */ -#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) - #pragma omp parallel for +#if defined(MAGICKCORE_OPENMP_SUPPORT) + #pragma omp parallel for schedule(dynamic,4) #endif for (i=0; i <= (long) MaxMap; i++) { @@ -913,8 +913,8 @@ 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) && (_OPENMP >= 200203) - #pragma omp parallel for +#if defined(MAGICKCORE_OPENMP_SUPPORT) + #pragma omp parallel for schedule(dynamic,4) #endif for (i=0; i <= (long) MaxMap; i++) { @@ -944,8 +944,8 @@ 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) && (_OPENMP >= 200203) - #pragma omp parallel for +#if defined(MAGICKCORE_OPENMP_SUPPORT) + #pragma omp parallel for schedule(dynamic,4) #endif for (i=0; i <= (long) MaxMap; i++) { @@ -976,8 +976,8 @@ 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) && (_OPENMP >= 200203) - #pragma omp parallel for +#if defined(MAGICKCORE_OPENMP_SUPPORT) + #pragma omp parallel for schedule(dynamic,4) #endif for (i=0; i <= (long) MaxMap; i++) { @@ -1006,8 +1006,8 @@ MagickExport MagickBooleanType RGBTransformImage(Image *image, Convert DirectClass image. */ image_view=AcquireCacheView(image); -#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) - #pragma omp parallel for shared(status) +#if defined(MAGICKCORE_OPENMP_SUPPORT) + #pragma omp parallel for schedule(dynamic,4) shared(status) #endif for (y=0; y < (long) image->rows; y++) { @@ -1058,7 +1058,7 @@ MagickExport MagickBooleanType RGBTransformImage(Image *image, MagickBooleanType proceed; -#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp critical (MagickCore_RGBTransformImage) #endif proceed=SetImageProgress(image,RGBTransformImageTag,progress++, @@ -1419,8 +1419,8 @@ MagickExport MagickBooleanType TransformRGBImage(Image *image, return(MagickFalse); } image_view=AcquireCacheView(image); -#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) - #pragma omp parallel for shared(status) +#if defined(MAGICKCORE_OPENMP_SUPPORT) + #pragma omp parallel for schedule(dynamic,4) shared(status) #endif for (y=0; y < (long) image->rows; y++) { @@ -1475,8 +1475,8 @@ MagickExport MagickBooleanType TransformRGBImage(Image *image, } GetMagickPixelPacket(image,&zero); image_view=AcquireCacheView(image); -#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) - #pragma omp parallel for shared(status) +#if defined(MAGICKCORE_OPENMP_SUPPORT) + #pragma omp parallel for schedule(dynamic,4) shared(status) #endif for (y=0; y < (long) image->rows; y++) { @@ -1535,8 +1535,8 @@ MagickExport MagickBooleanType TransformRGBImage(Image *image, return(MagickFalse); } image_view=AcquireCacheView(image); -#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) - #pragma omp parallel for shared(status) +#if defined(MAGICKCORE_OPENMP_SUPPORT) + #pragma omp parallel for schedule(dynamic,4) shared(status) #endif for (y=0; y < (long) image->rows; y++) { @@ -1593,8 +1593,8 @@ MagickExport MagickBooleanType TransformRGBImage(Image *image, return(MagickFalse); } image_view=AcquireCacheView(image); -#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) - #pragma omp parallel for shared(status) +#if defined(MAGICKCORE_OPENMP_SUPPORT) + #pragma omp parallel for schedule(dynamic,4) shared(status) #endif for (y=0; y < (long) image->rows; y++) { @@ -1651,8 +1651,8 @@ MagickExport MagickBooleanType TransformRGBImage(Image *image, return(MagickFalse); } image_view=AcquireCacheView(image); -#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) - #pragma omp parallel for shared(status) +#if defined(MAGICKCORE_OPENMP_SUPPORT) + #pragma omp parallel for schedule(dynamic,4) shared(status) #endif for (y=0; y < (long) image->rows; y++) { @@ -1709,8 +1709,8 @@ MagickExport MagickBooleanType TransformRGBImage(Image *image, return(MagickFalse); } image_view=AcquireCacheView(image); -#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) - #pragma omp parallel for shared(status) +#if defined(MAGICKCORE_OPENMP_SUPPORT) + #pragma omp parallel for schedule(dynamic,4) shared(status) #endif for (y=0; y < (long) image->rows; y++) { @@ -1810,8 +1810,8 @@ MagickExport MagickBooleanType TransformRGBImage(Image *image, if (SetImageStorageClass(image,DirectClass) == MagickFalse) return(MagickFalse); image_view=AcquireCacheView(image); -#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) - #pragma omp parallel for shared(status) +#if defined(MAGICKCORE_OPENMP_SUPPORT) + #pragma omp parallel for schedule(dynamic,4) shared(status) #endif for (y=0; y < (long) image->rows; y++) { @@ -1889,8 +1889,8 @@ MagickExport MagickBooleanType TransformRGBImage(Image *image, I and Q, normally -0.5 through 0.5, must be normalized to the range 0 through QuantumRange. */ -#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) - #pragma omp parallel for +#if defined(MAGICKCORE_OPENMP_SUPPORT) + #pragma omp parallel for schedule(dynamic,4) #endif for (i=0; i <= (long) MaxMap; i++) { @@ -1924,8 +1924,8 @@ MagickExport MagickBooleanType TransformRGBImage(Image *image, Cb and Cr, normally -0.5 through 0.5, must be normalized to the range 0 through QuantumRange. */ -#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) - #pragma omp parallel for +#if defined(MAGICKCORE_OPENMP_SUPPORT) + #pragma omp parallel for schedule(dynamic,4) #endif for (i=0; i <= (long) MaxMap; i++) { @@ -1957,8 +1957,8 @@ MagickExport MagickBooleanType TransformRGBImage(Image *image, Cb and Cr, normally -0.5 through 0.5, must be normalized to the range 0 through QuantumRange. */ -#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) - #pragma omp parallel for +#if defined(MAGICKCORE_OPENMP_SUPPORT) + #pragma omp parallel for schedule(dynamic,4) #endif for (i=0; i <= (long) MaxMap; i++) { @@ -1987,8 +1987,8 @@ MagickExport MagickBooleanType TransformRGBImage(Image *image, G = 0.0*R+1.0*G+0.0*B B = 0.0*R+0.0*G+1.0*B */ -#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) - #pragma omp parallel for +#if defined(MAGICKCORE_OPENMP_SUPPORT) + #pragma omp parallel for schedule(dynamic,4) #endif for (i=0; i <= (long) MaxMap; i++) { @@ -2013,8 +2013,8 @@ MagickExport MagickBooleanType TransformRGBImage(Image *image, G = -0.9692660*X+1.8760108*Y+0.0415560*Z B = 0.0556434*X-0.2040259*Y+1.057225*Z */ -#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) - #pragma omp parallel for +#if defined(MAGICKCORE_OPENMP_SUPPORT) + #pragma omp parallel for schedule(dynamic,4) #endif for (i=0; i <= (long) MaxMap; i++) { @@ -2041,8 +2041,8 @@ 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) && (_OPENMP >= 200203) - #pragma omp parallel for +#if defined(MAGICKCORE_OPENMP_SUPPORT) + #pragma omp parallel for schedule(dynamic,4) #endif for (i=0; i <= (long) MaxMap; i++) { @@ -2074,8 +2074,8 @@ MagickExport MagickBooleanType TransformRGBImage(Image *image, I and Q, normally -0.5 through 0.5, must be normalized to the range 0 through QuantumRange. */ -#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) - #pragma omp parallel for +#if defined(MAGICKCORE_OPENMP_SUPPORT) + #pragma omp parallel for schedule(dynamic,4) #endif for (i=0; i <= (long) MaxMap; i++) { @@ -2109,8 +2109,8 @@ MagickExport MagickBooleanType TransformRGBImage(Image *image, Pb and Pr, normally -0.5 through 0.5, must be normalized to the range 0 through QuantumRange. */ -#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) - #pragma omp parallel for +#if defined(MAGICKCORE_OPENMP_SUPPORT) + #pragma omp parallel for schedule(dynamic,4) #endif for (i=0; i <= (long) MaxMap; i++) { @@ -2143,8 +2143,8 @@ MagickExport MagickBooleanType TransformRGBImage(Image *image, U and V, normally -0.5 through 0.5, must be normalized to the range 0 through QuantumRange. */ -#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) - #pragma omp parallel for +#if defined(MAGICKCORE_OPENMP_SUPPORT) + #pragma omp parallel for schedule(dynamic,4) #endif for (i=0; i <= (long) MaxMap; i++) { @@ -2177,8 +2177,8 @@ MagickExport MagickBooleanType TransformRGBImage(Image *image, Convert DirectClass image. */ image_view=AcquireCacheView(image); -#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) - #pragma omp parallel for shared(status) +#if defined(MAGICKCORE_OPENMP_SUPPORT) + #pragma omp parallel for schedule(dynamic,4) shared(status) #endif for (y=0; y < (long) image->rows; y++) { @@ -2268,7 +2268,7 @@ MagickExport MagickBooleanType TransformRGBImage(Image *image, MagickBooleanType proceed; -#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp critical (MagickCore_TransformRGBImage) #endif proceed=SetImageProgress(image,TransformRGBImageTag,progress++, @@ -2286,8 +2286,8 @@ MagickExport MagickBooleanType TransformRGBImage(Image *image, Convert PseudoClass image. */ image_view=AcquireCacheView(image); -#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) - #pragma omp parallel for shared(status) +#if defined(MAGICKCORE_OPENMP_SUPPORT) + #pragma omp parallel for schedule(dynamic,4) shared(status) #endif for (i=0; i < (long) image->colors; i++) { diff --git a/magick/compare.c b/magick/compare.c index aa9e8fa9b..6e05119e5 100644 --- a/magick/compare.c +++ b/magick/compare.c @@ -197,8 +197,8 @@ MagickExport Image *CompareImageChannels(Image *image, image_view=AcquireCacheView(image); reconstruct_view=AcquireCacheView(reconstruct_image); highlight_view=AcquireCacheView(highlight_image); -#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) - #pragma omp parallel for shared(status) +#if defined(MAGICKCORE_OPENMP_SUPPORT) + #pragma omp parallel for schedule(dynamic,4) shared(status) #endif for (y=0; y < (long) image->rows; y++) { @@ -369,8 +369,8 @@ static MagickBooleanType GetAbsoluteError(const Image *image, GetMagickPixelPacket(image,&zero); image_view=AcquireCacheView(image); reconstruct_view=AcquireCacheView(reconstruct_image); -#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) - #pragma omp parallel for shared(status) +#if defined(MAGICKCORE_OPENMP_SUPPORT) + #pragma omp parallel for schedule(dynamic,4) shared(status) #endif for (y=0; y < (long) image->rows; y++) { @@ -432,7 +432,7 @@ static MagickBooleanType GetAbsoluteError(const Image *image, p++; q++; } -#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp critical (MagickCore_GetAbsoluteError) #endif for (i=0; i <= (long) AllChannels; i++) @@ -485,8 +485,8 @@ static MagickBooleanType GetMeanAbsoluteError(const Image *image, status=MagickTrue; image_view=AcquireCacheView(image); reconstruct_view=AcquireCacheView(reconstruct_image); -#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) - #pragma omp parallel for shared(status) +#if defined(MAGICKCORE_OPENMP_SUPPORT) + #pragma omp parallel for schedule(dynamic,4) shared(status) #endif for (y=0; y < (long) image->rows; y++) { @@ -559,7 +559,7 @@ static MagickBooleanType GetMeanAbsoluteError(const Image *image, p++; q++; } -#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp critical (MagickCore_GetMeanAbsoluteError) #endif for (i=0; i <= (long) AllChannels; i++) @@ -722,8 +722,8 @@ static MagickBooleanType GetMeanSquaredError(const Image *image, status=MagickTrue; image_view=AcquireCacheView(image); reconstruct_view=AcquireCacheView(reconstruct_image); -#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) - #pragma omp parallel for shared(status) +#if defined(MAGICKCORE_OPENMP_SUPPORT) + #pragma omp parallel for schedule(dynamic,4) shared(status) #endif for (y=0; y < (long) image->rows; y++) { @@ -797,7 +797,7 @@ static MagickBooleanType GetMeanSquaredError(const Image *image, p++; q++; } -#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp critical (MagickCore_GetMeanSquaredError) #endif for (i=0; i <= (long) AllChannels; i++) @@ -828,8 +828,8 @@ static MagickBooleanType GetPeakAbsoluteError(const Image *image, status=MagickTrue; image_view=AcquireCacheView(image); reconstruct_view=AcquireCacheView(reconstruct_image); -#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) - #pragma omp parallel for shared(status) +#if defined(MAGICKCORE_OPENMP_SUPPORT) + #pragma omp parallel for schedule(dynamic,4) shared(status) #endif for (y=0; y < (long) image->rows; y++) { @@ -913,7 +913,7 @@ static MagickBooleanType GetPeakAbsoluteError(const Image *image, p++; q++; } -#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp critical (MagickCore_GetPeakAbsoluteError) #endif for (i=0; i <= (long) AllChannels; i++) @@ -1404,8 +1404,8 @@ static double GetSimilarityMetric(const Image *image,const Image *reference, similarity=0.0; image_view=AcquireCacheView(image); reference_view=AcquireCacheView(reference); -#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) - #pragma omp parallel for shared(status) +#if defined(MAGICKCORE_OPENMP_SUPPORT) + #pragma omp parallel for schedule(dynamic,4) shared(status) #endif for (y=0; y < (long) reference->rows; y++) { @@ -1460,7 +1460,7 @@ static double GetSimilarityMetric(const Image *image,const Image *reference, reference_indexes[x]); thread_similarity+=distance*distance; } -#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp critical (MagickCore_GetSimilarityMetric) #endif similarity+=thread_similarity; @@ -1523,8 +1523,8 @@ MagickExport Image *SimilarityImage(Image *image,const Image *reference, status=MagickTrue; progress=0; similarity_view=AcquireCacheView(similarity_image); -#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) - #pragma omp parallel for shared(progress,status) +#if defined(MAGICKCORE_OPENMP_SUPPORT) + #pragma omp parallel for schedule(dynamic,4) shared(progress,status) #endif for (y=0; y < (long) (image->rows-reference->rows+1); y++) { @@ -1549,7 +1549,7 @@ MagickExport Image *SimilarityImage(Image *image,const Image *reference, for (x=0; x < (long) (image->columns-reference->columns+1); x++) { similarity=GetSimilarityMetric(image,reference,x,y,exception); -#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp critical (MagickCore_SimilarityImage) #endif if (similarity < *similarity_metric) @@ -1570,7 +1570,7 @@ MagickExport Image *SimilarityImage(Image *image,const Image *reference, MagickBooleanType proceed; -#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp critical (MagickCore_SimilarityImage) #endif proceed=SetImageProgress(image,SimilarityImageTag,progress++, diff --git a/magick/composite.c b/magick/composite.c index 05cf439b1..263b6845f 100644 --- a/magick/composite.c +++ b/magick/composite.c @@ -1368,8 +1368,8 @@ MagickExport MagickBooleanType CompositeImageChannel(Image *image, exception=(&image->exception); image_view=AcquireCacheView(image); composite_view=AcquireCacheView(composite_image); -#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) -#pragma omp parallel for shared(status) +#if defined(MAGICKCORE_OPENMP_SUPPORT) +#pragma omp parallel for schedule(dynamic,4) shared(status) #endif for (y=0; y < (long) composite_image->rows; y++) { @@ -1414,7 +1414,7 @@ MagickExport MagickBooleanType CompositeImageChannel(Image *image, MagickBooleanType proceed; -#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp critical (MagickCore_TextureImage) #endif proceed=SetImageProgress(image,CompositeImageTag,y,image->rows); @@ -1844,8 +1844,8 @@ MagickExport MagickBooleanType CompositeImageChannel(Image *image, exception=(&image->exception); image_view=AcquireCacheView(image); composite_view=AcquireCacheView(composite_image); -#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) - #pragma omp parallel for shared(progress,status) +#if defined(MAGICKCORE_OPENMP_SUPPORT) + #pragma omp parallel for schedule(dynamic,4) shared(progress,status) #endif for (y=0; y < (long) image->rows; y++) { @@ -2431,7 +2431,7 @@ MagickExport MagickBooleanType CompositeImageChannel(Image *image, MagickBooleanType proceed; -#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp critical (MagickCore_CompositeImageChannel) #endif proceed=SetImageProgress(image,CompositeImageTag,progress++, @@ -2505,8 +2505,8 @@ MagickExport MagickBooleanType TextureImage(Image *image,const Image *texture) /* Tile texture onto the image background. */ -#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) - #pragma omp parallel for shared(status) +#if defined(MAGICKCORE_OPENMP_SUPPORT) + #pragma omp parallel for schedule(dynamic,4) shared(status) #endif for (y=0; y < (long) image->rows; y+=texture->rows) { @@ -2533,7 +2533,7 @@ MagickExport MagickBooleanType TextureImage(Image *image,const Image *texture) MagickBooleanType proceed; -#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp critical (MagickCore_TextureImage) #endif proceed=SetImageProgress(image,TextureImageTag,y,image->rows); @@ -2552,8 +2552,8 @@ MagickExport MagickBooleanType TextureImage(Image *image,const Image *texture) exception=(&image->exception); image_view=AcquireCacheView(image); texture_view=AcquireCacheView(texture); -#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) -#pragma omp parallel for shared(status) +#if defined(MAGICKCORE_OPENMP_SUPPORT) +#pragma omp parallel for schedule(dynamic,4) shared(status) #endif for (y=0; y < (long) image->rows; y++) { @@ -2614,7 +2614,7 @@ MagickExport MagickBooleanType TextureImage(Image *image,const Image *texture) MagickBooleanType proceed; -#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp critical (MagickCore_TextureImage) #endif proceed=SetImageProgress(image,TextureImageTag,y,image->rows); diff --git a/magick/decorate.c b/magick/decorate.c index 5bd175286..d2c05b33c 100644 --- a/magick/decorate.c +++ b/magick/decorate.c @@ -399,8 +399,8 @@ MagickExport Image *FrameImage(const Image *image,const FrameInfo *frame_info, /* Draw sides of ornamental border. */ -#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) - #pragma omp parallel for shared(progress,status) +#if defined(MAGICKCORE_OPENMP_SUPPORT) + #pragma omp parallel for schedule(dynamic,4) shared(progress,status) #endif for (y=0; y < (long) image->rows; y++) { @@ -506,7 +506,7 @@ MagickExport Image *FrameImage(const Image *image,const FrameInfo *frame_info, MagickBooleanType proceed; -#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp critical (MagickCore_FrameImage) #endif proceed=SetImageProgress(image,FrameImageTag,progress++,image->rows); @@ -721,8 +721,8 @@ MagickExport MagickBooleanType RaiseImage(Image *image, progress=0; exception=(&image->exception); image_view=AcquireCacheView(image); -#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) - #pragma omp parallel for shared(progress,status) +#if defined(MAGICKCORE_OPENMP_SUPPORT) + #pragma omp parallel for schedule(dynamic,4) shared(progress,status) #endif for (y=0; y < (long) raise_info->height; y++) { @@ -788,8 +788,8 @@ MagickExport MagickBooleanType RaiseImage(Image *image, status=MagickFalse; } } -#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) - #pragma omp parallel for shared(progress,status) +#if defined(MAGICKCORE_OPENMP_SUPPORT) + #pragma omp parallel for schedule(dynamic,4) shared(progress,status) #endif for (y=(long) raise_info->height; y < (long) (image->rows-raise_info->height); y++) { @@ -844,8 +844,8 @@ MagickExport MagickBooleanType RaiseImage(Image *image, status=MagickFalse; } } -#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) - #pragma omp parallel for shared(progress,status) +#if defined(MAGICKCORE_OPENMP_SUPPORT) + #pragma omp parallel for schedule(dynamic,4) shared(progress,status) #endif for (y=(long) (image->rows-raise_info->height); y < (long) image->rows; y++) { @@ -903,7 +903,7 @@ MagickExport MagickBooleanType RaiseImage(Image *image, MagickBooleanType proceed; -#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp critical (MagickCore_RaiseImage) #endif proceed=SetImageProgress(image,RaiseImageTag,progress++,image->rows); diff --git a/magick/deprecate.c b/magick/deprecate.c index 76fd99b6a..438c84ff1 100644 --- a/magick/deprecate.c +++ b/magick/deprecate.c @@ -1708,8 +1708,8 @@ MagickExport Image *ExtractSubimageFromImage(Image *image, return((Image *) NULL); similarity_threshold=image->columns*image->rows; SetGeometry(reference,&offset); -#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) - #pragma omp parallel for +#if defined(MAGICKCORE_OPENMP_SUPPORT) + #pragma omp parallel for schedule(dynamic,4) #endif for (y=0; y < (long) (image->rows-reference->rows); y++) { @@ -1723,7 +1723,7 @@ MagickExport Image *ExtractSubimageFromImage(Image *image, { similarity=GetSimilarityMetric(image,reference,x,y,similarity_threshold, exception); -#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp critical (MagickCore_ExtractSubimageFromImage) #endif if (similarity < similarity_threshold) diff --git a/magick/distort.c b/magick/distort.c index c656b9320..8892cb3e3 100644 --- a/magick/distort.c +++ b/magick/distort.c @@ -1924,8 +1924,8 @@ MagickExport Image *DistortImage(const Image *image,DistortImageMethod method, GetMagickPixelPacket(distort_image,&zero); resample_filter=AcquireResampleFilterThreadSet(image,MagickFalse,exception); distort_view=AcquireCacheView(distort_image); -#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) - #pragma omp parallel for shared(progress,status) +#if defined(MAGICKCORE_OPENMP_SUPPORT) + #pragma omp parallel for schedule(dynamic,4) shared(progress,status) #endif for (j=0; j < (long) distort_image->rows; j++) { @@ -2283,7 +2283,7 @@ MagickExport Image *DistortImage(const Image *image,DistortImageMethod method, MagickBooleanType proceed; -#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp critical (MagickCore_DistortImage) #endif proceed=SetImageProgress(image,DistortImageTag,progress++, @@ -2490,8 +2490,8 @@ MagickExport Image *SparseColorImage(const Image *image, progress=0; GetMagickPixelPacket(sparse_image,&zero); sparse_view=AcquireCacheView(sparse_image); -#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) - #pragma omp parallel for shared(progress,status) +#if defined(MAGICKCORE_OPENMP_SUPPORT) + #pragma omp parallel for schedule(dynamic,4) shared(progress,status) #endif for (j=0; j < (long) sparse_image->rows; j++) { @@ -2649,7 +2649,7 @@ MagickExport Image *SparseColorImage(const Image *image, MagickBooleanType proceed; -#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp critical (MagickCore_SparseColorImage) #endif proceed=SetImageProgress(image,SparseColorTag,progress++,image->rows); diff --git a/magick/draw.c b/magick/draw.c index 720fcf595..7ee80b835 100644 --- a/magick/draw.c +++ b/magick/draw.c @@ -1168,8 +1168,8 @@ MagickExport MagickBooleanType DrawAffineImage(Image *image, resample_filter=AcquireResampleFilterThreadSet(source,MagickTrue,exception); image_view=AcquireCacheView(image); source_view=AcquireCacheView(source); -#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) - #pragma omp parallel for shared(status) +#if defined(MAGICKCORE_OPENMP_SUPPORT) + #pragma omp parallel for schedule(dynamic,4) shared(status) #endif for (y=(long) (edge.y1+0.5); y <= (long) (edge.y2+0.5); y++) { @@ -3272,8 +3272,8 @@ MagickExport MagickBooleanType DrawGradientImage(Image *image, exception=(&image->exception); GetMagickPixelPacket(image,&zero); image_view=AcquireCacheView(image); -#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) - #pragma omp parallel for shared(status) +#if defined(MAGICKCORE_OPENMP_SUPPORT) + #pragma omp parallel for schedule(dynamic,4) shared(status) #endif for (y=bounding_box.y; y < (long) bounding_box.height; y++) { @@ -3880,8 +3880,8 @@ static MagickBooleanType DrawPolygonPrimitive(Image *image, /* Draw point. */ -#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) - #pragma omp parallel for shared(status) +#if defined(MAGICKCORE_OPENMP_SUPPORT) + #pragma omp parallel for schedule(dynamic,4) shared(status) #endif for (y=(long) (bounds.y1+0.5); y <= (long) (bounds.y2+0.5); y++) { @@ -3927,8 +3927,8 @@ static MagickBooleanType DrawPolygonPrimitive(Image *image, */ if (image->matte == MagickFalse) (void) SetImageAlphaChannel(image,OpaqueAlphaChannel); -#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) - #pragma omp parallel for shared(status) +#if defined(MAGICKCORE_OPENMP_SUPPORT) + #pragma omp parallel for schedule(dynamic,4) 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 fdd92a45f..65111ae1f 100644 --- a/magick/effect.c +++ b/magick/effect.c @@ -267,8 +267,8 @@ MagickExport Image *AdaptiveBlurImageChannel(const Image *image, image_view=AcquireCacheView(image); edge_view=AcquireCacheView(edge_image); blur_view=AcquireCacheView(blur_image); -#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) - #pragma omp parallel for shared(progress,status) +#if defined(MAGICKCORE_OPENMP_SUPPORT) + #pragma omp parallel for schedule(dynamic,4) shared(progress,status) #endif for (y=0; y < (long) blur_image->rows; y++) { @@ -378,7 +378,7 @@ MagickExport Image *AdaptiveBlurImageChannel(const Image *image, MagickBooleanType proceed; -#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp critical (MagickCore_AdaptiveBlurImageChannel) #endif proceed=SetImageProgress(image,AdaptiveBlurImageTag,progress++, @@ -584,8 +584,8 @@ MagickExport Image *AdaptiveSharpenImageChannel(const Image *image, image_view=AcquireCacheView(image); edge_view=AcquireCacheView(edge_image); sharp_view=AcquireCacheView(sharp_image); -#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) - #pragma omp parallel for shared(progress,status) +#if defined(MAGICKCORE_OPENMP_SUPPORT) + #pragma omp parallel for schedule(dynamic,4) shared(progress,status) #endif for (y=0; y < (long) sharp_image->rows; y++) { @@ -695,7 +695,7 @@ MagickExport Image *AdaptiveSharpenImageChannel(const Image *image, MagickBooleanType proceed; -#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp critical (MagickCore_AdaptiveSharpenImageChannel) #endif proceed=SetImageProgress(image,AdaptiveSharpenImageTag,progress++, @@ -902,8 +902,8 @@ MagickExport Image *BlurImageChannel(const Image *image, SetMagickPixelPacketBias(image,&bias); image_view=AcquireCacheView(image); blur_view=AcquireCacheView(blur_image); -#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) - #pragma omp parallel for shared(progress,status) +#if defined(MAGICKCORE_OPENMP_SUPPORT) + #pragma omp parallel for schedule(dynamic,4) shared(progress,status) #endif for (y=0; y < (long) blur_image->rows; y++) { @@ -1065,7 +1065,7 @@ MagickExport Image *BlurImageChannel(const Image *image, MagickBooleanType proceed; -#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp critical (MagickCore_BlurImageChannel) #endif proceed=SetImageProgress(image,BlurImageTag,progress++,blur_image->rows+ @@ -1081,8 +1081,8 @@ MagickExport Image *BlurImageChannel(const Image *image, */ image_view=AcquireCacheView(blur_image); blur_view=AcquireCacheView(blur_image); -#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) - #pragma omp parallel for shared(progress,status) +#if defined(MAGICKCORE_OPENMP_SUPPORT) + #pragma omp parallel for schedule(dynamic,4) shared(progress,status) #endif for (x=0; x < (long) blur_image->columns; x++) { @@ -1243,7 +1243,7 @@ MagickExport Image *BlurImageChannel(const Image *image, MagickBooleanType proceed; -#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp critical (MagickCore_BlurImageChannel) #endif proceed=SetImageProgress(image,BlurImageTag,progress++,blur_image->rows+ @@ -1493,8 +1493,8 @@ MagickExport Image *DespeckleImage(const Image *image,ExceptionInfo *exception) status=MagickTrue; image_view=AcquireCacheView(image); despeckle_view=AcquireCacheView(despeckle_image); -#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) - #pragma omp parallel for shared(status) +#if defined(MAGICKCORE_OPENMP_SUPPORT) + #pragma omp parallel for schedule(dynamic,4) shared(status) #endif for (channel=0; channel <= 3; channel++) { @@ -1590,7 +1590,7 @@ MagickExport Image *DespeckleImage(const Image *image,ExceptionInfo *exception) MagickBooleanType proceed; -#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp critical (MagickCore_DespeckleImage) #endif proceed=SetImageProgress(image,DespeckleImageTag,channel,3); @@ -2238,8 +2238,8 @@ MagickExport Image *MedianFilterImage(const Image *image,const double radius, progress=0; image_view=AcquireCacheView(image); median_view=AcquireCacheView(median_image); -#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) - #pragma omp parallel for shared(progress,status) +#if defined(MAGICKCORE_OPENMP_SUPPORT) + #pragma omp parallel for schedule(dynamic,4) shared(progress,status) #endif for (y=0; y < (long) median_image->rows; y++) { @@ -2310,7 +2310,7 @@ MagickExport Image *MedianFilterImage(const Image *image,const double radius, MagickBooleanType proceed; -#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp critical (MagickCore_MedianFilterImage) #endif proceed=SetImageProgress(image,MedianFilterImageTag,progress++, @@ -2510,8 +2510,8 @@ MagickExport Image *MotionBlurImageChannel(const Image *image, GetMagickPixelPacket(image,&bias); image_view=AcquireCacheView(image); blur_view=AcquireCacheView(blur_image); -#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) - #pragma omp parallel for shared(progress,status) +#if defined(MAGICKCORE_OPENMP_SUPPORT) + #pragma omp parallel for schedule(dynamic,4) shared(progress,status) #endif for (y=0; y < (long) image->rows; y++) { @@ -2629,7 +2629,7 @@ MagickExport Image *MotionBlurImageChannel(const Image *image, MagickBooleanType proceed; -#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp critical (MagickCore_MotionBlurImageChannel) #endif proceed=SetImageProgress(image,BlurImageTag,progress++,image->rows); @@ -3285,8 +3285,8 @@ MagickExport Image *RadialBlurImageChannel(const Image *image, GetMagickPixelPacket(image,&bias); image_view=AcquireCacheView(image); blur_view=AcquireCacheView(blur_image); -#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) - #pragma omp parallel for shared(progress,status) +#if defined(MAGICKCORE_OPENMP_SUPPORT) + #pragma omp parallel for schedule(dynamic,4) shared(progress,status) #endif for (y=0; y < (long) blur_image->rows; y++) { @@ -3433,7 +3433,7 @@ MagickExport Image *RadialBlurImageChannel(const Image *image, MagickBooleanType proceed; -#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp critical (MagickCore_RadialBlurImageChannel) #endif proceed=SetImageProgress(image,BlurImageTag,progress++,image->rows); @@ -3596,8 +3596,8 @@ MagickExport Image *ReduceNoiseImage(const Image *image,const double radius, progress=0; image_view=AcquireCacheView(image); noise_view=AcquireCacheView(noise_image); -#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) - #pragma omp parallel for shared(progress,status) +#if defined(MAGICKCORE_OPENMP_SUPPORT) + #pragma omp parallel for schedule(dynamic,4) shared(progress,status) #endif for (y=0; y < (long) noise_image->rows; y++) { @@ -3668,7 +3668,7 @@ MagickExport Image *ReduceNoiseImage(const Image *image,const double radius, MagickBooleanType proceed; -#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp critical (MagickCore_ReduceNoiseImage) #endif proceed=SetImageProgress(image,ReduceNoiseImageTag,progress++, @@ -3850,8 +3850,8 @@ MagickExport Image *SelectiveBlurImageChannel(const Image *image, SetMagickPixelPacketBias(image,&bias); image_view=AcquireCacheView(image); blur_view=AcquireCacheView(blur_image); -#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) - #pragma omp parallel for shared(progress,status) +#if defined(MAGICKCORE_OPENMP_SUPPORT) + #pragma omp parallel for schedule(dynamic,4) shared(progress,status) #endif for (y=0; y < (long) image->rows; y++) { @@ -4081,7 +4081,7 @@ MagickExport Image *SelectiveBlurImageChannel(const Image *image, MagickBooleanType proceed; -#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp critical (MagickCore_SelectiveBlurImageChannel) #endif proceed=SetImageProgress(image,SelectiveBlurImageTag,progress++, @@ -4186,8 +4186,8 @@ MagickExport Image *ShadeImage(const Image *image,const MagickBooleanType gray, progress=0; image_view=AcquireCacheView(image); shade_view=AcquireCacheView(shade_image); -#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) - #pragma omp parallel for shared(progress,status) +#if defined(MAGICKCORE_OPENMP_SUPPORT) + #pragma omp parallel for schedule(dynamic,4) shared(progress,status) #endif for (y=0; y < (long) image->rows; y++) { @@ -4278,7 +4278,7 @@ MagickExport Image *ShadeImage(const Image *image,const MagickBooleanType gray, MagickBooleanType proceed; -#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp critical (MagickCore_ShadeImage) #endif proceed=SetImageProgress(image,ShadeImageTag,progress++,image->rows); @@ -4483,8 +4483,8 @@ MagickExport Image *SpreadImage(const Image *image,const double radius, resample_filter=AcquireResampleFilterThreadSet(image,MagickTrue,exception); random_info=AcquireRandomInfoThreadSet(); image_view=AcquireCacheView(spread_image); -#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) - #pragma omp parallel for shared(progress,status) +#if defined(MAGICKCORE_OPENMP_SUPPORT) + #pragma omp parallel for schedule(dynamic,4) shared(progress,status) #endif for (y=0; y < (long) spread_image->rows; y++) { @@ -4528,7 +4528,7 @@ MagickExport Image *SpreadImage(const Image *image,const double radius, MagickBooleanType proceed; -#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp critical (MagickCore_SpreadImage) #endif proceed=SetImageProgress(image,SpreadImageTag,progress++,image->rows); @@ -4642,8 +4642,8 @@ MagickExport Image *UnsharpMaskImageChannel(const Image *image, GetMagickPixelPacket(image,&bias); image_view=AcquireCacheView(image); unsharp_view=AcquireCacheView(unsharp_image); -#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) - #pragma omp parallel for shared(progress,status) +#if defined(MAGICKCORE_OPENMP_SUPPORT) + #pragma omp parallel for schedule(dynamic,4) shared(progress,status) #endif for (y=0; y < (long) image->rows; y++) { @@ -4737,7 +4737,7 @@ MagickExport Image *UnsharpMaskImageChannel(const Image *image, MagickBooleanType proceed; -#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp critical (MagickCore_UnsharpMaskImageChannel) #endif proceed=SetImageProgress(image,SharpenImageTag,progress++,image->rows); diff --git a/magick/enhance.c b/magick/enhance.c index f6a87d33f..2e979adba 100644 --- a/magick/enhance.c +++ b/magick/enhance.c @@ -459,8 +459,8 @@ MagickExport MagickBooleanType ColorDecisionListImage(Image *image, if (cdl_map == (PixelPacket *) NULL) ThrowBinaryException(ResourceLimitError,"MemoryAllocationFailed", image->filename); -#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) - #pragma omp parallel for +#if defined(MAGICKCORE_OPENMP_SUPPORT) + #pragma omp parallel for schedule(dynamic,4) #endif for (i=0; i <= (long) MaxMap; i++) { @@ -479,8 +479,8 @@ MagickExport MagickBooleanType ColorDecisionListImage(Image *image, /* Apply transfer function to colormap. */ -#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) - #pragma omp parallel for shared(progress,status) +#if defined(MAGICKCORE_OPENMP_SUPPORT) + #pragma omp parallel for schedule(dynamic,4) shared(progress,status) #endif for (i=0; i < (long) image->colors; i++) { @@ -505,8 +505,8 @@ MagickExport MagickBooleanType ColorDecisionListImage(Image *image, progress=0; exception=(&image->exception); image_view=AcquireCacheView(image); -#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) - #pragma omp parallel for shared(progress,status) +#if defined(MAGICKCORE_OPENMP_SUPPORT) + #pragma omp parallel for schedule(dynamic,4) shared(progress,status) #endif for (y=0; y < (long) image->rows; y++) { @@ -545,7 +545,7 @@ MagickExport MagickBooleanType ColorDecisionListImage(Image *image, MagickBooleanType proceed; -#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp critical (MagickCore_ColorDecisionListImageChannel) #endif proceed=SetImageProgress(image,ColorDecisionListCorrectImageTag, @@ -653,8 +653,8 @@ MagickExport MagickBooleanType ClutImageChannel(Image *image, resample_filter=AcquireResampleFilterThreadSet(clut_image,MagickTrue, exception); image_view=AcquireCacheView(image); -#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) - #pragma omp parallel for shared(progress,status) +#if defined(MAGICKCORE_OPENMP_SUPPORT) + #pragma omp parallel for schedule(dynamic,4) shared(progress,status) #endif for (y=0; y < (long) image->rows; y++) { @@ -769,7 +769,7 @@ MagickExport MagickBooleanType ClutImageChannel(Image *image, MagickBooleanType proceed; -#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp critical (MagickCore_ClutImageChannel) #endif proceed=SetImageProgress(image,ClutImageTag,progress++,image->rows); @@ -886,8 +886,8 @@ MagickExport MagickBooleanType ContrastImage(Image *image, progress=0; exception=(&image->exception); image_view=AcquireCacheView(image); -#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) - #pragma omp parallel for shared(progress,status) +#if defined(MAGICKCORE_OPENMP_SUPPORT) + #pragma omp parallel for schedule(dynamic,4) shared(progress,status) #endif for (y=0; y < (long) image->rows; y++) { @@ -917,7 +917,7 @@ MagickExport MagickBooleanType ContrastImage(Image *image, MagickBooleanType proceed; -#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp critical (MagickCore_ContrastImage) #endif proceed=SetImageProgress(image,ContrastImageTag,progress++,image->rows); @@ -1224,8 +1224,8 @@ MagickExport MagickBooleanType ContrastStretchImageChannel(Image *image, Stretch the histogram to create the stretched image mapping. */ (void) ResetMagickMemory(stretch_map,0,(MaxMap+1)*sizeof(*stretch_map)); -#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) - #pragma omp parallel for shared(progress,status) +#if defined(MAGICKCORE_OPENMP_SUPPORT) + #pragma omp parallel for schedule(dynamic,4) shared(progress,status) #endif for (i=0; i <= (long) MaxMap; i++) { @@ -1306,8 +1306,8 @@ MagickExport MagickBooleanType ContrastStretchImageChannel(Image *image, /* Stretch colormap. */ -#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) - #pragma omp parallel for shared(progress,status) +#if defined(MAGICKCORE_OPENMP_SUPPORT) + #pragma omp parallel for schedule(dynamic,4) shared(progress,status) #endif for (i=0; i < (long) image->colors; i++) { @@ -1342,8 +1342,8 @@ MagickExport MagickBooleanType ContrastStretchImageChannel(Image *image, */ status=MagickTrue; progress=0; -#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) - #pragma omp parallel for shared(progress,status) +#if defined(MAGICKCORE_OPENMP_SUPPORT) + #pragma omp parallel for schedule(dynamic,4) shared(progress,status) #endif for (y=0; y < (long) image->rows; y++) { @@ -1406,7 +1406,7 @@ MagickExport MagickBooleanType ContrastStretchImageChannel(Image *image, MagickBooleanType proceed; -#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp critical (MagickCore_ContrastStretchImageChannel) #endif proceed=SetImageProgress(image,ContrastStretchImageTag,progress++, @@ -1521,8 +1521,8 @@ MagickExport Image *EnhanceImage(const Image *image,ExceptionInfo *exception) (void) ResetMagickMemory(&zero,0,sizeof(zero)); image_view=AcquireCacheView(image); enhance_view=AcquireCacheView(enhance_image); -#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) - #pragma omp parallel for shared(progress,status) +#if defined(MAGICKCORE_OPENMP_SUPPORT) + #pragma omp parallel for schedule(dynamic,4) shared(progress,status) #endif for (y=0; y < (long) image->rows; y++) { @@ -1597,7 +1597,7 @@ MagickExport Image *EnhanceImage(const Image *image,ExceptionInfo *exception) MagickBooleanType proceed; -#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp critical (MagickCore_EnhanceImage) #endif proceed=SetImageProgress(image,EnhanceImageTag,progress++,image->rows); @@ -1754,8 +1754,8 @@ MagickExport MagickBooleanType EqualizeImageChannel(Image *image, black=map[0]; white=map[(int) MaxMap]; (void) ResetMagickMemory(equalize_map,0,(MaxMap+1)*sizeof(*equalize_map)); -#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) - #pragma omp parallel for shared(progress,status) +#if defined(MAGICKCORE_OPENMP_SUPPORT) + #pragma omp parallel for schedule(dynamic,4) shared(progress,status) #endif for (i=0; i <= (long) MaxMap; i++) { @@ -1785,8 +1785,8 @@ MagickExport MagickBooleanType EqualizeImageChannel(Image *image, /* Equalize colormap. */ -#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) - #pragma omp parallel for shared(progress,status) +#if defined(MAGICKCORE_OPENMP_SUPPORT) + #pragma omp parallel for schedule(dynamic,4) shared(progress,status) #endif for (i=0; i < (long) image->colors; i++) { @@ -1812,8 +1812,8 @@ MagickExport MagickBooleanType EqualizeImageChannel(Image *image, progress=0; exception=(&image->exception); image_view=AcquireCacheView(image); -#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) - #pragma omp parallel for shared(progress,status) +#if defined(MAGICKCORE_OPENMP_SUPPORT) + #pragma omp parallel for schedule(dynamic,4) shared(progress,status) #endif for (y=0; y < (long) image->rows; y++) { @@ -1861,7 +1861,7 @@ MagickExport MagickBooleanType EqualizeImageChannel(Image *image, MagickBooleanType proceed; -#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp critical (MagickCore_EqualizeImageChannel) #endif proceed=SetImageProgress(image,EqualizeImageTag,progress++,image->rows); @@ -1988,8 +1988,8 @@ MagickExport MagickBooleanType GammaImageChannel(Image *image, image->filename); (void) ResetMagickMemory(gamma_map,0,(MaxMap+1)*sizeof(*gamma_map)); if (gamma != 0.0) -#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) - #pragma omp parallel for +#if defined(MAGICKCORE_OPENMP_SUPPORT) + #pragma omp parallel for schedule(dynamic,4) #endif for (i=0; i <= (long) MaxMap; i++) gamma_map[i]=RoundToQuantum((MagickRealType) ScaleMapToQuantum(( @@ -1999,8 +1999,8 @@ MagickExport MagickBooleanType GammaImageChannel(Image *image, /* Gamma-correct colormap. */ -#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) - #pragma omp parallel for shared(progress,status) +#if defined(MAGICKCORE_OPENMP_SUPPORT) + #pragma omp parallel for schedule(dynamic,4) shared(progress,status) #endif for (i=0; i < (long) image->colors; i++) { @@ -2032,8 +2032,8 @@ MagickExport MagickBooleanType GammaImageChannel(Image *image, progress=0; exception=(&image->exception); image_view=AcquireCacheView(image); -#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) - #pragma omp parallel for shared(progress,status) +#if defined(MAGICKCORE_OPENMP_SUPPORT) + #pragma omp parallel for schedule(dynamic,4) shared(progress,status) #endif for (y=0; y < (long) image->rows; y++) { @@ -2093,7 +2093,7 @@ MagickExport MagickBooleanType GammaImageChannel(Image *image, MagickBooleanType proceed; -#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp critical (MagickCore_GammaImageChannel) #endif proceed=SetImageProgress(image,GammaCorrectImageTag,progress++, @@ -2220,8 +2220,8 @@ MagickExport MagickBooleanType HaldClutImageChannel(Image *image, resample_filter=AcquireResampleFilterThreadSet(hald_image,MagickTrue, exception); image_view=AcquireCacheView(image); -#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) - #pragma omp parallel for shared(progress,status) +#if defined(MAGICKCORE_OPENMP_SUPPORT) + #pragma omp parallel for schedule(dynamic,4) shared(progress,status) #endif for (y=0; y < (long) image->rows; y++) { @@ -2307,7 +2307,7 @@ MagickExport MagickBooleanType HaldClutImageChannel(Image *image, MagickBooleanType proceed; -#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp critical (MagickCore_HaldClutImageChannel) #endif proceed=SetImageProgress(image,HaldClutImageTag,progress++,image->rows); @@ -2491,8 +2491,8 @@ MagickExport MagickBooleanType LevelImageChannel(Image *image, if (image->debug != MagickFalse) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); if (image->storage_class == PseudoClass) -#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) - #pragma omp parallel for shared(progress,status) +#if defined(MAGICKCORE_OPENMP_SUPPORT) + #pragma omp parallel for schedule(dynamic,4) shared(progress,status) #endif for (i=0; i < (long) image->colors; i++) { @@ -2515,8 +2515,8 @@ MagickExport MagickBooleanType LevelImageChannel(Image *image, progress=0; exception=(&image->exception); image_view=AcquireCacheView(image); -#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) - #pragma omp parallel for shared(progress,status) +#if defined(MAGICKCORE_OPENMP_SUPPORT) + #pragma omp parallel for schedule(dynamic,4) shared(progress,status) #endif for (y=0; y < (long) image->rows; y++) { @@ -2561,7 +2561,7 @@ MagickExport MagickBooleanType LevelImageChannel(Image *image, MagickBooleanType proceed; -#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp critical (MagickCore_LevelImageChannel) #endif proceed=SetImageProgress(image,LevelImageTag,progress++,image->rows); @@ -2648,8 +2648,8 @@ MagickExport MagickBooleanType LevelizeImageChannel(Image *image, if (image->debug != MagickFalse) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); if (image->storage_class == PseudoClass) -#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) - #pragma omp parallel for shared(progress,status) +#if defined(MAGICKCORE_OPENMP_SUPPORT) + #pragma omp parallel for schedule(dynamic,4) shared(progress,status) #endif for (i=0; i < (long) image->colors; i++) { @@ -2672,8 +2672,8 @@ MagickExport MagickBooleanType LevelizeImageChannel(Image *image, progress=0; exception=(&image->exception); image_view=AcquireCacheView(image); -#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) - #pragma omp parallel for shared(progress,status) +#if defined(MAGICKCORE_OPENMP_SUPPORT) + #pragma omp parallel for schedule(dynamic,4) shared(progress,status) #endif for (y=0; y < (long) image->rows; y++) { @@ -2718,7 +2718,7 @@ MagickExport MagickBooleanType LevelizeImageChannel(Image *image, MagickBooleanType proceed; -#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp critical (MagickCore_LevelizeImageChannel) #endif proceed=SetImageProgress(image,LevelizeImageTag,progress++,image->rows); @@ -3121,8 +3121,8 @@ MagickExport MagickBooleanType ModulateImage(Image *image,const char *modulate) /* Modulate colormap. */ -#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) - #pragma omp parallel for shared(progress,status) +#if defined(MAGICKCORE_OPENMP_SUPPORT) + #pragma omp parallel for schedule(dynamic,4) shared(progress,status) #endif for (i=0; i < (long) image->colors; i++) switch (colorspace) @@ -3158,8 +3158,8 @@ MagickExport MagickBooleanType ModulateImage(Image *image,const char *modulate) progress=0; exception=(&image->exception); image_view=AcquireCacheView(image); -#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) - #pragma omp parallel for shared(progress,status) +#if defined(MAGICKCORE_OPENMP_SUPPORT) + #pragma omp parallel for schedule(dynamic,4) shared(progress,status) #endif for (y=0; y < (long) image->rows; y++) { @@ -3210,7 +3210,7 @@ MagickExport MagickBooleanType ModulateImage(Image *image,const char *modulate) MagickBooleanType proceed; -#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp critical (MagickCore_ModulateImage) #endif proceed=SetImageProgress(image,ModulateImageTag,progress++,image->rows); @@ -3293,8 +3293,8 @@ MagickExport MagickBooleanType NegateImageChannel(Image *image, /* Negate colormap. */ -#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) - #pragma omp parallel for shared(progress,status) +#if defined(MAGICKCORE_OPENMP_SUPPORT) + #pragma omp parallel for schedule(dynamic,4) shared(progress,status) #endif for (i=0; i < (long) image->colors; i++) { @@ -3322,8 +3322,8 @@ MagickExport MagickBooleanType NegateImageChannel(Image *image, image_view=AcquireCacheView(image); if (grayscale != MagickFalse) { -#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) - #pragma omp parallel for shared(progress,status) +#if defined(MAGICKCORE_OPENMP_SUPPORT) + #pragma omp parallel for schedule(dynamic,4) shared(progress,status) #endif for (y=0; y < (long) image->rows; y++) { @@ -3377,7 +3377,7 @@ MagickExport MagickBooleanType NegateImageChannel(Image *image, MagickBooleanType proceed; -#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp critical (MagickCore_NegateImageChannel) #endif proceed=SetImageProgress(image,NegateImageTag,progress++, @@ -3392,8 +3392,8 @@ MagickExport MagickBooleanType NegateImageChannel(Image *image, /* Negate image. */ -#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) - #pragma omp parallel for shared(progress,status) +#if defined(MAGICKCORE_OPENMP_SUPPORT) + #pragma omp parallel for schedule(dynamic,4) shared(progress,status) #endif for (y=0; y < (long) image->rows; y++) { @@ -3437,7 +3437,7 @@ MagickExport MagickBooleanType NegateImageChannel(Image *image, MagickBooleanType proceed; -#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp critical (MagickCore_NegateImageChannel) #endif proceed=SetImageProgress(image,NegateImageTag,progress++,image->rows); @@ -3601,8 +3601,8 @@ MagickExport MagickBooleanType SigmoidalContrastImageChannel(Image *image, ThrowBinaryException(ResourceLimitError,"MemoryAllocationFailed", image->filename); (void) ResetMagickMemory(sigmoidal_map,0,(MaxMap+1)*sizeof(*sigmoidal_map)); -#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) - #pragma omp parallel for shared(progress,status) +#if defined(MAGICKCORE_OPENMP_SUPPORT) + #pragma omp parallel for schedule(dynamic,4) shared(progress,status) #endif for (i=0; i <= (long) MaxMap; i++) { @@ -3631,8 +3631,8 @@ MagickExport MagickBooleanType SigmoidalContrastImageChannel(Image *image, /* Sigmoidal-contrast enhance colormap. */ -#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) - #pragma omp parallel for shared(progress,status) +#if defined(MAGICKCORE_OPENMP_SUPPORT) + #pragma omp parallel for schedule(dynamic,4) shared(progress,status) #endif for (i=0; i < (long) image->colors; i++) { @@ -3657,8 +3657,8 @@ MagickExport MagickBooleanType SigmoidalContrastImageChannel(Image *image, progress=0; exception=(&image->exception); image_view=AcquireCacheView(image); -#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) - #pragma omp parallel for shared(progress,status) +#if defined(MAGICKCORE_OPENMP_SUPPORT) + #pragma omp parallel for schedule(dynamic,4) shared(progress,status) #endif for (y=0; y < (long) image->rows; y++) { @@ -3703,7 +3703,7 @@ MagickExport MagickBooleanType SigmoidalContrastImageChannel(Image *image, MagickBooleanType proceed; -#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp critical (MagickCore_SigmoidalContrastImageChannel) #endif proceed=SetImageProgress(image,SigmoidalContrastImageTag,progress++, diff --git a/magick/fourier.c b/magick/fourier.c index 887df08ce..6cac42b09 100644 --- a/magick/fourier.c +++ b/magick/fourier.c @@ -490,7 +490,7 @@ static MagickBooleanType ForwardFourierTransform(FourierInfo *fourier_info, source=(double *) RelinquishMagickMemory(source); return(MagickFalse); } -#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp critical (MagickCore_ForwardFourierTransform) #endif fftw_r2c_plan=fftw_plan_dft_r2c_2d(fourier_info->width,fourier_info->width, @@ -653,8 +653,8 @@ MagickExport Image *ForwardFourierTransformImage(const Image *image, AppendImageToList(&fourier_image,phase_image); status=MagickTrue; is_gray=IsGrayImage(image,exception); -#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) - #pragma omp parallel for shared(status) +#if defined(MAGICKCORE_OPENMP_SUPPORT) + #pragma omp parallel for schedule(dynamic,4) shared(status) #endif for (i=0L; i < 5L; i++) { @@ -1033,7 +1033,7 @@ static MagickBooleanType InverseFourierTransform(FourierInfo *fourier_info, ResourceLimitError,"MemoryAllocationFailed","`%s'",image->filename); return(MagickFalse); } -#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp critical (MagickCore_InverseFourierTransform) #endif fftw_c2r_plan=fftw_plan_dft_c2r_2d(fourier_info->width,fourier_info->height, @@ -1196,8 +1196,8 @@ MagickExport Image *InverseFourierTransformImage(const Image *images, is_gray=IsGrayImage(images,exception); if ((is_gray != MagickFalse) && (images->next != (Image *) NULL)) is_gray=IsGrayImage(images->next,exception); -#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) - #pragma omp parallel for shared(status) +#if defined(MAGICKCORE_OPENMP_SUPPORT) + #pragma omp parallel for schedule(dynamic,4) shared(status) #endif for (i=0L; i < 5L; i++) { diff --git a/magick/fx.c b/magick/fx.c index e194aee3b..e6173eab4 100644 --- a/magick/fx.c +++ b/magick/fx.c @@ -334,7 +334,7 @@ MagickExport Image *AddNoiseImageChannel(const Image *image, image_view=AcquireCacheView(image); noise_view=AcquireCacheView(noise_image); #if defined(MAGICKCOREMAGICKCORE_OPENMP_SUPPORT_SUPPORT_DEBUG) - #pragma omp parallel for shared(progress,status) + #pragma omp parallel for schedule(dynamic,4) shared(progress,status) #endif for (y=0; y < (long) image->rows; y++) { @@ -399,7 +399,7 @@ MagickExport Image *AddNoiseImageChannel(const Image *image, MagickBooleanType proceed; -#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp critical (MagickCore_AverageImages) #endif proceed=SetImageProgress(image,AddNoiseImageTag,progress++, @@ -490,7 +490,7 @@ MagickExport Image *BlueShiftImage(const Image *image,const double factor, image_view=AcquireCacheView(image); shift_view=AcquireCacheView(shift_image); #if defined(MAGICKCOREMAGICKCORE_OPENMP_SUPPORT_SUPPORT_DEBUG) - #pragma omp parallel for shared(progress,status) + #pragma omp parallel for schedule(dynamic,4) shared(progress,status) #endif for (y=0; y < (long) image->rows; y++) { @@ -737,7 +737,7 @@ MagickExport Image *ColorizeImage(const Image *image,const char *opacity, image_view=AcquireCacheView(image); colorize_view=AcquireCacheView(colorize_image); #if defined(MAGICKCOREMAGICKCORE_OPENMP_SUPPORT_SUPPORT_DEBUG) - #pragma omp parallel for shared(progress,status) + #pragma omp parallel for schedule(dynamic,4) shared(progress,status) #endif for (y=0; y < (long) image->rows; y++) { @@ -957,8 +957,8 @@ MagickExport Image *ConvolveImageChannel(const Image *image, SetMagickPixelPacketBias(image,&bias); image_view=AcquireCacheView(image); convolve_view=AcquireCacheView(convolve_image); -#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) - #pragma omp parallel for shared(progress,status) +#if defined(MAGICKCORE_OPENMP_SUPPORT) + #pragma omp parallel for schedule(dynamic,4) shared(progress,status) #endif for (y=0; y < (long) image->rows; y++) { @@ -1146,7 +1146,7 @@ MagickExport Image *ConvolveImageChannel(const Image *image, MagickBooleanType proceed; -#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp critical (MagickCore_ConvolveImageChannel) #endif proceed=SetImageProgress(image,ConvolveImageTag,progress++,image->rows); @@ -1472,8 +1472,8 @@ MagickExport MagickBooleanType EvaluateImageChannel(Image *image, progress=0; random_info=AcquireRandomInfoThreadSet(); image_view=AcquireCacheView(image); -#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) - #pragma omp parallel for shared(progress,status) +#if defined(MAGICKCORE_OPENMP_SUPPORT) + #pragma omp parallel for schedule(dynamic,4) shared(progress,status) #endif for (y=0; y < (long) image->rows; y++) { @@ -1526,7 +1526,7 @@ MagickExport MagickBooleanType EvaluateImageChannel(Image *image, MagickBooleanType proceed; -#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp critical (MagickCore_EvaluateImageChannel) #endif proceed=SetImageProgress(image,EvaluateImageTag,progress++,image->rows); @@ -1704,8 +1704,8 @@ MagickExport MagickBooleanType FunctionImageChannel(Image *image, status=MagickTrue; progress=0; image_view=AcquireCacheView(image); -#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) - #pragma omp parallel for shared(progress,status) +#if defined(MAGICKCORE_OPENMP_SUPPORT) + #pragma omp parallel for schedule(dynamic,4) shared(progress,status) #endif for (y=0; y < (long) image->rows; y++) { @@ -1760,7 +1760,7 @@ MagickExport MagickBooleanType FunctionImageChannel(Image *image, MagickBooleanType proceed; -#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp critical (MagickCore_FunctionImageChannel) #endif proceed=SetImageProgress(image,FunctionImageTag,progress++,image->rows); @@ -3540,8 +3540,8 @@ MagickExport Image *FxImageChannel(const Image *image,const ChannelType channel, status=MagickTrue; progress=0; fx_view=AcquireCacheView(fx_image); -#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) - #pragma omp parallel for shared(progress,status) +#if defined(MAGICKCORE_OPENMP_SUPPORT) + #pragma omp parallel for schedule(dynamic,4) shared(progress,status) #endif for (y=0; y < (long) fx_image->rows; y++) { @@ -3616,7 +3616,7 @@ MagickExport Image *FxImageChannel(const Image *image,const ChannelType channel, MagickBooleanType proceed; -#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp critical (MagickCore_FxImageChannel) #endif proceed=SetImageProgress(image,FxImageTag,progress++,image->rows); @@ -3743,8 +3743,8 @@ MagickExport Image *ImplodeImage(const Image *image,const double amount, resample_filter=AcquireResampleFilterThreadSet(image,MagickTrue,exception); image_view=AcquireCacheView(image); implode_view=AcquireCacheView(implode_image); -#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) - #pragma omp parallel for shared(progress,status) +#if defined(MAGICKCORE_OPENMP_SUPPORT) + #pragma omp parallel for schedule(dynamic,4) shared(progress,status) #endif for (y=0; y < (long) image->rows; y++) { @@ -3813,7 +3813,7 @@ MagickExport Image *ImplodeImage(const Image *image,const double amount, MagickBooleanType proceed; -#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp critical (MagickCore_ImplodeImage) #endif proceed=SetImageProgress(image,ImplodeImageTag,progress++,image->rows); @@ -3965,8 +3965,8 @@ MagickExport Image *MorphImages(const Image *image, } image_view=AcquireCacheView(morph_image); morph_view=AcquireCacheView(morph_images); -#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) - #pragma omp parallel for shared(status) +#if defined(MAGICKCORE_OPENMP_SUPPORT) + #pragma omp parallel for schedule(dynamic,4) shared(status) #endif for (y=0; y < (long) morph_images->rows; y++) { @@ -4028,7 +4028,7 @@ MagickExport Image *MorphImages(const Image *image, MagickBooleanType proceed; -#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp critical (MagickCore_MorphImages) #endif proceed=SetImageProgress(image,MorphImageTag,scene, @@ -4592,8 +4592,8 @@ MagickExport Image *RecolorImage(const Image *image,const unsigned long order, k=color_matrix; image_view=AcquireCacheView(image); recolor_view=AcquireCacheView(recolor_image); -#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) - #pragma omp parallel for shared(progress,status) +#if defined(MAGICKCORE_OPENMP_SUPPORT) + #pragma omp parallel for schedule(dynamic,4) shared(progress,status) #endif for (y=0; y < (long) image->rows; y++) { @@ -4716,7 +4716,7 @@ MagickExport Image *RecolorImage(const Image *image,const unsigned long order, MagickBooleanType proceed; -#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp critical (MagickCore_RecolorImage) #endif proceed=SetImageProgress(image,RecolorImageTag,progress++,image->rows); @@ -4805,8 +4805,8 @@ MagickExport Image *SepiaToneImage(const Image *image,const double threshold, progress=0; image_view=AcquireCacheView(image); sepia_view=AcquireCacheView(sepia_image); -#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) - #pragma omp parallel for shared(progress,status) +#if defined(MAGICKCORE_OPENMP_SUPPORT) + #pragma omp parallel for schedule(dynamic,4) shared(progress,status) #endif for (y=0; y < (long) image->rows; y++) { @@ -4859,7 +4859,7 @@ MagickExport Image *SepiaToneImage(const Image *image,const double threshold, MagickBooleanType proceed; -#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp critical (MagickCore_SepiaToneImage) #endif proceed=SetImageProgress(image,SepiaToneImageTag,progress++, @@ -4963,8 +4963,8 @@ MagickExport Image *ShadowImage(const Image *image,const double opacity, status=MagickTrue; progress=0; image_view=AcquireCacheView(border_image); -#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) - #pragma omp parallel for shared(progress,status) +#if defined(MAGICKCORE_OPENMP_SUPPORT) + #pragma omp parallel for schedule(dynamic,4) shared(progress,status) #endif for (y=0; y < (long) border_image->rows; y++) { @@ -5002,7 +5002,7 @@ MagickExport Image *ShadowImage(const Image *image,const double opacity, MagickBooleanType proceed; -#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp critical (MagickCore_ShadowImage) #endif proceed=SetImageProgress(image,ShadowImageTag,progress++, @@ -5252,8 +5252,8 @@ MagickExport MagickBooleanType SolarizeImage(Image *image, progress=0; exception=(&image->exception); image_view=AcquireCacheView(image); -#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) - #pragma omp parallel for shared(progress,status) +#if defined(MAGICKCORE_OPENMP_SUPPORT) + #pragma omp parallel for schedule(dynamic,4) shared(progress,status) #endif for (y=0; y < (long) image->rows; y++) { @@ -5289,7 +5289,7 @@ MagickExport MagickBooleanType SolarizeImage(Image *image, MagickBooleanType proceed; -#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp critical (MagickCore_SolarizeImage) #endif proceed=SetImageProgress(image,SolarizeImageTag,progress++,image->rows); @@ -5693,8 +5693,8 @@ MagickExport Image *SwirlImage(const Image *image,double degrees, resample_filter=AcquireResampleFilterThreadSet(image,MagickTrue,exception); image_view=AcquireCacheView(image); swirl_view=AcquireCacheView(swirl_image); -#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) - #pragma omp parallel for shared(progress,status) +#if defined(MAGICKCORE_OPENMP_SUPPORT) + #pragma omp parallel for schedule(dynamic,4) shared(progress,status) #endif for (y=0; y < (long) image->rows; y++) { @@ -5764,7 +5764,7 @@ MagickExport Image *SwirlImage(const Image *image,double degrees, MagickBooleanType proceed; -#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp critical (MagickCore_SwirlImage) #endif proceed=SetImageProgress(image,SwirlImageTag,progress++,image->rows); @@ -5890,8 +5890,8 @@ MagickExport Image *TintImage(const Image *image,const char *opacity, progress=0; image_view=AcquireCacheView(image); tint_view=AcquireCacheView(tint_image); -#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) - #pragma omp parallel for shared(progress,status) +#if defined(MAGICKCORE_OPENMP_SUPPORT) + #pragma omp parallel for schedule(dynamic,4) shared(progress,status) #endif for (y=0; y < (long) image->rows; y++) { @@ -5945,7 +5945,7 @@ MagickExport Image *TintImage(const Image *image,const char *opacity, MagickBooleanType proceed; -#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp critical (MagickCore_TintImage) #endif proceed=SetImageProgress(image,TintImageTag,progress++,image->rows); @@ -6156,8 +6156,8 @@ MagickExport Image *WaveImage(const Image *image,const double amplitude, GetMagickPixelPacket(wave_image,&zero); resample_filter=AcquireResampleFilterThreadSet(image,MagickTrue,exception); wave_view=AcquireCacheView(wave_image); -#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) - #pragma omp parallel for shared(progress,status) +#if defined(MAGICKCORE_OPENMP_SUPPORT) + #pragma omp parallel for schedule(dynamic,4) shared(progress,status) #endif for (y=0; y < (long) wave_image->rows; y++) { @@ -6202,7 +6202,7 @@ MagickExport Image *WaveImage(const Image *image,const double amplitude, MagickBooleanType proceed; -#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp critical (MagickCore_WaveImage) #endif proceed=SetImageProgress(image,WaveImageTag,progress++,image->rows); diff --git a/magick/image.c b/magick/image.c index 1e725e7e4..987e62e49 100644 --- a/magick/image.c +++ b/magick/image.c @@ -550,8 +550,8 @@ MagickExport Image *AppendImages(const Image *image, else y_offset-=geometry.y; image_view=AcquireCacheView(image); -#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) - #pragma omp parallel for shared(status) +#if defined(MAGICKCORE_OPENMP_SUPPORT) + #pragma omp parallel for schedule(dynamic,4) shared(status) #endif for (y=0; y < (long) image->rows; y++) { @@ -1091,8 +1091,8 @@ MagickExport Image *CombineImages(const Image *image,const ChannelType channel, status=MagickTrue; progress=0; combine_view=AcquireCacheView(combine_image); -#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) - #pragma omp parallel for shared(progress,status) +#if defined(MAGICKCORE_OPENMP_SUPPORT) + #pragma omp parallel for schedule(dynamic,4) shared(progress,status) #endif for (y=0; y < (long) combine_image->rows; y++) { @@ -1214,7 +1214,7 @@ MagickExport Image *CombineImages(const Image *image,const ChannelType channel, MagickBooleanType proceed; -#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp critical (MagickCore_CombineImages) #endif proceed=SetImageProgress(image,CombineImageTag,progress++, @@ -1878,8 +1878,8 @@ MagickExport MagickBooleanType IsHighDynamicRangeImage(const Image *image, status=MagickTrue; GetMagickPixelPacket(image,&zero); image_view=AcquireCacheView(image); -#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) - #pragma omp parallel for shared(status) +#if defined(MAGICKCORE_OPENMP_SUPPORT) + #pragma omp parallel for schedule(dynamic,4) shared(status) #endif for (y=0; y < (long) image->rows; y++) { @@ -2338,8 +2338,8 @@ MagickExport MagickBooleanType SeparateImageChannel(Image *image, progress=0; exception=(&image->exception); image_view=AcquireCacheView(image); -#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) - #pragma omp parallel for shared(progress,status) +#if defined(MAGICKCORE_OPENMP_SUPPORT) + #pragma omp parallel for schedule(dynamic,4) shared(progress,status) #endif for (y=0; y < (long) image->rows; y++) { @@ -2448,7 +2448,7 @@ MagickExport MagickBooleanType SeparateImageChannel(Image *image, MagickBooleanType proceed; -#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp critical (MagickCore_SeparateImageChannel) #endif proceed=SetImageProgress(image,SeparateImageTag,progress++,image->rows); @@ -2625,8 +2625,8 @@ MagickExport MagickBooleanType SetImageAlphaChannel(Image *image, status=MagickTrue; exception=(&image->exception); image_view=AcquireCacheView(image); - #if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) - #pragma omp parallel for shared(status) + #if defined(MAGICKCORE_OPENMP_SUPPORT) + #pragma omp parallel for schedule(dynamic,4) shared(status) #endif for (y=0; y < (long) image->rows; y++) { @@ -2801,8 +2801,8 @@ MagickExport MagickBooleanType SetImageBackgroundColor(Image *image) status=MagickTrue; exception=(&image->exception); image_view=AcquireCacheView(image); -#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) - #pragma omp parallel for shared(status) +#if defined(MAGICKCORE_OPENMP_SUPPORT) + #pragma omp parallel for schedule(dynamic,4) shared(status) #endif for (y=0; y < (long) image->rows; y++) { @@ -3468,8 +3468,8 @@ MagickExport MagickBooleanType SetImageOpacity(Image *image, status=MagickTrue; exception=(&image->exception); image_view=AcquireCacheView(image); -#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) - #pragma omp parallel for shared(status) +#if defined(MAGICKCORE_OPENMP_SUPPORT) + #pragma omp parallel for schedule(dynamic,4) shared(status) #endif for (y=0; y < (long) image->rows; y++) { diff --git a/magick/paint.c b/magick/paint.c index c442322fd..89e71aa9b 100644 --- a/magick/paint.c +++ b/magick/paint.c @@ -600,8 +600,8 @@ MagickExport Image *OilPaintImage(const Image *image,const double radius, progress=0; image_view=AcquireCacheView(image); paint_view=AcquireCacheView(paint_image); -#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) - #pragma omp parallel for shared(progress,status) +#if defined(MAGICKCORE_OPENMP_SUPPORT) + #pragma omp parallel for schedule(dynamic,4) shared(progress,status) #endif for (y=0; y < (long) image->rows; y++) { @@ -685,7 +685,7 @@ MagickExport Image *OilPaintImage(const Image *image,const double radius, MagickBooleanType proceed; -#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp critical (MagickCore_OilPaintImage) #endif proceed=SetImageProgress(image,OilPaintImageTag,progress++,image->rows); @@ -789,8 +789,8 @@ MagickExport MagickBooleanType OpaquePaintImageChannel(Image *image, exception=(&image->exception); GetMagickPixelPacket(image,&zero); image_view=AcquireCacheView(image); -#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) - #pragma omp parallel for shared(progress,status) +#if defined(MAGICKCORE_OPENMP_SUPPORT) + #pragma omp parallel for schedule(dynamic,4) shared(progress,status) #endif for (y=0; y < (long) image->rows; y++) { @@ -842,7 +842,7 @@ MagickExport MagickBooleanType OpaquePaintImageChannel(Image *image, MagickBooleanType proceed; -#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp critical (MagickCore_OpaquePaintImageChannel) #endif proceed=SetImageProgress(image,OpaquePaintImageTag,progress++, @@ -931,8 +931,8 @@ MagickExport MagickBooleanType TransparentPaintImage(Image *image, exception=(&image->exception); GetMagickPixelPacket(image,&zero); image_view=AcquireCacheView(image); -#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) - #pragma omp parallel for shared(progress,status) +#if defined(MAGICKCORE_OPENMP_SUPPORT) + #pragma omp parallel for schedule(dynamic,4) shared(progress,status) #endif for (y=0; y < (long) image->rows; y++) { @@ -972,7 +972,7 @@ MagickExport MagickBooleanType TransparentPaintImage(Image *image, MagickBooleanType proceed; -#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp critical (MagickCore_TransparentPaintImage) #endif proceed=SetImageProgress(image,TransparentPaintImageTag,progress++, @@ -1061,8 +1061,8 @@ MagickExport MagickBooleanType TransparentPaintImageChroma(Image *image, progress=0; exception=(&image->exception); image_view=AcquireCacheView(image); -#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) - #pragma omp parallel for shared(progress,status) +#if defined(MAGICKCORE_OPENMP_SUPPORT) + #pragma omp parallel for schedule(dynamic,4) shared(progress,status) #endif for (y=0; y < (long) image->rows; y++) { @@ -1109,7 +1109,7 @@ MagickExport MagickBooleanType TransparentPaintImageChroma(Image *image, MagickBooleanType proceed; -#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp critical (MagickCore_TransparentPaintImageChroma) #endif proceed=SetImageProgress(image,TransparentPaintImageTag,progress++, diff --git a/magick/prepress.c b/magick/prepress.c index 7a1147b85..139382ad7 100644 --- a/magick/prepress.c +++ b/magick/prepress.c @@ -108,8 +108,8 @@ MagickExport double GetImageTotalInkDensity(Image *image) total_ink_density=0.0; exception=(&image->exception); image_view=AcquireCacheView(image); -#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) - #pragma omp parallel for shared(status) +#if defined(MAGICKCORE_OPENMP_SUPPORT) + #pragma omp parallel for schedule(dynamic,4) shared(status) #endif for (y=0; y < (long) image->rows; y++) { @@ -136,7 +136,7 @@ MagickExport double GetImageTotalInkDensity(Image *image) { density=(double) p->red+p->green+p->blue+indexes[x]; if (density > total_ink_density) -#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp critical (MagickCore_GetImageTotalInkDensity) #endif { diff --git a/magick/profile.c b/magick/profile.c index c8c18f6eb..459769130 100644 --- a/magick/profile.c +++ b/magick/profile.c @@ -1150,8 +1150,8 @@ MagickExport MagickBooleanType ProfileImage(Image *image,const char *name, status=MagickTrue; progress=0; image_view=AcquireCacheView(image); -#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) - #pragma omp parallel for shared(status) +#if defined(MAGICKCORE_OPENMP_SUPPORT) + #pragma omp parallel for schedule(dynamic,4) shared(status) #endif for (y=0; y < (long) image->rows; y++) { @@ -1227,7 +1227,7 @@ MagickExport MagickBooleanType ProfileImage(Image *image,const char *name, MagickBooleanType proceed; -#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp critical (MagickCore_ProfileImage) #endif proceed=SetImageProgress(image,ProfileImageTag,progress++, diff --git a/magick/quantize.c b/magick/quantize.c index eab7f27c0..0f124c553 100644 --- a/magick/quantize.c +++ b/magick/quantize.c @@ -3022,8 +3022,8 @@ static MagickBooleanType SetGrayscaleImage(Image *image) status=MagickTrue; exception=(&image->exception); image_view=AcquireCacheView(image); -#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) - #pragma omp parallel for shared(status) +#if defined(MAGICKCORE_OPENMP_SUPPORT) + #pragma omp parallel for schedule(dynamic,4) shared(status) #endif for (y=0; y < (long) image->rows; y++) { @@ -3054,7 +3054,7 @@ static MagickBooleanType SetGrayscaleImage(Image *image) intensity=ScaleQuantumToMap(q->red); if (colormap_index[intensity] < 0) { -#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp critical (MagickCore_SetGrayscaleImage) #endif if (colormap_index[intensity] < 0) @@ -3098,8 +3098,8 @@ static MagickBooleanType SetGrayscaleImage(Image *image) status=MagickTrue; exception=(&image->exception); image_view=AcquireCacheView(image); -#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) - #pragma omp parallel for shared(status) +#if defined(MAGICKCORE_OPENMP_SUPPORT) + #pragma omp parallel for schedule(dynamic,4) shared(status) #endif for (y=0; y < (long) image->rows; y++) { diff --git a/magick/resize.c b/magick/resize.c index df9d2458d..c6caf0abc 100644 --- a/magick/resize.c +++ b/magick/resize.c @@ -1721,7 +1721,7 @@ static MagickBooleanType HorizontalFilter(const ResizeFilter *resize_filter, (void) ResetMagickMemory(&zero,0,sizeof(zero)); image_view=AcquireCacheView(image); resize_view=AcquireCacheView(resize_image); -#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for shared(status) #endif for (x=0; x < (long) resize_image->columns; x++) @@ -1890,7 +1890,7 @@ static MagickBooleanType HorizontalFilter(const ResizeFilter *resize_filter, MagickBooleanType proceed; -#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp critical (MagickCore_HorizontalFilter) #endif proceed=SetImageProgress(image,ResizeImageTag,(*quantum)++,span); @@ -1962,7 +1962,7 @@ static MagickBooleanType VerticalFilter(const ResizeFilter *resize_filter, (void) ResetMagickMemory(&zero,0,sizeof(zero)); image_view=AcquireCacheView(image); resize_view=AcquireCacheView(resize_image); -#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp parallel for shared(status) #endif for (y=0; y < (long) resize_image->rows; y++) @@ -2131,7 +2131,7 @@ static MagickBooleanType VerticalFilter(const ResizeFilter *resize_filter, MagickBooleanType proceed; -#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp critical (MagickCore_VerticalFilter) #endif proceed=SetImageProgress(image,ResizeImageTag,(*quantum)++,span); @@ -2335,8 +2335,8 @@ MagickExport Image *SampleImage(const Image *image,const unsigned long columns, progress=0; image_view=AcquireCacheView(image); sample_view=AcquireCacheView(sample_image); -#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) - #pragma omp parallel for shared(progress,status) +#if defined(MAGICKCORE_OPENMP_SUPPORT) + #pragma omp parallel for schedule(dynamic,4) shared(progress,status) #endif for (y=0; y < (long) sample_image->rows; y++) { @@ -2388,7 +2388,7 @@ MagickExport Image *SampleImage(const Image *image,const unsigned long columns, MagickBooleanType proceed; -#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp critical (MagickCore_SampleImage) #endif proceed=SetImageProgress(image,SampleImageTag,progress++,image->rows); diff --git a/magick/segment.c b/magick/segment.c index e5f95e74a..06bd4258c 100644 --- a/magick/segment.c +++ b/magick/segment.c @@ -394,7 +394,7 @@ static MagickBooleanType Classify(Image *image,short **extrema, MagickBooleanType proceed; -#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp critical (MagickCore_Classify) #endif proceed=SetImageProgress(image,SegmentImageTag,progress++, @@ -519,8 +519,8 @@ static MagickBooleanType Classify(Image *image,short **extrema, */ exception=(&image->exception); image_view=AcquireCacheView(image); -#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) - #pragma omp parallel for shared(progress,status) +#if defined(MAGICKCORE_OPENMP_SUPPORT) + #pragma omp parallel for schedule(dynamic,4) shared(progress,status) #endif for (y=0; y < (long) image->rows; y++) { @@ -632,7 +632,7 @@ static MagickBooleanType Classify(Image *image,short **extrema, MagickBooleanType proceed; -#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp critical (MagickCore_Classify) #endif proceed=SetImageProgress(image,SegmentImageTag,progress++, diff --git a/magick/shear.c b/magick/shear.c index eb309db02..d445e73c4 100644 --- a/magick/shear.c +++ b/magick/shear.c @@ -446,7 +446,7 @@ static inline ssize_t ReadRadonCell(const RadonInfo *radon_info, count; #if !defined(MAGICKCORE_HAVE_PPREAD) -#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp critical (MagickCore_ReadRadonCell) #endif { @@ -490,7 +490,7 @@ static inline ssize_t WriteRadonCell(const RadonInfo *radon_info, count; #if !defined(MAGICKCORE_HAVE_PWRITE) -#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp critical (MagickCore_WriteRadonCell) #endif { @@ -626,8 +626,8 @@ static void RadonProjection(RadonInfo *source_cells, p=q; q=swap; } -#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) - #pragma omp parallel for +#if defined(MAGICKCORE_OPENMP_SUPPORT) + #pragma omp parallel for schedule(dynamic,4) #endif for (x=0; x < (long) p->width; x++) { @@ -706,8 +706,8 @@ static MagickBooleanType RadonTransform(const Image *image, } status=MagickTrue; image_view=AcquireCacheView(image); -#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) - #pragma omp parallel for shared(status) +#if defined(MAGICKCORE_OPENMP_SUPPORT) + #pragma omp parallel for schedule(dynamic,4) shared(status) #endif for (y=0; y < (long) image->rows; y++) { @@ -757,8 +757,8 @@ static MagickBooleanType RadonTransform(const Image *image, } RadonProjection(source_cells,destination_cells,-1,projection); (void) ResetRadonCells(source_cells); -#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) - #pragma omp parallel for shared(status) +#if defined(MAGICKCORE_OPENMP_SUPPORT) + #pragma omp parallel for schedule(dynamic,4) shared(status) #endif for (y=0; y < (long) image->rows; y++) { @@ -1074,8 +1074,8 @@ static Image *IntegralRotateImage(const Image *image,unsigned long rotations, Rotate 90 degrees. */ GetPixelCacheTileSize(image,&tile_width,&tile_height); -#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) - #pragma omp parallel for shared(progress, status) +#if defined(MAGICKCORE_OPENMP_SUPPORT) + #pragma omp parallel for schedule(dynamic,4) shared(progress, status) #endif for (tile_y=0; tile_y < (long) image->rows; tile_y+=tile_height) { @@ -1188,8 +1188,8 @@ static Image *IntegralRotateImage(const Image *image,unsigned long rotations, /* Rotate 180 degrees. */ -#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) - #pragma omp parallel for shared(progress, status) +#if defined(MAGICKCORE_OPENMP_SUPPORT) + #pragma omp parallel for schedule(dynamic,4) shared(progress, status) #endif for (y=0; y < (long) image->rows; y++) { @@ -1264,8 +1264,8 @@ static Image *IntegralRotateImage(const Image *image,unsigned long rotations, Rotate 270 degrees. */ GetPixelCacheTileSize(image,&tile_width,&tile_height); -#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) - #pragma omp parallel for shared(progress, status) +#if defined(MAGICKCORE_OPENMP_SUPPORT) + #pragma omp parallel for schedule(dynamic,4) shared(progress, status) #endif for (tile_y=0; tile_y < (long) image->rows; tile_y+=tile_height) { @@ -1460,8 +1460,8 @@ static MagickBooleanType XShearImage(Image *image,const MagickRealType degrees, progress=0; exception=(&image->exception); image_view=AcquireCacheView(image); -#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) - #pragma omp parallel for shared(progress, status) +#if defined(MAGICKCORE_OPENMP_SUPPORT) + #pragma omp parallel for schedule(dynamic,4) shared(progress, status) #endif for (y=0; y < (long) height; y++) { @@ -1590,7 +1590,7 @@ static MagickBooleanType XShearImage(Image *image,const MagickRealType degrees, MagickBooleanType proceed; -#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp critical (MagickCore_XShearImage) #endif proceed=SetImageProgress(image,XShearImageTag,progress++,height); @@ -1680,8 +1680,8 @@ static MagickBooleanType YShearImage(Image *image,const MagickRealType degrees, progress=0; exception=(&image->exception); image_view=AcquireCacheView(image); -#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) - #pragma omp parallel for shared(progress, status) +#if defined(MAGICKCORE_OPENMP_SUPPORT) + #pragma omp parallel for schedule(dynamic,4) shared(progress, status) #endif for (x=0; x < (long) width; x++) { @@ -1810,7 +1810,7 @@ static MagickBooleanType YShearImage(Image *image,const MagickRealType degrees, MagickBooleanType proceed; -#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp critical (MagickCore_YShearImage) #endif proceed=SetImageProgress(image,YShearImageTag,progress++,image->rows); diff --git a/magick/statistic.c b/magick/statistic.c index b5af543f5..95cb75e56 100644 --- a/magick/statistic.c +++ b/magick/statistic.c @@ -227,8 +227,8 @@ MagickExport Image *AverageImages(const Image *image,ExceptionInfo *exception) GetMagickPixelPacket(image,&zero); number_images=GetImageListLength(image); average_view=AcquireCacheView(average_image); -#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) - #pragma omp parallel for shared(progress,status) +#if defined(MAGICKCORE_OPENMP_SUPPORT) + #pragma omp parallel for schedule(dynamic) shared(progress,status) #endif for (y=0; y < (long) average_image->rows; y++) { @@ -324,7 +324,7 @@ MagickExport Image *AverageImages(const Image *image,ExceptionInfo *exception) MagickBooleanType proceed; -#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp critical (MagickCore_AverageImages) #endif proceed=SetImageProgress(image,AverageImageTag,progress++, diff --git a/magick/threshold.c b/magick/threshold.c index 2e1139522..1a57b055d 100644 --- a/magick/threshold.c +++ b/magick/threshold.c @@ -191,8 +191,8 @@ MagickExport Image *AdaptiveThresholdImage(const Image *image, number_pixels=(MagickRealType) width*height; image_view=AcquireCacheView(image); threshold_view=AcquireCacheView(threshold_image); -#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) - #pragma omp parallel for shared(progress,status) +#if defined(MAGICKCORE_OPENMP_SUPPORT) + #pragma omp parallel for schedule(dynamic,4) shared(progress,status) #endif for (y=0; y < (long) image->rows; y++) { @@ -286,7 +286,7 @@ MagickExport Image *AdaptiveThresholdImage(const Image *image, MagickBooleanType proceed; -#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp critical (MagickCore_AdaptiveThresholdImage) #endif proceed=SetImageProgress(image,ThresholdImageTag,progress++, @@ -385,8 +385,8 @@ MagickExport MagickBooleanType BilevelImageChannel(Image *image, progress=0; exception=(&image->exception); image_view=AcquireCacheView(image); -#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) - #pragma omp parallel for shared(progress,status) +#if defined(MAGICKCORE_OPENMP_SUPPORT) + #pragma omp parallel for schedule(dynamic,4) shared(progress,status) #endif for (y=0; y < (long) image->rows; y++) { @@ -453,7 +453,7 @@ MagickExport MagickBooleanType BilevelImageChannel(Image *image, MagickBooleanType proceed; -#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp critical (MagickCore_BilevelImageChannel) #endif proceed=SetImageProgress(image,ThresholdImageTag,progress++, @@ -571,8 +571,8 @@ MagickExport MagickBooleanType BlackThresholdImageChannel(Image *image, status=MagickTrue; progress=0; image_view=AcquireCacheView(image); -#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) - #pragma omp parallel for shared(progress,status) +#if defined(MAGICKCORE_OPENMP_SUPPORT) + #pragma omp parallel for schedule(dynamic,4) shared(progress,status) #endif for (y=0; y < (long) image->rows; y++) { @@ -636,7 +636,7 @@ MagickExport MagickBooleanType BlackThresholdImageChannel(Image *image, MagickBooleanType proceed; -#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp critical (MagickCore_BlackThresholdImageChannel) #endif proceed=SetImageProgress(image,ThresholdImageTag,progress++, @@ -746,8 +746,8 @@ MagickExport MagickBooleanType ClampImageChannel(Image *image, progress=0; exception=(&image->exception); image_view=AcquireCacheView(image); -#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) - #pragma omp parallel for shared(progress,status) +#if defined(MAGICKCORE_OPENMP_SUPPORT) + #pragma omp parallel for schedule(dynamic,4) shared(progress,status) #endif for (y=0; y < (long) image->rows; y++) { @@ -791,7 +791,7 @@ MagickExport MagickBooleanType ClampImageChannel(Image *image, MagickBooleanType proceed; -#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp critical (MagickCore_ClampImageChannel) #endif proceed=SetImageProgress(image,ClampImageTag,progress++, @@ -1476,8 +1476,8 @@ printf("DEBUG levels r=%ld g=%ld b=%ld a=%ld i=%ld\n", status=MagickTrue; progress=0; image_view=AcquireCacheView(image); -#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) - #pragma omp parallel for shared(progress,status) +#if defined(MAGICKCORE_OPENMP_SUPPORT) + #pragma omp parallel for schedule(dynamic,4) shared(progress,status) #endif for (y=0; y < (long) image->rows; y++) { @@ -1559,7 +1559,7 @@ printf("DEBUG levels r=%ld g=%ld b=%ld a=%ld i=%ld\n", MagickBooleanType proceed; -#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp critical (MagickCore_OrderedPosterizeImageChannel) #endif proceed=SetImageProgress(image,DitherImageTag,progress++,image->rows); @@ -1695,8 +1695,8 @@ MagickExport MagickBooleanType RandomThresholdImageChannel(Image *image, image->filename); random_info=AcquireRandomInfoThreadSet(); image_view=AcquireCacheView(image); -#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) - #pragma omp parallel for shared(progress,status) +#if defined(MAGICKCORE_OPENMP_SUPPORT) + #pragma omp parallel for schedule(dynamic,4) shared(progress,status) #endif for (y=0; y < (long) image->rows; y++) { @@ -1752,7 +1752,7 @@ MagickExport MagickBooleanType RandomThresholdImageChannel(Image *image, MagickBooleanType proceed; -#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp critical (MagickCore_RandomThresholdImageChannel) #endif proceed=SetImageProgress(image,ThresholdImageTag,progress++, @@ -1772,8 +1772,8 @@ MagickExport MagickBooleanType RandomThresholdImageChannel(Image *image, } random_info=AcquireRandomInfoThreadSet(); image_view=AcquireCacheView(image); -#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) - #pragma omp parallel for shared(progress,status) +#if defined(MAGICKCORE_OPENMP_SUPPORT) + #pragma omp parallel for schedule(dynamic,4) shared(progress,status) #endif for (y=0; y < (long) image->rows; y++) { @@ -1880,7 +1880,7 @@ MagickExport MagickBooleanType RandomThresholdImageChannel(Image *image, MagickBooleanType proceed; -#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp critical (MagickCore_RandomThresholdImageChannel) #endif proceed=SetImageProgress(image,ThresholdImageTag,progress++, @@ -1999,8 +1999,8 @@ MagickExport MagickBooleanType WhiteThresholdImageChannel(Image *image, status=MagickTrue; progress=0; image_view=AcquireCacheView(image); -#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) - #pragma omp parallel for shared(progress,status) +#if defined(MAGICKCORE_OPENMP_SUPPORT) + #pragma omp parallel for schedule(dynamic,4) shared(progress,status) #endif for (y=0; y < (long) image->rows; y++) { @@ -2049,7 +2049,7 @@ MagickExport MagickBooleanType WhiteThresholdImageChannel(Image *image, MagickBooleanType proceed; -#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp critical (MagickCore_WhiteThresholdImageChannel) #endif proceed=SetImageProgress(image,ThresholdImageTag,progress++, diff --git a/magick/transform.c b/magick/transform.c index 678d9e0a3..0df324c02 100644 --- a/magick/transform.c +++ b/magick/transform.c @@ -585,8 +585,8 @@ MagickExport Image *CropImage(const Image *image,const RectangleInfo *geometry, progress=0; image_view=AcquireCacheView(image); crop_view=AcquireCacheView(crop_image); -#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) - #pragma omp parallel for shared(progress,status) +#if defined(MAGICKCORE_OPENMP_SUPPORT) + #pragma omp parallel for schedule(dynamic,4) shared(progress,status) #endif for (y=0; y < (long) crop_image->rows; y++) { @@ -629,7 +629,7 @@ MagickExport Image *CropImage(const Image *image,const RectangleInfo *geometry, MagickBooleanType proceed; -#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp critical (MagickCore_CropImage) #endif proceed=SetImageProgress(image,CropImageTag,progress++,image->rows); @@ -713,8 +713,8 @@ MagickExport Image *ExcerptImage(const Image *image, progress=0; image_view=AcquireCacheView(image); excerpt_view=AcquireCacheView(excerpt_image); -#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) - #pragma omp parallel for shared(progress,status) +#if defined(MAGICKCORE_OPENMP_SUPPORT) + #pragma omp parallel for schedule(dynamic,4) shared(progress,status) #endif for (y=0; y < (long) excerpt_image->rows; y++) { @@ -755,7 +755,7 @@ MagickExport Image *ExcerptImage(const Image *image, MagickBooleanType proceed; -#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp critical (MagickCore_ExcerptImage) #endif proceed=SetImageProgress(image,ExcerptImageTag,progress++,image->rows); @@ -894,8 +894,8 @@ MagickExport Image *FlipImage(const Image *image,ExceptionInfo *exception) progress=0; image_view=AcquireCacheView(image); flip_view=AcquireCacheView(flip_image); -#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) - #pragma omp parallel for shared(progress,status) +#if defined(MAGICKCORE_OPENMP_SUPPORT) + #pragma omp parallel for schedule(dynamic,4) shared(progress,status) #endif for (y=0; y < (long) flip_image->rows; y++) { @@ -937,7 +937,7 @@ MagickExport Image *FlipImage(const Image *image,ExceptionInfo *exception) MagickBooleanType proceed; -#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp critical (MagickCore_FlipImage) #endif proceed=SetImageProgress(image,FlipImageTag,progress++,image->rows); @@ -1012,8 +1012,8 @@ MagickExport Image *FlopImage(const Image *image,ExceptionInfo *exception) progress=0; image_view=AcquireCacheView(image); flop_view=AcquireCacheView(flop_image); -#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) - #pragma omp parallel for shared(progress,status) +#if defined(MAGICKCORE_OPENMP_SUPPORT) + #pragma omp parallel for schedule(dynamic,4) shared(progress,status) #endif for (y=0; y < (long) flop_image->rows; y++) { @@ -1059,7 +1059,7 @@ MagickExport Image *FlopImage(const Image *image,ExceptionInfo *exception) MagickBooleanType proceed; -#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp critical (MagickCore_FlopImage) #endif proceed=SetImageProgress(image,FlopImageTag,progress++,image->rows); @@ -1123,8 +1123,8 @@ static inline MagickBooleanType CopyImageRegion(Image *destination, status=MagickTrue; source_view=AcquireCacheView(source); destination_view=AcquireCacheView(destination); -#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) - #pragma omp parallel for shared(status) +#if defined(MAGICKCORE_OPENMP_SUPPORT) + #pragma omp parallel for schedule(dynamic,4) shared(status) #endif for (y=0; y < (long) rows; y++) { @@ -1438,8 +1438,8 @@ MagickExport Image *SpliceImage(const Image *image, progress=0; image_view=AcquireCacheView(image); splice_view=AcquireCacheView(splice_image); -#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) - #pragma omp parallel for shared(progress,status) +#if defined(MAGICKCORE_OPENMP_SUPPORT) + #pragma omp parallel for schedule(dynamic,4) shared(progress,status) #endif for (y=0; y < (long) splice_geometry.y; y++) { @@ -1504,7 +1504,7 @@ MagickExport Image *SpliceImage(const Image *image, MagickBooleanType proceed; -#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp critical (MagickCore_TransposeImage) #endif proceed=SetImageProgress(image,SpliceImageTag,progress++, @@ -1513,8 +1513,8 @@ MagickExport Image *SpliceImage(const Image *image, status=MagickFalse; } } -#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) - #pragma omp parallel for shared(progress,status) +#if defined(MAGICKCORE_OPENMP_SUPPORT) + #pragma omp parallel for schedule(dynamic,4) shared(progress,status) #endif for (y=(long) (splice_geometry.y+splice_geometry.height); y < (long) splice_image->rows; y++) @@ -1580,7 +1580,7 @@ MagickExport Image *SpliceImage(const Image *image, MagickBooleanType proceed; -#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp critical (MagickCore_TransposeImage) #endif proceed=SetImageProgress(image,SpliceImageTag,progress++, @@ -1875,8 +1875,8 @@ MagickExport Image *TransposeImage(const Image *image,ExceptionInfo *exception) progress=0; image_view=AcquireCacheView(image); transpose_view=AcquireCacheView(transpose_image); -#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) - #pragma omp parallel for shared(progress,status) +#if defined(MAGICKCORE_OPENMP_SUPPORT) + #pragma omp parallel for schedule(dynamic,4) shared(progress,status) #endif for (y=0; y < (long) image->rows; y++) { @@ -1917,7 +1917,7 @@ MagickExport Image *TransposeImage(const Image *image,ExceptionInfo *exception) MagickBooleanType proceed; -#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp critical (MagickCore_TransposeImage) #endif proceed=SetImageProgress(image,TransposeImageTag,progress++, @@ -2003,8 +2003,8 @@ MagickExport Image *TransverseImage(const Image *image,ExceptionInfo *exception) progress=0; image_view=AcquireCacheView(image); transverse_view=AcquireCacheView(transverse_image); -#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) - #pragma omp parallel for shared(progress,status) +#if defined(MAGICKCORE_OPENMP_SUPPORT) + #pragma omp parallel for schedule(dynamic,4) shared(progress,status) #endif for (y=0; y < (long) image->rows; y++) { @@ -2053,7 +2053,7 @@ MagickExport Image *TransverseImage(const Image *image,ExceptionInfo *exception) MagickBooleanType proceed; -#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp critical (MagickCore_TransverseImage) #endif proceed=SetImageProgress(image,TransverseImageTag,progress++, diff --git a/wand/mogrify.c b/wand/mogrify.c index b26217fb6..2c00be0a7 100644 --- a/wand/mogrify.c +++ b/wand/mogrify.c @@ -177,7 +177,7 @@ WandExport MagickBooleanType MagickCommandGenesis(ImageInfo *image_info, else { SetOpenMPNested(1); -#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) # pragma omp parallel for shared(status) #endif for (i=0; i < (long) iterations; i++) @@ -191,7 +191,7 @@ WandExport MagickBooleanType MagickCommandGenesis(ImageInfo *image_info, (void) ContinueTimer(timer); } status=command(image_info,argc,argv,metadata,exception); -#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) # pragma omp critical (MagickCore_Launch_Command) #endif { diff --git a/wand/pixel-view.c b/wand/pixel-view.c index 7b752d07f..4bae31de6 100644 --- a/wand/pixel-view.c +++ b/wand/pixel-view.c @@ -284,8 +284,8 @@ WandExport MagickBooleanType DuplexTransferPixelViewIterator( status=MagickTrue; progress=0; exception=destination->exception; -#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) - #pragma omp parallel for shared(progress,status) +#if defined(MAGICKCORE_OPENMP_SUPPORT) + #pragma omp parallel for schedule(dynamic,4) shared(progress,status) #endif for (y=source->region.y; y < (long) source->region.height; y++) { @@ -384,7 +384,7 @@ WandExport MagickBooleanType DuplexTransferPixelViewIterator( MagickBooleanType proceed; -#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp critical (MagickWand_DuplexTransferPixelViewIterator) #endif proceed=SetImageProgress(source_image,DuplexTransferPixelViewTag, @@ -544,8 +544,8 @@ WandExport MagickBooleanType GetPixelViewIterator(PixelView *source, source_image=source->wand->images; status=MagickTrue; progress=0; -#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) - #pragma omp parallel for shared(progress,status) +#if defined(MAGICKCORE_OPENMP_SUPPORT) + #pragma omp parallel for schedule(dynamic,4) shared(progress,status) #endif for (y=source->region.y; y < (long) source->region.height; y++) { @@ -585,7 +585,7 @@ WandExport MagickBooleanType GetPixelViewIterator(PixelView *source, MagickBooleanType proceed; -#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp critical (MagickWand_GetPixelViewIterator) #endif proceed=SetImageProgress(source_image,GetPixelViewTag,progress++, @@ -990,8 +990,8 @@ WandExport MagickBooleanType SetPixelViewIterator(PixelView *destination, status=MagickTrue; progress=0; exception=destination->exception; -#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) - #pragma omp parallel for shared(progress,status) +#if defined(MAGICKCORE_OPENMP_SUPPORT) + #pragma omp parallel for schedule(dynamic,4) shared(progress,status) #endif for (y=destination->region.y; y < (long) destination->region.height; y++) { @@ -1040,7 +1040,7 @@ WandExport MagickBooleanType SetPixelViewIterator(PixelView *destination, MagickBooleanType proceed; -#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp critical (MagickWand_SetPixelViewIterator) #endif proceed=SetImageProgress(destination_image,SetPixelViewTag,progress++, @@ -1124,8 +1124,8 @@ WandExport MagickBooleanType TransferPixelViewIterator(PixelView *source, status=MagickTrue; progress=0; exception=destination->exception; -#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) - #pragma omp parallel for shared(progress,status) +#if defined(MAGICKCORE_OPENMP_SUPPORT) + #pragma omp parallel for schedule(dynamic,4) shared(progress,status) #endif for (y=source->region.y; y < (long) source->region.height; y++) { @@ -1204,7 +1204,7 @@ WandExport MagickBooleanType TransferPixelViewIterator(PixelView *source, MagickBooleanType proceed; -#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp critical (MagickWand_TransferPixelViewIterator) #endif proceed=SetImageProgress(source_image,TransferPixelViewTag,progress++, @@ -1282,8 +1282,8 @@ WandExport MagickBooleanType UpdatePixelViewIterator(PixelView *source, status=MagickTrue; progress=0; exception=source->exception; -#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) - #pragma omp parallel for shared(progress,status) +#if defined(MAGICKCORE_OPENMP_SUPPORT) + #pragma omp parallel for schedule(dynamic,4) shared(progress,status) #endif for (y=source->region.y; y < (long) source->region.height; y++) { @@ -1332,7 +1332,7 @@ WandExport MagickBooleanType UpdatePixelViewIterator(PixelView *source, MagickBooleanType proceed; -#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) #pragma omp critical (MagickWand_UpdatePixelViewIterator) #endif proceed=SetImageProgress(source_image,UpdatePixelViewTag,progress++,