From b28d64742e55a8b565085faf37e9aead51f89a83 Mon Sep 17 00:00:00 2001 From: cristy Date: Sat, 17 Oct 2009 20:13:35 +0000 Subject: [PATCH] --- coders/dpx.c | 4 +- coders/hald.c | 2 +- coders/pnm.c | 20 +++++----- magick/attribute.c | 14 +++---- magick/colormap.c | 6 +-- magick/colorspace.c | 78 +++++++++++++++++++------------------- magick/compare.c | 28 +++++++------- magick/composite.c | 16 ++++---- magick/decorate.c | 12 +++--- magick/deprecate.c | 4 +- magick/distort.c | 8 ++-- magick/draw-private.h | 4 +- magick/draw.c | 8 ++-- magick/effect.c | 52 ++++++++++++------------- magick/enhance.c | 84 ++++++++++++++++++++--------------------- magick/fourier.c | 8 ++-- magick/fx.c | 64 +++++++++++++++---------------- magick/image.c | 18 ++++----- magick/paint.c | 16 ++++---- magick/prepress.c | 4 +- magick/profile.c | 4 +- magick/quantize.c | 6 +-- magick/resize.c | 12 +++--- magick/segment.c | 6 +-- magick/shear.c | 24 ++++++------ magick/statistic.c | 4 +- magick/studio.h | 1 + magick/thread-private.h | 6 +-- magick/threshold.c | 32 ++++++++-------- magick/transform.c | 34 ++++++++--------- magick/version.c | 25 ++++++++++++ magick/version.h | 25 +++++++----- magick/version.h.in | 24 +++++++----- tests/validate.c | 1 + wand/animate.c | 1 + wand/compare.c | 1 + wand/composite.c | 1 + wand/conjure.c | 1 + wand/convert.c | 1 + wand/display.c | 1 + wand/identify.c | 1 + wand/import.c | 1 + wand/mogrify.c | 1 + wand/montage.c | 1 + wand/pixel-view.c | 20 +++++----- wand/stream.c | 1 + wand/studio.h | 1 + 47 files changed, 369 insertions(+), 317 deletions(-) diff --git a/coders/dpx.c b/coders/dpx.c index f6b5d2d11..cc18c0271 100644 --- a/coders/dpx.c +++ b/coders/dpx.c @@ -1154,7 +1154,7 @@ static Image *ReadDPXImage(const ImageInfo *image_info,ExceptionInfo *exception) SetQuantumPack(quantum_info,dpx.image.image_element[0].packing == 0 ? MagickTrue : MagickFalse); image_view=AcquireCacheView(image); -#if defined(_OPENMP) && (_OPENMP > 200505) +#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP > 200505) #pragma omp parallel for shared(row,status,quantum_type) #endif for (y=0; y < (long) image->rows; y++) @@ -1180,7 +1180,7 @@ static Image *ReadDPXImage(const ImageInfo *image_info,ExceptionInfo *exception) if (status == MagickFalse) continue; pixels=GetQuantumPixels(quantum_info); -#if defined(_OPENMP) && (_OPENMP > 200505) +#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP > 200505) #pragma omp critical (MagickCore_ReadDPXImage) #endif { diff --git a/coders/hald.c b/coders/hald.c index 09005bee8..95a028a40 100644 --- a/coders/hald.c +++ b/coders/hald.c @@ -125,7 +125,7 @@ static Image *ReadHALDImage(const ImageInfo *image_info, image->columns=(unsigned long) (level*cube_size); image->rows=(unsigned long) (level*cube_size); image_view=AcquireCacheView(image); -#if defined(_OPENMP) && (_OPENMP > 200505) +#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP > 200505) #pragma omp parallel for shared(status) #endif for (y=0; y < (long) image->rows; y+=(long) level) diff --git a/coders/pnm.c b/coders/pnm.c index 2c0471f35..107320d56 100644 --- a/coders/pnm.c +++ b/coders/pnm.c @@ -593,7 +593,7 @@ static Image *ReadPNMImage(const ImageInfo *image_info,ExceptionInfo *exception) SetQuantumMinIsWhite(quantum_info,MagickTrue); extent=GetQuantumExtent(image,quantum_info,quantum_type); image_view=AcquireCacheView(image); -#if defined(_OPENMP) && (_OPENMP > 200505) +#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP > 200505) #pragma omp parallel for shared(row,status,quantum_type) #endif for (y=0; y < (long) image->rows; y++) @@ -619,7 +619,7 @@ static Image *ReadPNMImage(const ImageInfo *image_info,ExceptionInfo *exception) if (status == MagickFalse) continue; pixels=GetQuantumPixels(quantum_info); -#if defined(_OPENMP) && (_OPENMP > 200505) +#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP > 200505) #pragma omp critical (MagickCore_ReadPNMImage) #endif { @@ -675,7 +675,7 @@ static Image *ReadPNMImage(const ImageInfo *image_info,ExceptionInfo *exception) if (quantum_info == (QuantumInfo *) NULL) ThrowReaderException(ResourceLimitError,"MemoryAllocationFailed"); image_view=AcquireCacheView(image); -#if defined(_OPENMP) && (_OPENMP > 200505) +#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP > 200505) #pragma omp parallel for shared(row,status,quantum_type) #endif for (y=0; y < (long) image->rows; y++) @@ -704,7 +704,7 @@ static Image *ReadPNMImage(const ImageInfo *image_info,ExceptionInfo *exception) if (status == MagickFalse) continue; pixels=GetQuantumPixels(quantum_info); -#if defined(_OPENMP) && (_OPENMP > 200505) +#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP > 200505) #pragma omp critical (MagickCore_ReadPNMImage) #endif { @@ -793,7 +793,7 @@ static Image *ReadPNMImage(const ImageInfo *image_info,ExceptionInfo *exception) if (quantum_info == (QuantumInfo *) NULL) ThrowReaderException(ResourceLimitError,"MemoryAllocationFailed"); image_view=AcquireCacheView(image); -#if defined(_OPENMP) && (_OPENMP > 200505) +#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP > 200505) #pragma omp parallel for shared(row,status,type) #endif for (y=0; y < (long) image->rows; y++) @@ -825,7 +825,7 @@ static Image *ReadPNMImage(const ImageInfo *image_info,ExceptionInfo *exception) if (status == MagickFalse) continue; pixels=GetQuantumPixels(quantum_info); -#if defined(_OPENMP) && (_OPENMP > 200505) +#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP > 200505) #pragma omp critical (MagickCore_ReadPNMImage) #endif { @@ -967,7 +967,7 @@ static Image *ReadPNMImage(const ImageInfo *image_info,ExceptionInfo *exception) if (quantum_info == (QuantumInfo *) NULL) ThrowReaderException(ResourceLimitError,"MemoryAllocationFailed"); image_view=AcquireCacheView(image); -#if defined(_OPENMP) && (_OPENMP > 200505) +#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP > 200505) #pragma omp parallel for shared(row,status,quantum_type) #endif for (y=0; y < (long) image->rows; y++) @@ -996,7 +996,7 @@ static Image *ReadPNMImage(const ImageInfo *image_info,ExceptionInfo *exception) if (status == MagickFalse) continue; pixels=GetQuantumPixels(quantum_info); -#if defined(_OPENMP) && (_OPENMP > 200505) +#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP > 200505) #pragma omp critical (MagickCore_ReadPNMImage) #endif { @@ -1210,7 +1210,7 @@ static Image *ReadPNMImage(const ImageInfo *image_info,ExceptionInfo *exception) fabs(quantum_scale)); extent=GetQuantumExtent(image,quantum_info,quantum_type); image_view=AcquireCacheView(image); -#if defined(_OPENMP) && (_OPENMP > 200505) +#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP > 200505) #pragma omp parallel for shared(row,status,quantum_type) #endif for (y=0; y < (long) image->rows; y++) @@ -1236,7 +1236,7 @@ static Image *ReadPNMImage(const ImageInfo *image_info,ExceptionInfo *exception) if (status == MagickFalse) continue; pixels=GetQuantumPixels(quantum_info); -#if defined(_OPENMP) && (_OPENMP > 200505) +#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP > 200505) #pragma omp critical (MagickCore_ReadPNMImage) #endif { diff --git a/magick/attribute.c b/magick/attribute.c index 71bce60b2..7fa5b4907 100644 --- a/magick/attribute.c +++ b/magick/attribute.c @@ -168,7 +168,7 @@ MagickExport RectangleInfo GetImageBoundingBox(const Image *image, &target[2]); status=MagickTrue; GetMagickPixelPacket(image,&zero); -#if defined(_OPENMP) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) #pragma omp parallel for 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(HAVE_OPENMP) +#if defined(HAVEMAGICKCORE_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(HAVE_OPENMP) +#if defined(HAVEMAGICKCORE_OPENMP_SUPPORT) # pragma omp critical (MagickCore_GetImageBoundingBox) #endif { @@ -324,7 +324,7 @@ MagickExport unsigned long GetImageChannelDepth(const Image *image, i; p=image->colormap; -#if defined(_OPENMP) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) #pragma omp parallel for shared(status) #endif for (i=0; i < (long) image->colors; i++) @@ -365,7 +365,7 @@ MagickExport unsigned long GetImageChannelDepth(const Image *image, return(depth); } image_view=AcquireCacheView(image); -#if defined(_OPENMP) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) #pragma omp parallel for shared(status) #endif for (y=0; y < (long) image->rows; y++) @@ -910,7 +910,7 @@ MagickExport MagickBooleanType SetImageChannelDepth(Image *image, range=GetQuantumRange(depth); exception=(&image->exception); image_view=AcquireCacheView(image); -#if defined(_OPENMP) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) #pragma omp parallel for shared(status) #endif for (y=0; y < (long) image->rows; y++) @@ -969,7 +969,7 @@ MagickExport MagickBooleanType SetImageChannelDepth(Image *image, p=image->colormap; range=GetQuantumRange(depth); -#if defined(_OPENMP) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) #pragma omp parallel for shared(status) #endif for (i=0; i < (long) image->colors; i++) diff --git a/magick/colormap.c b/magick/colormap.c index 989c9dea7..856e1a7ce 100644 --- a/magick/colormap.c +++ b/magick/colormap.c @@ -118,7 +118,7 @@ MagickExport MagickBooleanType CycleColormapImage(Image *image, status=MagickTrue; exception=(&image->exception); image_view=AcquireCacheView(image); -#if defined(_OPENMP) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) #pragma omp parallel for shared(status) #endif for (y=0; y < (long) image->rows; y++) @@ -247,7 +247,7 @@ MagickExport MagickBooleanType SortColormapByIntensity(Image *image) /* Assign index values to colormap entries. */ -#if defined(_OPENMP) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) #pragma omp parallel for shared(status) #endif for (i=0; i < (long) image->colors; i++) @@ -260,7 +260,7 @@ MagickExport MagickBooleanType SortColormapByIntensity(Image *image) /* Update image colormap indexes to sorted colormap order. */ -#if defined(_OPENMP) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) #pragma omp parallel for shared(status) #endif for (i=0; i < (long) image->colors; i++) diff --git a/magick/colorspace.c b/magick/colorspace.c index f85f4c152..5f5d73418 100644 --- a/magick/colorspace.c +++ b/magick/colorspace.c @@ -223,7 +223,7 @@ MagickExport MagickBooleanType RGBTransformImage(Image *image, return(MagickFalse); } image_view=AcquireCacheView(image); -#if defined(_OPENMP) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) #pragma omp parallel for shared(status) #endif for (y=0; y < (long) image->rows; y++) @@ -276,7 +276,7 @@ MagickExport MagickBooleanType RGBTransformImage(Image *image, } GetMagickPixelPacket(image,&zero); image_view=AcquireCacheView(image); -#if defined(_OPENMP) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) #pragma omp parallel for shared(status) #endif for (y=0; y < (long) image->rows; y++) @@ -333,7 +333,7 @@ MagickExport MagickBooleanType RGBTransformImage(Image *image, return(MagickFalse); } image_view=AcquireCacheView(image); -#if defined(_OPENMP) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) #pragma omp parallel for shared(status) #endif for (y=0; y < (long) image->rows; y++) @@ -389,7 +389,7 @@ MagickExport MagickBooleanType RGBTransformImage(Image *image, return(MagickFalse); } image_view=AcquireCacheView(image); -#if defined(_OPENMP) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) #pragma omp parallel for shared(status) #endif for (y=0; y < (long) image->rows; y++) @@ -445,7 +445,7 @@ MagickExport MagickBooleanType RGBTransformImage(Image *image, return(MagickFalse); } image_view=AcquireCacheView(image); -#if defined(_OPENMP) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) #pragma omp parallel for shared(status) #endif for (y=0; y < (long) image->rows; y++) @@ -501,7 +501,7 @@ MagickExport MagickBooleanType RGBTransformImage(Image *image, return(MagickFalse); } image_view=AcquireCacheView(image); -#if defined(_OPENMP) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) #pragma omp parallel for shared(status) #endif for (y=0; y < (long) image->rows; y++) @@ -593,7 +593,7 @@ MagickExport MagickBooleanType RGBTransformImage(Image *image, image->filename); black=pow(10.0,(reference_black-reference_white)*(gamma/density)* 0.002/0.6); -#if defined(_OPENMP) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) #pragma omp parallel for #endif for (i=0; i <= (long) MaxMap; i++) @@ -601,7 +601,7 @@ MagickExport MagickBooleanType RGBTransformImage(Image *image, log10(black+((MagickRealType) i/MaxMap)*(1.0-black))/((gamma/density)* 0.002/0.6))/1024.0+0.5)); image_view=AcquireCacheView(image); -#if defined(_OPENMP) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) #pragma omp parallel for shared(status) #endif for (y=0; y < (long) image->rows; y++) @@ -670,7 +670,7 @@ MagickExport MagickBooleanType RGBTransformImage(Image *image, */ primary_info.y=(double) (MaxMap+1.0)/2.0; primary_info.z=(double) (MaxMap+1.0)/2.0; -#if defined(_OPENMP) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) #pragma omp parallel for #endif for (i=0; i <= (long) MaxMap; i++) @@ -695,7 +695,7 @@ MagickExport MagickBooleanType RGBTransformImage(Image *image, G = 0.29900*R+0.58700*G+0.11400*B */ -#if defined(_OPENMP) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) #pragma omp parallel for #endif for (i=0; i <= (long) MaxMap; i++) @@ -728,7 +728,7 @@ MagickExport MagickBooleanType RGBTransformImage(Image *image, */ primary_info.y=(double) (MaxMap+1.0)/2.0; primary_info.z=(double) (MaxMap+1.0)/2.0; -#if defined(_OPENMP) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) #pragma omp parallel for #endif for (i=0; i <= (long) MaxMap; i++) @@ -752,7 +752,7 @@ MagickExport MagickBooleanType RGBTransformImage(Image *image, G = 0.21260*R+0.71520*G+0.07220*B */ -#if defined(_OPENMP) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) #pragma omp parallel for #endif for (i=0; i <= (long) MaxMap; i++) @@ -783,7 +783,7 @@ MagickExport MagickBooleanType RGBTransformImage(Image *image, */ primary_info.y=(double) (MaxMap+1.0)/2.0; primary_info.z=(double) (MaxMap+1.0)/2.0; -#if defined(_OPENMP) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) #pragma omp parallel for #endif for (i=0; i <= (long) MaxMap; i++) @@ -809,7 +809,7 @@ 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(_OPENMP) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) #pragma omp parallel for #endif for (i=0; i <= (long) MaxMap; i++) @@ -843,7 +843,7 @@ 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(_OPENMP) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) #pragma omp parallel for #endif for (i=0; i <= (long) MaxMap; i++) @@ -913,7 +913,7 @@ MagickExport MagickBooleanType RGBTransformImage(Image *image, */ primary_info.y=(double) (MaxMap+1.0)/2.0; primary_info.z=(double) (MaxMap+1.0)/2.0; -#if defined(_OPENMP) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) #pragma omp parallel for #endif for (i=0; i <= (long) MaxMap; i++) @@ -944,7 +944,7 @@ MagickExport MagickBooleanType RGBTransformImage(Image *image, */ primary_info.y=(double) (MaxMap+1.0)/2.0; primary_info.z=(double) (MaxMap+1.0)/2.0; -#if defined(_OPENMP) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) #pragma omp parallel for #endif for (i=0; i <= (long) MaxMap; i++) @@ -976,7 +976,7 @@ MagickExport MagickBooleanType RGBTransformImage(Image *image, */ primary_info.y=(double) (MaxMap+1.0)/2.0; primary_info.z=(double) (MaxMap+1.0)/2.0; -#if defined(_OPENMP) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) #pragma omp parallel for #endif for (i=0; i <= (long) MaxMap; i++) @@ -1006,7 +1006,7 @@ MagickExport MagickBooleanType RGBTransformImage(Image *image, Convert DirectClass image. */ image_view=AcquireCacheView(image); -#if defined(_OPENMP) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) #pragma omp parallel for shared(status) #endif for (y=0; y < (long) image->rows; y++) @@ -1058,7 +1058,7 @@ MagickExport MagickBooleanType RGBTransformImage(Image *image, MagickBooleanType proceed; -#if defined(_OPENMP) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) #pragma omp critical (MagickCore_RGBTransformImage) #endif proceed=SetImageProgress(image,RGBTransformImageTag,progress++, @@ -1419,7 +1419,7 @@ MagickExport MagickBooleanType TransformRGBImage(Image *image, return(MagickFalse); } image_view=AcquireCacheView(image); -#if defined(_OPENMP) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) #pragma omp parallel for shared(status) #endif for (y=0; y < (long) image->rows; y++) @@ -1475,7 +1475,7 @@ MagickExport MagickBooleanType TransformRGBImage(Image *image, } GetMagickPixelPacket(image,&zero); image_view=AcquireCacheView(image); -#if defined(_OPENMP) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) #pragma omp parallel for shared(status) #endif for (y=0; y < (long) image->rows; y++) @@ -1535,7 +1535,7 @@ MagickExport MagickBooleanType TransformRGBImage(Image *image, return(MagickFalse); } image_view=AcquireCacheView(image); -#if defined(_OPENMP) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) #pragma omp parallel for shared(status) #endif for (y=0; y < (long) image->rows; y++) @@ -1593,7 +1593,7 @@ MagickExport MagickBooleanType TransformRGBImage(Image *image, return(MagickFalse); } image_view=AcquireCacheView(image); -#if defined(_OPENMP) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) #pragma omp parallel for shared(status) #endif for (y=0; y < (long) image->rows; y++) @@ -1651,7 +1651,7 @@ MagickExport MagickBooleanType TransformRGBImage(Image *image, return(MagickFalse); } image_view=AcquireCacheView(image); -#if defined(_OPENMP) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) #pragma omp parallel for shared(status) #endif for (y=0; y < (long) image->rows; y++) @@ -1709,7 +1709,7 @@ MagickExport MagickBooleanType TransformRGBImage(Image *image, return(MagickFalse); } image_view=AcquireCacheView(image); -#if defined(_OPENMP) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) #pragma omp parallel for shared(status) #endif for (y=0; y < (long) image->rows; y++) @@ -1810,7 +1810,7 @@ MagickExport MagickBooleanType TransformRGBImage(Image *image, if (SetImageStorageClass(image,DirectClass) == MagickFalse) return(MagickFalse); image_view=AcquireCacheView(image); -#if defined(_OPENMP) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) #pragma omp parallel for shared(status) #endif for (y=0; y < (long) image->rows; y++) @@ -1889,7 +1889,7 @@ 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(_OPENMP) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) #pragma omp parallel for #endif for (i=0; i <= (long) MaxMap; i++) @@ -1924,7 +1924,7 @@ 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(_OPENMP) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) #pragma omp parallel for #endif for (i=0; i <= (long) MaxMap; i++) @@ -1957,7 +1957,7 @@ 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(_OPENMP) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) #pragma omp parallel for #endif for (i=0; i <= (long) MaxMap; i++) @@ -1987,7 +1987,7 @@ 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(_OPENMP) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) #pragma omp parallel for #endif for (i=0; i <= (long) MaxMap; i++) @@ -2013,7 +2013,7 @@ 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(_OPENMP) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) #pragma omp parallel for #endif for (i=0; i <= (long) MaxMap; i++) @@ -2041,7 +2041,7 @@ MagickExport MagickBooleanType TransformRGBImage(Image *image, YCC is scaled by 1.3584. C1 zero is 156 and C2 is at 137. */ -#if defined(_OPENMP) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) #pragma omp parallel for #endif for (i=0; i <= (long) MaxMap; i++) @@ -2074,7 +2074,7 @@ 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(_OPENMP) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) #pragma omp parallel for #endif for (i=0; i <= (long) MaxMap; i++) @@ -2109,7 +2109,7 @@ 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(_OPENMP) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) #pragma omp parallel for #endif for (i=0; i <= (long) MaxMap; i++) @@ -2143,7 +2143,7 @@ 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(_OPENMP) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) #pragma omp parallel for #endif for (i=0; i <= (long) MaxMap; i++) @@ -2177,7 +2177,7 @@ MagickExport MagickBooleanType TransformRGBImage(Image *image, Convert DirectClass image. */ image_view=AcquireCacheView(image); -#if defined(_OPENMP) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) #pragma omp parallel for shared(status) #endif for (y=0; y < (long) image->rows; y++) @@ -2268,7 +2268,7 @@ MagickExport MagickBooleanType TransformRGBImage(Image *image, MagickBooleanType proceed; -#if defined(_OPENMP) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) #pragma omp critical (MagickCore_TransformRGBImage) #endif proceed=SetImageProgress(image,TransformRGBImageTag,progress++, @@ -2286,7 +2286,7 @@ MagickExport MagickBooleanType TransformRGBImage(Image *image, Convert PseudoClass image. */ image_view=AcquireCacheView(image); -#if defined(_OPENMP) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) #pragma omp parallel for shared(status) #endif for (i=0; i < (long) image->colors; i++) diff --git a/magick/compare.c b/magick/compare.c index e28f3f858..aa9e8fa9b 100644 --- a/magick/compare.c +++ b/magick/compare.c @@ -197,7 +197,7 @@ MagickExport Image *CompareImageChannels(Image *image, image_view=AcquireCacheView(image); reconstruct_view=AcquireCacheView(reconstruct_image); highlight_view=AcquireCacheView(highlight_image); -#if defined(_OPENMP) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) #pragma omp parallel for shared(status) #endif for (y=0; y < (long) image->rows; y++) @@ -369,7 +369,7 @@ static MagickBooleanType GetAbsoluteError(const Image *image, GetMagickPixelPacket(image,&zero); image_view=AcquireCacheView(image); reconstruct_view=AcquireCacheView(reconstruct_image); -#if defined(_OPENMP) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) #pragma omp parallel for 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(_OPENMP) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) #pragma omp critical (MagickCore_GetAbsoluteError) #endif for (i=0; i <= (long) AllChannels; i++) @@ -485,7 +485,7 @@ static MagickBooleanType GetMeanAbsoluteError(const Image *image, status=MagickTrue; image_view=AcquireCacheView(image); reconstruct_view=AcquireCacheView(reconstruct_image); -#if defined(_OPENMP) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) #pragma omp parallel for 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(_OPENMP) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) #pragma omp critical (MagickCore_GetMeanAbsoluteError) #endif for (i=0; i <= (long) AllChannels; i++) @@ -722,7 +722,7 @@ static MagickBooleanType GetMeanSquaredError(const Image *image, status=MagickTrue; image_view=AcquireCacheView(image); reconstruct_view=AcquireCacheView(reconstruct_image); -#if defined(_OPENMP) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) #pragma omp parallel for 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(_OPENMP) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) #pragma omp critical (MagickCore_GetMeanSquaredError) #endif for (i=0; i <= (long) AllChannels; i++) @@ -828,7 +828,7 @@ static MagickBooleanType GetPeakAbsoluteError(const Image *image, status=MagickTrue; image_view=AcquireCacheView(image); reconstruct_view=AcquireCacheView(reconstruct_image); -#if defined(_OPENMP) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) #pragma omp parallel for 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(_OPENMP) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) #pragma omp critical (MagickCore_GetPeakAbsoluteError) #endif for (i=0; i <= (long) AllChannels; i++) @@ -1404,7 +1404,7 @@ static double GetSimilarityMetric(const Image *image,const Image *reference, similarity=0.0; image_view=AcquireCacheView(image); reference_view=AcquireCacheView(reference); -#if defined(_OPENMP) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) #pragma omp parallel for 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(_OPENMP) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) #pragma omp critical (MagickCore_GetSimilarityMetric) #endif similarity+=thread_similarity; @@ -1523,7 +1523,7 @@ MagickExport Image *SimilarityImage(Image *image,const Image *reference, status=MagickTrue; progress=0; similarity_view=AcquireCacheView(similarity_image); -#if defined(_OPENMP) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) #pragma omp parallel for 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(_OPENMP) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) #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(_OPENMP) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) #pragma omp critical (MagickCore_SimilarityImage) #endif proceed=SetImageProgress(image,SimilarityImageTag,progress++, diff --git a/magick/composite.c b/magick/composite.c index 7891fdd67..05cf439b1 100644 --- a/magick/composite.c +++ b/magick/composite.c @@ -1368,7 +1368,7 @@ MagickExport MagickBooleanType CompositeImageChannel(Image *image, exception=(&image->exception); image_view=AcquireCacheView(image); composite_view=AcquireCacheView(composite_image); -#if defined(_OPENMP) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) #pragma omp parallel for 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(_OPENMP) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) #pragma omp critical (MagickCore_TextureImage) #endif proceed=SetImageProgress(image,CompositeImageTag,y,image->rows); @@ -1844,7 +1844,7 @@ MagickExport MagickBooleanType CompositeImageChannel(Image *image, exception=(&image->exception); image_view=AcquireCacheView(image); composite_view=AcquireCacheView(composite_image); -#if defined(_OPENMP) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) #pragma omp parallel for 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(_OPENMP) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) #pragma omp critical (MagickCore_CompositeImageChannel) #endif proceed=SetImageProgress(image,CompositeImageTag,progress++, @@ -2505,7 +2505,7 @@ MagickExport MagickBooleanType TextureImage(Image *image,const Image *texture) /* Tile texture onto the image background. */ -#if defined(_OPENMP) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) #pragma omp parallel for 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(_OPENMP) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) #pragma omp critical (MagickCore_TextureImage) #endif proceed=SetImageProgress(image,TextureImageTag,y,image->rows); @@ -2552,7 +2552,7 @@ MagickExport MagickBooleanType TextureImage(Image *image,const Image *texture) exception=(&image->exception); image_view=AcquireCacheView(image); texture_view=AcquireCacheView(texture); -#if defined(_OPENMP) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) #pragma omp parallel for 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(_OPENMP) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) #pragma omp critical (MagickCore_TextureImage) #endif proceed=SetImageProgress(image,TextureImageTag,y,image->rows); diff --git a/magick/decorate.c b/magick/decorate.c index faac3d460..5bd175286 100644 --- a/magick/decorate.c +++ b/magick/decorate.c @@ -399,7 +399,7 @@ MagickExport Image *FrameImage(const Image *image,const FrameInfo *frame_info, /* Draw sides of ornamental border. */ -#if defined(_OPENMP) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) #pragma omp parallel for 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(_OPENMP) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) #pragma omp critical (MagickCore_FrameImage) #endif proceed=SetImageProgress(image,FrameImageTag,progress++,image->rows); @@ -721,7 +721,7 @@ MagickExport MagickBooleanType RaiseImage(Image *image, progress=0; exception=(&image->exception); image_view=AcquireCacheView(image); -#if defined(_OPENMP) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) #pragma omp parallel for shared(progress,status) #endif for (y=0; y < (long) raise_info->height; y++) @@ -788,7 +788,7 @@ MagickExport MagickBooleanType RaiseImage(Image *image, status=MagickFalse; } } -#if defined(_OPENMP) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) #pragma omp parallel for shared(progress,status) #endif for (y=(long) raise_info->height; y < (long) (image->rows-raise_info->height); y++) @@ -844,7 +844,7 @@ MagickExport MagickBooleanType RaiseImage(Image *image, status=MagickFalse; } } -#if defined(_OPENMP) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) #pragma omp parallel for 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(_OPENMP) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) #pragma omp critical (MagickCore_RaiseImage) #endif proceed=SetImageProgress(image,RaiseImageTag,progress++,image->rows); diff --git a/magick/deprecate.c b/magick/deprecate.c index 7fbd58220..7134be45b 100644 --- a/magick/deprecate.c +++ b/magick/deprecate.c @@ -1708,7 +1708,7 @@ MagickExport Image *ExtractSubimageFromImage(Image *image, return((Image *) NULL); similarity_threshold=image->columns*image->rows; SetGeometry(reference,&offset); -#if defined(_OPENMP) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) #pragma omp parallel for #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(_OPENMP) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) #pragma omp critical (MagickCore_ExtractSubimageFromImage) #endif if (similarity < similarity_threshold) diff --git a/magick/distort.c b/magick/distort.c index f5cf5cdbb..c656b9320 100644 --- a/magick/distort.c +++ b/magick/distort.c @@ -1924,7 +1924,7 @@ 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(_OPENMP) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) #pragma omp parallel for 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(_OPENMP) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) #pragma omp critical (MagickCore_DistortImage) #endif proceed=SetImageProgress(image,DistortImageTag,progress++, @@ -2490,7 +2490,7 @@ MagickExport Image *SparseColorImage(const Image *image, progress=0; GetMagickPixelPacket(sparse_image,&zero); sparse_view=AcquireCacheView(sparse_image); -#if defined(_OPENMP) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) #pragma omp parallel for 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(_OPENMP) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) #pragma omp critical (MagickCore_SparseColorImage) #endif proceed=SetImageProgress(image,SparseColorTag,progress++,image->rows); diff --git a/magick/draw-private.h b/magick/draw-private.h index 7ca5f70eb..bd42f7f7f 100644 --- a/magick/draw-private.h +++ b/magick/draw-private.h @@ -41,7 +41,7 @@ static inline MagickBooleanType GetFillColor(const DrawInfo *draw_info, *pixel=draw_info->fill; return(MagickTrue); } -#if defined(_OPENMP) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) #pragma omp critical #endif status=GetOneVirtualMethodPixel(pattern,TileVirtualPixelMethod, @@ -67,7 +67,7 @@ static inline MagickBooleanType GetStrokeColor(const DrawInfo *draw_info, *pixel=draw_info->stroke; return(MagickTrue); } -#if defined(_OPENMP) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) #pragma omp critical #endif status=GetOneVirtualMethodPixel(pattern,TileVirtualPixelMethod, diff --git a/magick/draw.c b/magick/draw.c index a6362c47c..720fcf595 100644 --- a/magick/draw.c +++ b/magick/draw.c @@ -1168,7 +1168,7 @@ MagickExport MagickBooleanType DrawAffineImage(Image *image, resample_filter=AcquireResampleFilterThreadSet(source,MagickTrue,exception); image_view=AcquireCacheView(image); source_view=AcquireCacheView(source); -#if defined(_OPENMP) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) #pragma omp parallel for shared(status) #endif for (y=(long) (edge.y1+0.5); y <= (long) (edge.y2+0.5); y++) @@ -3272,7 +3272,7 @@ MagickExport MagickBooleanType DrawGradientImage(Image *image, exception=(&image->exception); GetMagickPixelPacket(image,&zero); image_view=AcquireCacheView(image); -#if defined(_OPENMP) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) #pragma omp parallel for shared(status) #endif for (y=bounding_box.y; y < (long) bounding_box.height; y++) @@ -3880,7 +3880,7 @@ static MagickBooleanType DrawPolygonPrimitive(Image *image, /* Draw point. */ -#if defined(_OPENMP) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) #pragma omp parallel for shared(status) #endif for (y=(long) (bounds.y1+0.5); y <= (long) (bounds.y2+0.5); y++) @@ -3927,7 +3927,7 @@ static MagickBooleanType DrawPolygonPrimitive(Image *image, */ if (image->matte == MagickFalse) (void) SetImageAlphaChannel(image,OpaqueAlphaChannel); -#if defined(_OPENMP) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) #pragma omp parallel for 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 629c538b1..e04aa1dd5 100644 --- a/magick/effect.c +++ b/magick/effect.c @@ -268,7 +268,7 @@ MagickExport Image *AdaptiveBlurImageChannel(const Image *image, image_view=AcquireCacheView(image); edge_view=AcquireCacheView(edge_image); blur_view=AcquireCacheView(blur_image); -#if defined(_OPENMP) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) #pragma omp parallel for shared(progress,status) #endif for (y=0; y < (long) blur_image->rows; y++) @@ -379,7 +379,7 @@ MagickExport Image *AdaptiveBlurImageChannel(const Image *image, MagickBooleanType proceed; -#if defined(_OPENMP) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) #pragma omp critical (MagickCore_AdaptiveBlurImageChannel) #endif proceed=SetImageProgress(image,AdaptiveBlurImageTag,progress++, @@ -586,7 +586,7 @@ MagickExport Image *AdaptiveSharpenImageChannel(const Image *image, image_view=AcquireCacheView(image); edge_view=AcquireCacheView(edge_image); sharp_view=AcquireCacheView(sharp_image); -#if defined(_OPENMP) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) #pragma omp parallel for shared(progress,status) #endif for (y=0; y < (long) sharp_image->rows; y++) @@ -697,7 +697,7 @@ MagickExport Image *AdaptiveSharpenImageChannel(const Image *image, MagickBooleanType proceed; -#if defined(_OPENMP) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) #pragma omp critical (MagickCore_AdaptiveSharpenImageChannel) #endif proceed=SetImageProgress(image,AdaptiveSharpenImageTag,progress++, @@ -907,7 +907,7 @@ MagickExport Image *BlurImageChannel(const Image *image, bias=image->bias; image_view=AcquireCacheView(image); blur_view=AcquireCacheView(blur_image); -#if defined(_OPENMP) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) #pragma omp parallel for shared(progress,status) #endif for (y=0; y < (long) blur_image->rows; y++) @@ -1070,7 +1070,7 @@ MagickExport Image *BlurImageChannel(const Image *image, MagickBooleanType proceed; -#if defined(_OPENMP) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) #pragma omp critical (MagickCore_BlurImageChannel) #endif proceed=SetImageProgress(image,BlurImageTag,progress++,blur_image->rows+ @@ -1086,7 +1086,7 @@ MagickExport Image *BlurImageChannel(const Image *image, */ image_view=AcquireCacheView(blur_image); blur_view=AcquireCacheView(blur_image); -#if defined(_OPENMP) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) #pragma omp parallel for shared(progress,status) #endif for (x=0; x < (long) blur_image->columns; x++) @@ -1248,7 +1248,7 @@ MagickExport Image *BlurImageChannel(const Image *image, MagickBooleanType proceed; -#if defined(_OPENMP) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) #pragma omp critical (MagickCore_BlurImageChannel) #endif proceed=SetImageProgress(image,BlurImageTag,progress++,blur_image->rows+ @@ -1498,7 +1498,7 @@ MagickExport Image *DespeckleImage(const Image *image,ExceptionInfo *exception) status=MagickTrue; image_view=AcquireCacheView(image); despeckle_view=AcquireCacheView(despeckle_image); -#if defined(_OPENMP) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) #pragma omp parallel for shared(status) #endif for (channel=0; channel <= 3; channel++) @@ -1595,7 +1595,7 @@ MagickExport Image *DespeckleImage(const Image *image,ExceptionInfo *exception) MagickBooleanType proceed; -#if defined(_OPENMP) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) #pragma omp critical (MagickCore_DespeckleImage) #endif proceed=SetImageProgress(image,DespeckleImageTag,channel,3); @@ -2243,7 +2243,7 @@ MagickExport Image *MedianFilterImage(const Image *image,const double radius, progress=0; image_view=AcquireCacheView(image); median_view=AcquireCacheView(median_image); -#if defined(_OPENMP) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) #pragma omp parallel for shared(progress,status) #endif for (y=0; y < (long) median_image->rows; y++) @@ -2315,7 +2315,7 @@ MagickExport Image *MedianFilterImage(const Image *image,const double radius, MagickBooleanType proceed; -#if defined(_OPENMP) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) #pragma omp critical (MagickCore_MedianFilterImage) #endif proceed=SetImageProgress(image,MedianFilterImageTag,progress++, @@ -2515,7 +2515,7 @@ MagickExport Image *MotionBlurImageChannel(const Image *image, GetMagickPixelPacket(image,&zero); image_view=AcquireCacheView(image); blur_view=AcquireCacheView(blur_image); -#if defined(_OPENMP) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) #pragma omp parallel for shared(progress,status) #endif for (y=0; y < (long) image->rows; y++) @@ -2634,7 +2634,7 @@ MagickExport Image *MotionBlurImageChannel(const Image *image, MagickBooleanType proceed; -#if defined(_OPENMP) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) #pragma omp critical (MagickCore_MotionBlurImageChannel) #endif proceed=SetImageProgress(image,BlurImageTag,progress++,image->rows); @@ -3290,7 +3290,7 @@ MagickExport Image *RadialBlurImageChannel(const Image *image, GetMagickPixelPacket(image,&zero); image_view=AcquireCacheView(image); blur_view=AcquireCacheView(blur_image); -#if defined(_OPENMP) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) #pragma omp parallel for shared(progress,status) #endif for (y=0; y < (long) blur_image->rows; y++) @@ -3438,7 +3438,7 @@ MagickExport Image *RadialBlurImageChannel(const Image *image, MagickBooleanType proceed; -#if defined(_OPENMP) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) #pragma omp critical (MagickCore_RadialBlurImageChannel) #endif proceed=SetImageProgress(image,BlurImageTag,progress++,image->rows); @@ -3601,7 +3601,7 @@ MagickExport Image *ReduceNoiseImage(const Image *image,const double radius, progress=0; image_view=AcquireCacheView(image); noise_view=AcquireCacheView(noise_image); -#if defined(_OPENMP) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) #pragma omp parallel for shared(progress,status) #endif for (y=0; y < (long) noise_image->rows; y++) @@ -3673,7 +3673,7 @@ MagickExport Image *ReduceNoiseImage(const Image *image,const double radius, MagickBooleanType proceed; -#if defined(_OPENMP) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) #pragma omp critical (MagickCore_ReduceNoiseImage) #endif proceed=SetImageProgress(image,ReduceNoiseImageTag,progress++, @@ -3858,7 +3858,7 @@ MagickExport Image *SelectiveBlurImageChannel(const Image *image, bias=image->bias; image_view=AcquireCacheView(image); blur_view=AcquireCacheView(blur_image); -#if defined(_OPENMP) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) #pragma omp parallel for shared(progress,status) #endif for (y=0; y < (long) image->rows; y++) @@ -4089,7 +4089,7 @@ MagickExport Image *SelectiveBlurImageChannel(const Image *image, MagickBooleanType proceed; -#if defined(_OPENMP) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) #pragma omp critical (MagickCore_SelectiveBlurImageChannel) #endif proceed=SetImageProgress(image,SelectiveBlurImageTag,progress++, @@ -4194,7 +4194,7 @@ MagickExport Image *ShadeImage(const Image *image,const MagickBooleanType gray, progress=0; image_view=AcquireCacheView(image); shade_view=AcquireCacheView(shade_image); -#if defined(_OPENMP) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) #pragma omp parallel for shared(progress,status) #endif for (y=0; y < (long) image->rows; y++) @@ -4286,7 +4286,7 @@ MagickExport Image *ShadeImage(const Image *image,const MagickBooleanType gray, MagickBooleanType proceed; -#if defined(_OPENMP) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) #pragma omp critical (MagickCore_ShadeImage) #endif proceed=SetImageProgress(image,ShadeImageTag,progress++,image->rows); @@ -4491,7 +4491,7 @@ 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(_OPENMP) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) #pragma omp parallel for shared(progress,status) #endif for (y=0; y < (long) spread_image->rows; y++) @@ -4536,7 +4536,7 @@ MagickExport Image *SpreadImage(const Image *image,const double radius, MagickBooleanType proceed; -#if defined(_OPENMP) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) #pragma omp critical (MagickCore_SpreadImage) #endif proceed=SetImageProgress(image,SpreadImageTag,progress++,image->rows); @@ -4650,7 +4650,7 @@ MagickExport Image *UnsharpMaskImageChannel(const Image *image, GetMagickPixelPacket(image,&zero); image_view=AcquireCacheView(image); unsharp_view=AcquireCacheView(unsharp_image); -#if defined(_OPENMP) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) #pragma omp parallel for shared(progress,status) #endif for (y=0; y < (long) image->rows; y++) @@ -4745,7 +4745,7 @@ MagickExport Image *UnsharpMaskImageChannel(const Image *image, MagickBooleanType proceed; -#if defined(_OPENMP) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) #pragma omp critical (MagickCore_UnsharpMaskImageChannel) #endif proceed=SetImageProgress(image,SharpenImageTag,progress++,image->rows); diff --git a/magick/enhance.c b/magick/enhance.c index c0767353c..f6a87d33f 100644 --- a/magick/enhance.c +++ b/magick/enhance.c @@ -459,7 +459,7 @@ MagickExport MagickBooleanType ColorDecisionListImage(Image *image, if (cdl_map == (PixelPacket *) NULL) ThrowBinaryException(ResourceLimitError,"MemoryAllocationFailed", image->filename); -#if defined(_OPENMP) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) #pragma omp parallel for #endif for (i=0; i <= (long) MaxMap; i++) @@ -479,7 +479,7 @@ MagickExport MagickBooleanType ColorDecisionListImage(Image *image, /* Apply transfer function to colormap. */ -#if defined(_OPENMP) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) #pragma omp parallel for shared(progress,status) #endif for (i=0; i < (long) image->colors; i++) @@ -505,7 +505,7 @@ MagickExport MagickBooleanType ColorDecisionListImage(Image *image, progress=0; exception=(&image->exception); image_view=AcquireCacheView(image); -#if defined(_OPENMP) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) #pragma omp parallel for 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(_OPENMP) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) #pragma omp critical (MagickCore_ColorDecisionListImageChannel) #endif proceed=SetImageProgress(image,ColorDecisionListCorrectImageTag, @@ -653,7 +653,7 @@ MagickExport MagickBooleanType ClutImageChannel(Image *image, resample_filter=AcquireResampleFilterThreadSet(clut_image,MagickTrue, exception); image_view=AcquireCacheView(image); -#if defined(_OPENMP) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) #pragma omp parallel for 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(_OPENMP) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) #pragma omp critical (MagickCore_ClutImageChannel) #endif proceed=SetImageProgress(image,ClutImageTag,progress++,image->rows); @@ -886,7 +886,7 @@ MagickExport MagickBooleanType ContrastImage(Image *image, progress=0; exception=(&image->exception); image_view=AcquireCacheView(image); -#if defined(_OPENMP) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) #pragma omp parallel for 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(_OPENMP) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) #pragma omp critical (MagickCore_ContrastImage) #endif proceed=SetImageProgress(image,ContrastImageTag,progress++,image->rows); @@ -1224,7 +1224,7 @@ 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(_OPENMP) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) #pragma omp parallel for shared(progress,status) #endif for (i=0; i <= (long) MaxMap; i++) @@ -1306,7 +1306,7 @@ MagickExport MagickBooleanType ContrastStretchImageChannel(Image *image, /* Stretch colormap. */ -#if defined(_OPENMP) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) #pragma omp parallel for shared(progress,status) #endif for (i=0; i < (long) image->colors; i++) @@ -1342,7 +1342,7 @@ MagickExport MagickBooleanType ContrastStretchImageChannel(Image *image, */ status=MagickTrue; progress=0; -#if defined(_OPENMP) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) #pragma omp parallel for 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(_OPENMP) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) #pragma omp critical (MagickCore_ContrastStretchImageChannel) #endif proceed=SetImageProgress(image,ContrastStretchImageTag,progress++, @@ -1521,7 +1521,7 @@ 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(_OPENMP) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) #pragma omp parallel for 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(_OPENMP) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) #pragma omp critical (MagickCore_EnhanceImage) #endif proceed=SetImageProgress(image,EnhanceImageTag,progress++,image->rows); @@ -1754,7 +1754,7 @@ MagickExport MagickBooleanType EqualizeImageChannel(Image *image, black=map[0]; white=map[(int) MaxMap]; (void) ResetMagickMemory(equalize_map,0,(MaxMap+1)*sizeof(*equalize_map)); -#if defined(_OPENMP) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) #pragma omp parallel for shared(progress,status) #endif for (i=0; i <= (long) MaxMap; i++) @@ -1785,7 +1785,7 @@ MagickExport MagickBooleanType EqualizeImageChannel(Image *image, /* Equalize colormap. */ -#if defined(_OPENMP) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) #pragma omp parallel for shared(progress,status) #endif for (i=0; i < (long) image->colors; i++) @@ -1812,7 +1812,7 @@ MagickExport MagickBooleanType EqualizeImageChannel(Image *image, progress=0; exception=(&image->exception); image_view=AcquireCacheView(image); -#if defined(_OPENMP) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) #pragma omp parallel for 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(_OPENMP) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) #pragma omp critical (MagickCore_EqualizeImageChannel) #endif proceed=SetImageProgress(image,EqualizeImageTag,progress++,image->rows); @@ -1988,7 +1988,7 @@ MagickExport MagickBooleanType GammaImageChannel(Image *image, image->filename); (void) ResetMagickMemory(gamma_map,0,(MaxMap+1)*sizeof(*gamma_map)); if (gamma != 0.0) -#if defined(_OPENMP) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) #pragma omp parallel for #endif for (i=0; i <= (long) MaxMap; i++) @@ -1999,7 +1999,7 @@ MagickExport MagickBooleanType GammaImageChannel(Image *image, /* Gamma-correct colormap. */ -#if defined(_OPENMP) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) #pragma omp parallel for shared(progress,status) #endif for (i=0; i < (long) image->colors; i++) @@ -2032,7 +2032,7 @@ MagickExport MagickBooleanType GammaImageChannel(Image *image, progress=0; exception=(&image->exception); image_view=AcquireCacheView(image); -#if defined(_OPENMP) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) #pragma omp parallel for 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(_OPENMP) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) #pragma omp critical (MagickCore_GammaImageChannel) #endif proceed=SetImageProgress(image,GammaCorrectImageTag,progress++, @@ -2220,7 +2220,7 @@ MagickExport MagickBooleanType HaldClutImageChannel(Image *image, resample_filter=AcquireResampleFilterThreadSet(hald_image,MagickTrue, exception); image_view=AcquireCacheView(image); -#if defined(_OPENMP) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) #pragma omp parallel for 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(_OPENMP) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) #pragma omp critical (MagickCore_HaldClutImageChannel) #endif proceed=SetImageProgress(image,HaldClutImageTag,progress++,image->rows); @@ -2491,7 +2491,7 @@ MagickExport MagickBooleanType LevelImageChannel(Image *image, if (image->debug != MagickFalse) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); if (image->storage_class == PseudoClass) -#if defined(_OPENMP) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) #pragma omp parallel for shared(progress,status) #endif for (i=0; i < (long) image->colors; i++) @@ -2515,7 +2515,7 @@ MagickExport MagickBooleanType LevelImageChannel(Image *image, progress=0; exception=(&image->exception); image_view=AcquireCacheView(image); -#if defined(_OPENMP) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) #pragma omp parallel for 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(_OPENMP) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) #pragma omp critical (MagickCore_LevelImageChannel) #endif proceed=SetImageProgress(image,LevelImageTag,progress++,image->rows); @@ -2648,7 +2648,7 @@ MagickExport MagickBooleanType LevelizeImageChannel(Image *image, if (image->debug != MagickFalse) (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename); if (image->storage_class == PseudoClass) -#if defined(_OPENMP) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) #pragma omp parallel for shared(progress,status) #endif for (i=0; i < (long) image->colors; i++) @@ -2672,7 +2672,7 @@ MagickExport MagickBooleanType LevelizeImageChannel(Image *image, progress=0; exception=(&image->exception); image_view=AcquireCacheView(image); -#if defined(_OPENMP) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) #pragma omp parallel for 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(_OPENMP) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) #pragma omp critical (MagickCore_LevelizeImageChannel) #endif proceed=SetImageProgress(image,LevelizeImageTag,progress++,image->rows); @@ -3121,7 +3121,7 @@ MagickExport MagickBooleanType ModulateImage(Image *image,const char *modulate) /* Modulate colormap. */ -#if defined(_OPENMP) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) #pragma omp parallel for shared(progress,status) #endif for (i=0; i < (long) image->colors; i++) @@ -3158,7 +3158,7 @@ MagickExport MagickBooleanType ModulateImage(Image *image,const char *modulate) progress=0; exception=(&image->exception); image_view=AcquireCacheView(image); -#if defined(_OPENMP) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) #pragma omp parallel for 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(_OPENMP) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) #pragma omp critical (MagickCore_ModulateImage) #endif proceed=SetImageProgress(image,ModulateImageTag,progress++,image->rows); @@ -3293,7 +3293,7 @@ MagickExport MagickBooleanType NegateImageChannel(Image *image, /* Negate colormap. */ -#if defined(_OPENMP) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) #pragma omp parallel for shared(progress,status) #endif for (i=0; i < (long) image->colors; i++) @@ -3322,7 +3322,7 @@ MagickExport MagickBooleanType NegateImageChannel(Image *image, image_view=AcquireCacheView(image); if (grayscale != MagickFalse) { -#if defined(_OPENMP) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) #pragma omp parallel for 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(_OPENMP) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) #pragma omp critical (MagickCore_NegateImageChannel) #endif proceed=SetImageProgress(image,NegateImageTag,progress++, @@ -3392,7 +3392,7 @@ MagickExport MagickBooleanType NegateImageChannel(Image *image, /* Negate image. */ -#if defined(_OPENMP) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) #pragma omp parallel for 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(_OPENMP) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) #pragma omp critical (MagickCore_NegateImageChannel) #endif proceed=SetImageProgress(image,NegateImageTag,progress++,image->rows); @@ -3601,7 +3601,7 @@ MagickExport MagickBooleanType SigmoidalContrastImageChannel(Image *image, ThrowBinaryException(ResourceLimitError,"MemoryAllocationFailed", image->filename); (void) ResetMagickMemory(sigmoidal_map,0,(MaxMap+1)*sizeof(*sigmoidal_map)); -#if defined(_OPENMP) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) #pragma omp parallel for shared(progress,status) #endif for (i=0; i <= (long) MaxMap; i++) @@ -3631,7 +3631,7 @@ MagickExport MagickBooleanType SigmoidalContrastImageChannel(Image *image, /* Sigmoidal-contrast enhance colormap. */ -#if defined(_OPENMP) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) #pragma omp parallel for shared(progress,status) #endif for (i=0; i < (long) image->colors; i++) @@ -3657,7 +3657,7 @@ MagickExport MagickBooleanType SigmoidalContrastImageChannel(Image *image, progress=0; exception=(&image->exception); image_view=AcquireCacheView(image); -#if defined(_OPENMP) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) #pragma omp parallel for 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(_OPENMP) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) #pragma omp critical (MagickCore_SigmoidalContrastImageChannel) #endif proceed=SetImageProgress(image,SigmoidalContrastImageTag,progress++, diff --git a/magick/fourier.c b/magick/fourier.c index b98c32da6..887df08ce 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(_OPENMP) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) #pragma omp critical (MagickCore_ForwardFourierTransform) #endif fftw_r2c_plan=fftw_plan_dft_r2c_2d(fourier_info->width,fourier_info->width, @@ -653,7 +653,7 @@ MagickExport Image *ForwardFourierTransformImage(const Image *image, AppendImageToList(&fourier_image,phase_image); status=MagickTrue; is_gray=IsGrayImage(image,exception); -#if defined(_OPENMP) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) #pragma omp parallel for 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(_OPENMP) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) #pragma omp critical (MagickCore_InverseFourierTransform) #endif fftw_c2r_plan=fftw_plan_dft_c2r_2d(fourier_info->width,fourier_info->height, @@ -1196,7 +1196,7 @@ 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(_OPENMP) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) #pragma omp parallel for shared(status) #endif for (i=0L; i < 5L; i++) diff --git a/magick/fx.c b/magick/fx.c index adc27c869..2766d4427 100644 --- a/magick/fx.c +++ b/magick/fx.c @@ -333,7 +333,7 @@ MagickExport Image *AddNoiseImageChannel(const Image *image, random_info=AcquireRandomInfoThreadSet(); image_view=AcquireCacheView(image); noise_view=AcquireCacheView(noise_image); -#if defined(MAGICKCORE_OPENMP_SUPPORT_DEBUG) +#if defined(MAGICKCOREMAGICKCORE_OPENMP_SUPPORT_SUPPORT_DEBUG) #pragma omp parallel for 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(_OPENMP) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) #pragma omp critical (MagickCore_AverageImages) #endif proceed=SetImageProgress(image,AddNoiseImageTag,progress++, @@ -489,7 +489,7 @@ MagickExport Image *BlueShiftImage(const Image *image,const double factor, progress=0; image_view=AcquireCacheView(image); shift_view=AcquireCacheView(shift_image); -#if defined(MAGICKCORE_OPENMP_SUPPORT_DEBUG) +#if defined(MAGICKCOREMAGICKCORE_OPENMP_SUPPORT_SUPPORT_DEBUG) #pragma omp parallel for shared(progress,status) #endif for (y=0; y < (long) image->rows; y++) @@ -554,7 +554,7 @@ MagickExport Image *BlueShiftImage(const Image *image,const double factor, MagickBooleanType proceed; -#if defined(MAGICKCORE_OPENMP_SUPPORT_DEBUG) +#if defined(MAGICKCOREMAGICKCORE_OPENMP_SUPPORT_SUPPORT_DEBUG) #pragma omp critical (MagickCore_BlueShiftImage) #endif proceed=SetImageProgress(image,BlueShiftImageTag,progress++, @@ -736,7 +736,7 @@ MagickExport Image *ColorizeImage(const Image *image,const char *opacity, progress=0; image_view=AcquireCacheView(image); colorize_view=AcquireCacheView(colorize_image); -#if defined(MAGICKCORE_OPENMP_SUPPORT_DEBUG) +#if defined(MAGICKCOREMAGICKCORE_OPENMP_SUPPORT_SUPPORT_DEBUG) #pragma omp parallel for shared(progress,status) #endif for (y=0; y < (long) image->rows; y++) @@ -784,7 +784,7 @@ MagickExport Image *ColorizeImage(const Image *image,const char *opacity, MagickBooleanType proceed; -#if defined(MAGICKCORE_OPENMP_SUPPORT_DEBUG) +#if defined(MAGICKCOREMAGICKCORE_OPENMP_SUPPORT_SUPPORT_DEBUG) #pragma omp critical (MagickCore_ColorizeImage) #endif proceed=SetImageProgress(image,ColorizeImageTag,progress++,image->rows); @@ -958,7 +958,7 @@ MagickExport Image *ConvolveImageChannel(const Image *image, bias=image->bias; image_view=AcquireCacheView(image); convolve_view=AcquireCacheView(convolve_image); -#if defined(_OPENMP) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) #pragma omp parallel for shared(progress,status) #endif for (y=0; y < (long) image->rows; y++) @@ -1147,7 +1147,7 @@ MagickExport Image *ConvolveImageChannel(const Image *image, MagickBooleanType proceed; -#if defined(_OPENMP) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) #pragma omp critical (MagickCore_ConvolveImageChannel) #endif proceed=SetImageProgress(image,ConvolveImageTag,progress++,image->rows); @@ -1473,7 +1473,7 @@ MagickExport MagickBooleanType EvaluateImageChannel(Image *image, progress=0; random_info=AcquireRandomInfoThreadSet(); image_view=AcquireCacheView(image); -#if defined(_OPENMP) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) #pragma omp parallel for shared(progress,status) #endif for (y=0; y < (long) image->rows; y++) @@ -1527,7 +1527,7 @@ MagickExport MagickBooleanType EvaluateImageChannel(Image *image, MagickBooleanType proceed; -#if defined(_OPENMP) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) #pragma omp critical (MagickCore_EvaluateImageChannel) #endif proceed=SetImageProgress(image,EvaluateImageTag,progress++,image->rows); @@ -1705,7 +1705,7 @@ MagickExport MagickBooleanType FunctionImageChannel(Image *image, status=MagickTrue; progress=0; image_view=AcquireCacheView(image); -#if defined(_OPENMP) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) #pragma omp parallel for shared(progress,status) #endif for (y=0; y < (long) image->rows; y++) @@ -1761,7 +1761,7 @@ MagickExport MagickBooleanType FunctionImageChannel(Image *image, MagickBooleanType proceed; -#if defined(_OPENMP) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) #pragma omp critical (MagickCore_FunctionImageChannel) #endif proceed=SetImageProgress(image,FunctionImageTag,progress++,image->rows); @@ -3541,7 +3541,7 @@ MagickExport Image *FxImageChannel(const Image *image,const ChannelType channel, status=MagickTrue; progress=0; fx_view=AcquireCacheView(fx_image); -#if defined(_OPENMP) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) #pragma omp parallel for shared(progress,status) #endif for (y=0; y < (long) fx_image->rows; y++) @@ -3617,7 +3617,7 @@ MagickExport Image *FxImageChannel(const Image *image,const ChannelType channel, MagickBooleanType proceed; -#if defined(_OPENMP) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) #pragma omp critical (MagickCore_FxImageChannel) #endif proceed=SetImageProgress(image,FxImageTag,progress++,image->rows); @@ -3744,7 +3744,7 @@ 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(_OPENMP) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) #pragma omp parallel for shared(progress,status) #endif for (y=0; y < (long) image->rows; y++) @@ -3814,7 +3814,7 @@ MagickExport Image *ImplodeImage(const Image *image,const double amount, MagickBooleanType proceed; -#if defined(_OPENMP) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) #pragma omp critical (MagickCore_ImplodeImage) #endif proceed=SetImageProgress(image,ImplodeImageTag,progress++,image->rows); @@ -3966,7 +3966,7 @@ MagickExport Image *MorphImages(const Image *image, } image_view=AcquireCacheView(morph_image); morph_view=AcquireCacheView(morph_images); -#if defined(_OPENMP) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) #pragma omp parallel for shared(status) #endif for (y=0; y < (long) morph_images->rows; y++) @@ -4029,7 +4029,7 @@ MagickExport Image *MorphImages(const Image *image, MagickBooleanType proceed; -#if defined(_OPENMP) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) #pragma omp critical (MagickCore_MorphImages) #endif proceed=SetImageProgress(image,MorphImageTag,scene, @@ -4593,7 +4593,7 @@ MagickExport Image *RecolorImage(const Image *image,const unsigned long order, k=color_matrix; image_view=AcquireCacheView(image); recolor_view=AcquireCacheView(recolor_image); -#if defined(_OPENMP) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) #pragma omp parallel for shared(progress,status) #endif for (y=0; y < (long) image->rows; y++) @@ -4717,7 +4717,7 @@ MagickExport Image *RecolorImage(const Image *image,const unsigned long order, MagickBooleanType proceed; -#if defined(_OPENMP) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) #pragma omp critical (MagickCore_RecolorImage) #endif proceed=SetImageProgress(image,RecolorImageTag,progress++,image->rows); @@ -4806,7 +4806,7 @@ MagickExport Image *SepiaToneImage(const Image *image,const double threshold, progress=0; image_view=AcquireCacheView(image); sepia_view=AcquireCacheView(sepia_image); -#if defined(_OPENMP) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) #pragma omp parallel for shared(progress,status) #endif for (y=0; y < (long) image->rows; y++) @@ -4860,7 +4860,7 @@ MagickExport Image *SepiaToneImage(const Image *image,const double threshold, MagickBooleanType proceed; -#if defined(_OPENMP) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) #pragma omp critical (MagickCore_SepiaToneImage) #endif proceed=SetImageProgress(image,SepiaToneImageTag,progress++, @@ -4964,7 +4964,7 @@ MagickExport Image *ShadowImage(const Image *image,const double opacity, status=MagickTrue; progress=0; image_view=AcquireCacheView(border_image); -#if defined(_OPENMP) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) #pragma omp parallel for shared(progress,status) #endif for (y=0; y < (long) border_image->rows; y++) @@ -5003,7 +5003,7 @@ MagickExport Image *ShadowImage(const Image *image,const double opacity, MagickBooleanType proceed; -#if defined(_OPENMP) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) #pragma omp critical (MagickCore_ShadowImage) #endif proceed=SetImageProgress(image,ShadowImageTag,progress++, @@ -5253,7 +5253,7 @@ MagickExport MagickBooleanType SolarizeImage(Image *image, progress=0; exception=(&image->exception); image_view=AcquireCacheView(image); -#if defined(_OPENMP) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) #pragma omp parallel for shared(progress,status) #endif for (y=0; y < (long) image->rows; y++) @@ -5290,7 +5290,7 @@ MagickExport MagickBooleanType SolarizeImage(Image *image, MagickBooleanType proceed; -#if defined(_OPENMP) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) #pragma omp critical (MagickCore_SolarizeImage) #endif proceed=SetImageProgress(image,SolarizeImageTag,progress++,image->rows); @@ -5694,7 +5694,7 @@ 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(_OPENMP) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) #pragma omp parallel for shared(progress,status) #endif for (y=0; y < (long) image->rows; y++) @@ -5765,7 +5765,7 @@ MagickExport Image *SwirlImage(const Image *image,double degrees, MagickBooleanType proceed; -#if defined(_OPENMP) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) #pragma omp critical (MagickCore_SwirlImage) #endif proceed=SetImageProgress(image,SwirlImageTag,progress++,image->rows); @@ -5891,7 +5891,7 @@ MagickExport Image *TintImage(const Image *image,const char *opacity, progress=0; image_view=AcquireCacheView(image); tint_view=AcquireCacheView(tint_image); -#if defined(_OPENMP) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) #pragma omp parallel for shared(progress,status) #endif for (y=0; y < (long) image->rows; y++) @@ -5946,7 +5946,7 @@ MagickExport Image *TintImage(const Image *image,const char *opacity, MagickBooleanType proceed; -#if defined(_OPENMP) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) #pragma omp critical (MagickCore_TintImage) #endif proceed=SetImageProgress(image,TintImageTag,progress++,image->rows); @@ -6157,7 +6157,7 @@ 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(_OPENMP) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) #pragma omp parallel for shared(progress,status) #endif for (y=0; y < (long) wave_image->rows; y++) @@ -6203,7 +6203,7 @@ MagickExport Image *WaveImage(const Image *image,const double amplitude, MagickBooleanType proceed; -#if defined(_OPENMP) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) #pragma omp critical (MagickCore_WaveImage) #endif proceed=SetImageProgress(image,WaveImageTag,progress++,image->rows); diff --git a/magick/image.c b/magick/image.c index b3f51fd81..709c64a1c 100644 --- a/magick/image.c +++ b/magick/image.c @@ -550,7 +550,7 @@ MagickExport Image *AppendImages(const Image *image, else y_offset-=geometry.y; image_view=AcquireCacheView(image); -#if defined(_OPENMP) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) #pragma omp parallel for shared(status) #endif for (y=0; y < (long) image->rows; y++) @@ -1091,7 +1091,7 @@ MagickExport Image *CombineImages(const Image *image,const ChannelType channel, status=MagickTrue; progress=0; combine_view=AcquireCacheView(combine_image); -#if defined(_OPENMP) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) #pragma omp parallel for 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(_OPENMP) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) #pragma omp critical (MagickCore_CombineImages) #endif proceed=SetImageProgress(image,CombineImageTag,progress++, @@ -1878,7 +1878,7 @@ MagickExport MagickBooleanType IsHighDynamicRangeImage(const Image *image, status=MagickTrue; GetMagickPixelPacket(image,&zero); image_view=AcquireCacheView(image); -#if defined(_OPENMP) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) #pragma omp parallel for shared(status) #endif for (y=0; y < (long) image->rows; y++) @@ -2338,7 +2338,7 @@ MagickExport MagickBooleanType SeparateImageChannel(Image *image, progress=0; exception=(&image->exception); image_view=AcquireCacheView(image); -#if defined(_OPENMP) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) #pragma omp parallel for 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(_OPENMP) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) #pragma omp critical (MagickCore_SeparateImageChannel) #endif proceed=SetImageProgress(image,SeparateImageTag,progress++,image->rows); @@ -2625,7 +2625,7 @@ MagickExport MagickBooleanType SetImageAlphaChannel(Image *image, status=MagickTrue; exception=(&image->exception); image_view=AcquireCacheView(image); - #if defined(_OPENMP) && (_OPENMP >= 200203) + #if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) #pragma omp parallel for shared(status) #endif for (y=0; y < (long) image->rows; y++) @@ -2801,7 +2801,7 @@ MagickExport MagickBooleanType SetImageBackgroundColor(Image *image) status=MagickTrue; exception=(&image->exception); image_view=AcquireCacheView(image); -#if defined(_OPENMP) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) #pragma omp parallel for shared(status) #endif for (y=0; y < (long) image->rows; y++) @@ -3468,7 +3468,7 @@ MagickExport MagickBooleanType SetImageOpacity(Image *image, status=MagickTrue; exception=(&image->exception); image_view=AcquireCacheView(image); -#if defined(_OPENMP) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) #pragma omp parallel for shared(status) #endif for (y=0; y < (long) image->rows; y++) diff --git a/magick/paint.c b/magick/paint.c index 77ac19e9d..c442322fd 100644 --- a/magick/paint.c +++ b/magick/paint.c @@ -600,7 +600,7 @@ MagickExport Image *OilPaintImage(const Image *image,const double radius, progress=0; image_view=AcquireCacheView(image); paint_view=AcquireCacheView(paint_image); -#if defined(_OPENMP) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) #pragma omp parallel for 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(_OPENMP) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) #pragma omp critical (MagickCore_OilPaintImage) #endif proceed=SetImageProgress(image,OilPaintImageTag,progress++,image->rows); @@ -789,7 +789,7 @@ MagickExport MagickBooleanType OpaquePaintImageChannel(Image *image, exception=(&image->exception); GetMagickPixelPacket(image,&zero); image_view=AcquireCacheView(image); -#if defined(_OPENMP) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) #pragma omp parallel for 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(_OPENMP) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) #pragma omp critical (MagickCore_OpaquePaintImageChannel) #endif proceed=SetImageProgress(image,OpaquePaintImageTag,progress++, @@ -931,7 +931,7 @@ MagickExport MagickBooleanType TransparentPaintImage(Image *image, exception=(&image->exception); GetMagickPixelPacket(image,&zero); image_view=AcquireCacheView(image); -#if defined(_OPENMP) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) #pragma omp parallel for 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(_OPENMP) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) #pragma omp critical (MagickCore_TransparentPaintImage) #endif proceed=SetImageProgress(image,TransparentPaintImageTag,progress++, @@ -1061,7 +1061,7 @@ MagickExport MagickBooleanType TransparentPaintImageChroma(Image *image, progress=0; exception=(&image->exception); image_view=AcquireCacheView(image); -#if defined(_OPENMP) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) #pragma omp parallel for 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(_OPENMP) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) #pragma omp critical (MagickCore_TransparentPaintImageChroma) #endif proceed=SetImageProgress(image,TransparentPaintImageTag,progress++, diff --git a/magick/prepress.c b/magick/prepress.c index 5c65e9f34..7a1147b85 100644 --- a/magick/prepress.c +++ b/magick/prepress.c @@ -108,7 +108,7 @@ MagickExport double GetImageTotalInkDensity(Image *image) total_ink_density=0.0; exception=(&image->exception); image_view=AcquireCacheView(image); -#if defined(_OPENMP) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) #pragma omp parallel for 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(_OPENMP) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) #pragma omp critical (MagickCore_GetImageTotalInkDensity) #endif { diff --git a/magick/profile.c b/magick/profile.c index bcb666202..c8c18f6eb 100644 --- a/magick/profile.c +++ b/magick/profile.c @@ -1150,7 +1150,7 @@ MagickExport MagickBooleanType ProfileImage(Image *image,const char *name, status=MagickTrue; progress=0; image_view=AcquireCacheView(image); -#if defined(_OPENMP) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) #pragma omp parallel for 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(_OPENMP) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) #pragma omp critical (MagickCore_ProfileImage) #endif proceed=SetImageProgress(image,ProfileImageTag,progress++, diff --git a/magick/quantize.c b/magick/quantize.c index 7dc2131b1..eab7f27c0 100644 --- a/magick/quantize.c +++ b/magick/quantize.c @@ -3022,7 +3022,7 @@ static MagickBooleanType SetGrayscaleImage(Image *image) status=MagickTrue; exception=(&image->exception); image_view=AcquireCacheView(image); -#if defined(_OPENMP) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) #pragma omp parallel for 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(_OPENMP) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) #pragma omp critical (MagickCore_SetGrayscaleImage) #endif if (colormap_index[intensity] < 0) @@ -3098,7 +3098,7 @@ static MagickBooleanType SetGrayscaleImage(Image *image) status=MagickTrue; exception=(&image->exception); image_view=AcquireCacheView(image); -#if defined(_OPENMP) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) #pragma omp parallel for shared(status) #endif for (y=0; y < (long) image->rows; y++) diff --git a/magick/resize.c b/magick/resize.c index 07c0a6e3a..aa3ba60e9 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(_OPENMP) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) #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(_OPENMP) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) #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(_OPENMP) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) #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(_OPENMP) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) #pragma omp critical (MagickCore_VerticalFilter) #endif proceed=SetImageProgress(image,ResizeImageTag,(*quantum)++,span); @@ -2335,7 +2335,7 @@ MagickExport Image *SampleImage(const Image *image,const unsigned long columns, progress=0; image_view=AcquireCacheView(image); sample_view=AcquireCacheView(sample_image); -#if defined(_OPENMP) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) #pragma omp parallel for 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(_OPENMP) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) #pragma omp critical (MagickCore_SampleImage) #endif proceed=SetImageProgress(image,SampleImageTag,progress++,image->rows); diff --git a/magick/segment.c b/magick/segment.c index 6b673204b..e5f95e74a 100644 --- a/magick/segment.c +++ b/magick/segment.c @@ -394,7 +394,7 @@ static MagickBooleanType Classify(Image *image,short **extrema, MagickBooleanType proceed; -#if defined(_OPENMP) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) #pragma omp critical (MagickCore_Classify) #endif proceed=SetImageProgress(image,SegmentImageTag,progress++, @@ -519,7 +519,7 @@ static MagickBooleanType Classify(Image *image,short **extrema, */ exception=(&image->exception); image_view=AcquireCacheView(image); -#if defined(_OPENMP) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) #pragma omp parallel for 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(_OPENMP) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) #pragma omp critical (MagickCore_Classify) #endif proceed=SetImageProgress(image,SegmentImageTag,progress++, diff --git a/magick/shear.c b/magick/shear.c index 36755b76f..eb309db02 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(_OPENMP) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) #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(_OPENMP) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) #pragma omp critical (MagickCore_WriteRadonCell) #endif { @@ -626,7 +626,7 @@ static void RadonProjection(RadonInfo *source_cells, p=q; q=swap; } -#if defined(_OPENMP) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) #pragma omp parallel for #endif for (x=0; x < (long) p->width; x++) @@ -706,7 +706,7 @@ static MagickBooleanType RadonTransform(const Image *image, } status=MagickTrue; image_view=AcquireCacheView(image); -#if defined(_OPENMP) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) #pragma omp parallel for shared(status) #endif for (y=0; y < (long) image->rows; y++) @@ -757,7 +757,7 @@ static MagickBooleanType RadonTransform(const Image *image, } RadonProjection(source_cells,destination_cells,-1,projection); (void) ResetRadonCells(source_cells); -#if defined(_OPENMP) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) #pragma omp parallel for shared(status) #endif for (y=0; y < (long) image->rows; y++) @@ -1074,7 +1074,7 @@ static Image *IntegralRotateImage(const Image *image,unsigned long rotations, Rotate 90 degrees. */ GetPixelCacheTileSize(image,&tile_width,&tile_height); -#if defined(_OPENMP) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) #pragma omp parallel for shared(progress, status) #endif for (tile_y=0; tile_y < (long) image->rows; tile_y+=tile_height) @@ -1188,7 +1188,7 @@ static Image *IntegralRotateImage(const Image *image,unsigned long rotations, /* Rotate 180 degrees. */ -#if defined(_OPENMP) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) #pragma omp parallel for shared(progress, status) #endif for (y=0; y < (long) image->rows; y++) @@ -1264,7 +1264,7 @@ static Image *IntegralRotateImage(const Image *image,unsigned long rotations, Rotate 270 degrees. */ GetPixelCacheTileSize(image,&tile_width,&tile_height); -#if defined(_OPENMP) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) #pragma omp parallel for shared(progress, status) #endif for (tile_y=0; tile_y < (long) image->rows; tile_y+=tile_height) @@ -1460,7 +1460,7 @@ static MagickBooleanType XShearImage(Image *image,const MagickRealType degrees, progress=0; exception=(&image->exception); image_view=AcquireCacheView(image); -#if defined(_OPENMP) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) #pragma omp parallel for 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(_OPENMP) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) #pragma omp critical (MagickCore_XShearImage) #endif proceed=SetImageProgress(image,XShearImageTag,progress++,height); @@ -1680,7 +1680,7 @@ static MagickBooleanType YShearImage(Image *image,const MagickRealType degrees, progress=0; exception=(&image->exception); image_view=AcquireCacheView(image); -#if defined(_OPENMP) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) #pragma omp parallel for 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(_OPENMP) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) #pragma omp critical (MagickCore_YShearImage) #endif proceed=SetImageProgress(image,YShearImageTag,progress++,image->rows); diff --git a/magick/statistic.c b/magick/statistic.c index 45cb1e9c6..b5af543f5 100644 --- a/magick/statistic.c +++ b/magick/statistic.c @@ -227,7 +227,7 @@ MagickExport Image *AverageImages(const Image *image,ExceptionInfo *exception) GetMagickPixelPacket(image,&zero); number_images=GetImageListLength(image); average_view=AcquireCacheView(average_image); -#if defined(_OPENMP) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) #pragma omp parallel for 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(_OPENMP) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) #pragma omp critical (MagickCore_AverageImages) #endif proceed=SetImageProgress(image,AverageImageTag,progress++, diff --git a/magick/studio.h b/magick/studio.h index 2e57e3f70..5a0dbf345 100644 --- a/magick/studio.h +++ b/magick/studio.h @@ -211,6 +211,7 @@ extern "C" { #if defined(_OPENMP) && (_OPENMP >= 200203) # include +# define MAGICKCORE_OPENMP_SUPPORT 1 #endif #if defined(MAGICKCORE_HAVE_PREAD) && defined(MAGICKCORE_HAVE_DECL_PREAD) && !MAGICKCORE_HAVE_DECL_PREAD diff --git a/magick/thread-private.h b/magick/thread-private.h index 1595694a8..b030e55d8 100644 --- a/magick/thread-private.h +++ b/magick/thread-private.h @@ -87,7 +87,7 @@ static inline MagickBooleanType IsMagickThreadEqual(const MagickThreadType id) */ static inline unsigned long GetOpenMPMaximumThreads(void) { -#if defined(_OPENMP) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) { static unsigned long maximum_threads = 1UL; @@ -102,7 +102,7 @@ static inline unsigned long GetOpenMPMaximumThreads(void) static inline long GetOpenMPThreadId(void) { -#if defined(_OPENMP) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) return(omp_get_thread_num()); #else return(0); @@ -111,7 +111,7 @@ static inline long GetOpenMPThreadId(void) static inline void SetOpenMPMaximumThreads(const unsigned long threads) { -#if defined(_OPENMP) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) omp_set_num_threads(threads); #else (void) threads; diff --git a/magick/threshold.c b/magick/threshold.c index 40c368bdd..2e1139522 100644 --- a/magick/threshold.c +++ b/magick/threshold.c @@ -191,7 +191,7 @@ MagickExport Image *AdaptiveThresholdImage(const Image *image, number_pixels=(MagickRealType) width*height; image_view=AcquireCacheView(image); threshold_view=AcquireCacheView(threshold_image); -#if defined(_OPENMP) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) #pragma omp parallel for 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(_OPENMP) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) #pragma omp critical (MagickCore_AdaptiveThresholdImage) #endif proceed=SetImageProgress(image,ThresholdImageTag,progress++, @@ -385,7 +385,7 @@ MagickExport MagickBooleanType BilevelImageChannel(Image *image, progress=0; exception=(&image->exception); image_view=AcquireCacheView(image); -#if defined(_OPENMP) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) #pragma omp parallel for 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(_OPENMP) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) #pragma omp critical (MagickCore_BilevelImageChannel) #endif proceed=SetImageProgress(image,ThresholdImageTag,progress++, @@ -571,7 +571,7 @@ MagickExport MagickBooleanType BlackThresholdImageChannel(Image *image, status=MagickTrue; progress=0; image_view=AcquireCacheView(image); -#if defined(_OPENMP) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) #pragma omp parallel for 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(_OPENMP) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) #pragma omp critical (MagickCore_BlackThresholdImageChannel) #endif proceed=SetImageProgress(image,ThresholdImageTag,progress++, @@ -746,7 +746,7 @@ MagickExport MagickBooleanType ClampImageChannel(Image *image, progress=0; exception=(&image->exception); image_view=AcquireCacheView(image); -#if defined(_OPENMP) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) #pragma omp parallel for 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(_OPENMP) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) #pragma omp critical (MagickCore_ClampImageChannel) #endif proceed=SetImageProgress(image,ClampImageTag,progress++, @@ -1476,7 +1476,7 @@ printf("DEBUG levels r=%ld g=%ld b=%ld a=%ld i=%ld\n", status=MagickTrue; progress=0; image_view=AcquireCacheView(image); -#if defined(_OPENMP) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) #pragma omp parallel for 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(_OPENMP) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) #pragma omp critical (MagickCore_OrderedPosterizeImageChannel) #endif proceed=SetImageProgress(image,DitherImageTag,progress++,image->rows); @@ -1695,7 +1695,7 @@ MagickExport MagickBooleanType RandomThresholdImageChannel(Image *image, image->filename); random_info=AcquireRandomInfoThreadSet(); image_view=AcquireCacheView(image); -#if defined(_OPENMP) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) #pragma omp parallel for 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(_OPENMP) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) #pragma omp critical (MagickCore_RandomThresholdImageChannel) #endif proceed=SetImageProgress(image,ThresholdImageTag,progress++, @@ -1772,7 +1772,7 @@ MagickExport MagickBooleanType RandomThresholdImageChannel(Image *image, } random_info=AcquireRandomInfoThreadSet(); image_view=AcquireCacheView(image); -#if defined(_OPENMP) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) #pragma omp parallel for 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(_OPENMP) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) #pragma omp critical (MagickCore_RandomThresholdImageChannel) #endif proceed=SetImageProgress(image,ThresholdImageTag,progress++, @@ -1999,7 +1999,7 @@ MagickExport MagickBooleanType WhiteThresholdImageChannel(Image *image, status=MagickTrue; progress=0; image_view=AcquireCacheView(image); -#if defined(_OPENMP) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) #pragma omp parallel for 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(_OPENMP) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) #pragma omp critical (MagickCore_WhiteThresholdImageChannel) #endif proceed=SetImageProgress(image,ThresholdImageTag,progress++, diff --git a/magick/transform.c b/magick/transform.c index 5ccd522a2..678d9e0a3 100644 --- a/magick/transform.c +++ b/magick/transform.c @@ -585,7 +585,7 @@ MagickExport Image *CropImage(const Image *image,const RectangleInfo *geometry, progress=0; image_view=AcquireCacheView(image); crop_view=AcquireCacheView(crop_image); -#if defined(_OPENMP) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) #pragma omp parallel for 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(_OPENMP) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) #pragma omp critical (MagickCore_CropImage) #endif proceed=SetImageProgress(image,CropImageTag,progress++,image->rows); @@ -713,7 +713,7 @@ MagickExport Image *ExcerptImage(const Image *image, progress=0; image_view=AcquireCacheView(image); excerpt_view=AcquireCacheView(excerpt_image); -#if defined(_OPENMP) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) #pragma omp parallel for 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(_OPENMP) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) #pragma omp critical (MagickCore_ExcerptImage) #endif proceed=SetImageProgress(image,ExcerptImageTag,progress++,image->rows); @@ -894,7 +894,7 @@ MagickExport Image *FlipImage(const Image *image,ExceptionInfo *exception) progress=0; image_view=AcquireCacheView(image); flip_view=AcquireCacheView(flip_image); -#if defined(_OPENMP) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) #pragma omp parallel for 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(_OPENMP) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) #pragma omp critical (MagickCore_FlipImage) #endif proceed=SetImageProgress(image,FlipImageTag,progress++,image->rows); @@ -1012,7 +1012,7 @@ MagickExport Image *FlopImage(const Image *image,ExceptionInfo *exception) progress=0; image_view=AcquireCacheView(image); flop_view=AcquireCacheView(flop_image); -#if defined(_OPENMP) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) #pragma omp parallel for 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(_OPENMP) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) #pragma omp critical (MagickCore_FlopImage) #endif proceed=SetImageProgress(image,FlopImageTag,progress++,image->rows); @@ -1123,7 +1123,7 @@ static inline MagickBooleanType CopyImageRegion(Image *destination, status=MagickTrue; source_view=AcquireCacheView(source); destination_view=AcquireCacheView(destination); -#if defined(_OPENMP) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) #pragma omp parallel for shared(status) #endif for (y=0; y < (long) rows; y++) @@ -1438,7 +1438,7 @@ MagickExport Image *SpliceImage(const Image *image, progress=0; image_view=AcquireCacheView(image); splice_view=AcquireCacheView(splice_image); -#if defined(_OPENMP) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) #pragma omp parallel for 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(_OPENMP) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) #pragma omp critical (MagickCore_TransposeImage) #endif proceed=SetImageProgress(image,SpliceImageTag,progress++, @@ -1513,7 +1513,7 @@ MagickExport Image *SpliceImage(const Image *image, status=MagickFalse; } } -#if defined(_OPENMP) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) #pragma omp parallel for shared(progress,status) #endif for (y=(long) (splice_geometry.y+splice_geometry.height); @@ -1580,7 +1580,7 @@ MagickExport Image *SpliceImage(const Image *image, MagickBooleanType proceed; -#if defined(_OPENMP) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) #pragma omp critical (MagickCore_TransposeImage) #endif proceed=SetImageProgress(image,SpliceImageTag,progress++, @@ -1875,7 +1875,7 @@ MagickExport Image *TransposeImage(const Image *image,ExceptionInfo *exception) progress=0; image_view=AcquireCacheView(image); transpose_view=AcquireCacheView(transpose_image); -#if defined(_OPENMP) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) #pragma omp parallel for 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(_OPENMP) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) #pragma omp critical (MagickCore_TransposeImage) #endif proceed=SetImageProgress(image,TransposeImageTag,progress++, @@ -2003,7 +2003,7 @@ MagickExport Image *TransverseImage(const Image *image,ExceptionInfo *exception) progress=0; image_view=AcquireCacheView(image); transverse_view=AcquireCacheView(transverse_image); -#if defined(_OPENMP) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) #pragma omp parallel for 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(_OPENMP) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) #pragma omp critical (MagickCore_TransverseImage) #endif proceed=SetImageProgress(image,TransverseImageTag,progress++, diff --git a/magick/version.c b/magick/version.c index 7dbeb31c6..718b4a248 100644 --- a/magick/version.c +++ b/magick/version.c @@ -79,6 +79,31 @@ MagickExport const char *GetMagickCopyright(void) % % % % % % +% G e t M a g i c k F e a t u r e s % +% % +% % +% % +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% +% GetMagickFeatures() returns the ImageMagick features. +% +% The format of the GetMagickFeatures method is: +% +% const char *GetMagickFeatures(void) +% +% No parameters are required. +% +*/ +MagickExport const char *GetMagickFeatures(void) +{ + return(MagickFeatures); +} + +/* +%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% +% % +% % +% % % G e t M a g i c k H o m e U R L % % % % % diff --git a/magick/version.h b/magick/version.h index c6afba286..e256ba002 100644 --- a/magick/version.h +++ b/magick/version.h @@ -52,25 +52,32 @@ extern "C" { #define MagickQuantumRange "?" #endif #if !defined(MAGICKCORE_HDRI_SUPPORT) -#define MagickHDRISupport "" +#define MagickHDRIFeature "" #else -#define MagickHDRISupport "HDRI " +#define MagickHDRIFeature "HDRI " #endif -#if !defined(_OPENMP) -#define MagickOPENMPSupport "" +#if !defined(MAGICKCORE_OPENMP_SUPPORT) +#define MagickOPENMPFeature "" #else -#define MagickOPENMPSupport "OpenMP " +#define MagickOPENMPFeature "OpenMP " #endif -#define MagickSupport MagickHDRISupport MagickOPENMPSupport -#define MagickVersion MagickPackageName " " MagickLibVersionText \ - MagickLibSubversion " " MagickReleaseDate " " MagickQuantumDepth " " \ - MagickSupport MagickAuthoritativeURL +#if !defined(MAGICKCORE_OPENCL_SUPPORT) +#define MagickOPENCLFeature "" +#else +#define MagickOPENCLFeature "OpenCL " +#endif +#define MagickFeatures \ + MagickHDRIFeature MagickOPENMPFeature MagickOPENCLFeature +#define MagickVersion \ + MagickPackageName " " MagickLibVersionText MagickLibSubversion " " \ + MagickReleaseDate " " MagickQuantumDepth " " MagickAuthoritativeURL extern MagickExport char *GetMagickHomeURL(void); extern MagickExport const char *GetMagickCopyright(void), + *GetMagickFeatures(void), *GetMagickPackageName(void), *GetMagickQuantumDepth(unsigned long *), *GetMagickQuantumRange(unsigned long *), diff --git a/magick/version.h.in b/magick/version.h.in index 682bb0286..273d1cf5f 100644 --- a/magick/version.h.in +++ b/magick/version.h.in @@ -52,19 +52,25 @@ extern "C" { #define MagickQuantumRange "?" #endif #if !defined(MAGICKCORE_HDRI_SUPPORT) -#define MagickHDRISupport "" +#define MagickHDRIFeature "" #else -#define MagickHDRISupport "HDRI " +#define MagickHDRIFeature "HDRI " #endif -#if !defined(_OPENMP) -#define MagickOPENMPSupport "" +#if !defined(MAGICKCORE_OPENMP_SUPPORT) +#define MagickOPENMPFeature "" #else -#define MagickOPENMPSupport "OpenMP " +#define MagickOPENMPFeature "OpenMP " #endif -#define MagickSupport MagickHDRISupport MagickOPENMPSupport -#define MagickVersion MagickPackageName " " MagickLibVersionText \ - MagickLibSubversion " " MagickReleaseDate " " MagickQuantumDepth " " \ - MagickSupport MagickAuthoritativeURL +#if !defined(MAGICKCORE_OPENCL_SUPPORT) +#define MagickOPENCLFeature "" +#else +#define MagickOPENCLFeature "OpenCL " +#endif +#define MagickFeatures \ + MagickHDRIFeature MagickOPENMPFeature MagickOPENCLFeature +#define MagickVersion \ + MagickPackageName " " MagickLibVersionText MagickLibSubversion " " \ + MagickReleaseDate " " MagickQuantumDepth " " MagickAuthoritativeURL extern MagickExport char *GetMagickHomeURL(void); diff --git a/tests/validate.c b/tests/validate.c index 77f424913..3a43c2633 100644 --- a/tests/validate.c +++ b/tests/validate.c @@ -1202,6 +1202,7 @@ static MagickBooleanType ValidateUsage(void) (void) printf("Version: %s\n",GetMagickVersion((unsigned long *) NULL)); (void) printf("Copyright: %s\n\n",GetMagickCopyright()); + (void) printf("Features: %s\n",GetMagickFeatures()); (void) printf("Usage: %s [options ...] reference-file\n",GetClientName()); (void) printf("\nValidate Settings:\n"); for (p=settings; *p != (char *) NULL; p++) diff --git a/wand/animate.c b/wand/animate.c index d276d5cc5..2544a87ed 100644 --- a/wand/animate.c +++ b/wand/animate.c @@ -186,6 +186,7 @@ static MagickBooleanType AnimateUsage(void) (void) printf("Version: %s\n",GetMagickVersion((unsigned long *) NULL)); (void) printf("Copyright: %s\n\n",GetMagickCopyright()); + (void) printf("Features: %s\n",GetMagickFeatures()); (void) printf("Usage: %s [options ...] file [ [options ...] file ...]\n", GetClientName()); (void) printf("\nImage Settings:\n"); diff --git a/wand/compare.c b/wand/compare.c index fe1803c8e..52f79dce6 100644 --- a/wand/compare.c +++ b/wand/compare.c @@ -148,6 +148,7 @@ static MagickBooleanType CompareUsage(void) (void) printf("Version: %s\n",GetMagickVersion((unsigned long *) NULL)); (void) printf("Copyright: %s\n\n",GetMagickCopyright()); + (void) printf("Features: %s\n",GetMagickFeatures()); (void) printf("Usage: %s [options ...] image reconstruct difference\n", GetClientName()); (void) printf("\nImage Settings:\n"); diff --git a/wand/composite.c b/wand/composite.c index 678bd53c1..3ab9c0467 100644 --- a/wand/composite.c +++ b/wand/composite.c @@ -334,6 +334,7 @@ static MagickBooleanType CompositeUsage(void) (void) printf("Version: %s\n",GetMagickVersion((unsigned long *) NULL)); (void) printf("Copyright: %s\n\n",GetMagickCopyright()); + (void) printf("Features: %s\n",GetMagickFeatures()); (void) printf("Usage: %s [options ...] image [options ...] composite\n" " [ [options ...] mask ] [options ...] composite\n", GetClientName()); diff --git a/wand/conjure.c b/wand/conjure.c index 269618dc6..e707f3b7e 100644 --- a/wand/conjure.c +++ b/wand/conjure.c @@ -114,6 +114,7 @@ static MagickBooleanType ConjureUsage(void) (void) printf("Version: %s\n",GetMagickVersion((unsigned long *) NULL)); (void) printf("Copyright: %s\n\n",GetMagickCopyright()); + (void) printf("Features: %s\n",GetMagickFeatures()); (void) printf("Usage: %s [options ...] file [ [options ...] file ...]\n", GetClientName()); (void) printf("\nImage Settings:\n"); diff --git a/wand/convert.c b/wand/convert.c index 8a607a43a..d181b89f1 100644 --- a/wand/convert.c +++ b/wand/convert.c @@ -411,6 +411,7 @@ static MagickBooleanType ConvertUsage(void) (void) printf("Version: %s\n",GetMagickVersion((unsigned long *) NULL)); (void) printf("Copyright: %s\n\n",GetMagickCopyright()); + (void) printf("Features: %s\n",GetMagickFeatures()); (void) printf("Usage: %s [options ...] file [ [options ...] " "file ...] [options ...] file\n",GetClientName()); (void) printf("\nImage Settings:\n"); diff --git a/wand/display.c b/wand/display.c index 798c1b0d9..40f55c573 100644 --- a/wand/display.c +++ b/wand/display.c @@ -221,6 +221,7 @@ static MagickBooleanType DisplayUsage(void) (void) printf("Version: %s\n",GetMagickVersion((unsigned long *) NULL)); (void) printf("Copyright: %s\n\n",GetMagickCopyright()); + (void) printf("Features: %s\n",GetMagickFeatures()); (void) printf("Usage: %s [options ...] file [ [options ...] file ...]\n", GetClientName()); (void) printf("\nImage Settings:\n"); diff --git a/wand/identify.c b/wand/identify.c index 12d985d1b..e366219b4 100644 --- a/wand/identify.c +++ b/wand/identify.c @@ -145,6 +145,7 @@ static MagickBooleanType IdentifyUsage(void) (void) printf("Version: %s\n",GetMagickVersion((unsigned long *) NULL)); (void) printf("Copyright: %s\n\n",GetMagickCopyright()); + (void) printf("Features: %s\n",GetMagickFeatures()); (void) printf("Usage: %s [options ...] file [ [options ...] " "file ... ]\n",GetClientName()); (void) printf("\nImage Settings:\n"); diff --git a/wand/import.c b/wand/import.c index 6a5312fef..2a7c6ae53 100644 --- a/wand/import.c +++ b/wand/import.c @@ -183,6 +183,7 @@ static MagickBooleanType ImportUsage(void) (void) printf("Version: %s\n",GetMagickVersion((unsigned long *) NULL)); (void) printf("Copyright: %s\n\n",GetMagickCopyright()); + (void) printf("Features: %s\n",GetMagickFeatures()); (void) printf("Usage: %s [options ...] [ file ]\n", GetClientName()); (void) printf("\nImage Settings:\n"); diff --git a/wand/mogrify.c b/wand/mogrify.c index 0d5f489f7..fee358465 100644 --- a/wand/mogrify.c +++ b/wand/mogrify.c @@ -3692,6 +3692,7 @@ static MagickBooleanType MogrifyUsage(void) (void) printf("Version: %s\n",GetMagickVersion((unsigned long *) NULL)); (void) printf("Copyright: %s\n\n",GetMagickCopyright()); + (void) printf("Features: %s\n",GetMagickFeatures()); (void) printf("Usage: %s [options ...] file [ [options ...] file ...]\n", GetClientName()); (void) printf("\nImage Settings:\n"); diff --git a/wand/montage.c b/wand/montage.c index 86329b38d..8c89a2862 100644 --- a/wand/montage.c +++ b/wand/montage.c @@ -214,6 +214,7 @@ static MagickBooleanType MontageUsage(void) (void) printf("Version: %s\n",GetMagickVersion((unsigned long *) NULL)); (void) printf("Copyright: %s\n\n",GetMagickCopyright()); + (void) printf("Features: %s\n",GetMagickFeatures()); (void) printf("Usage: %s [options ...] file [ [options ...] file ...] file\n", GetClientName()); (void) printf("\nImage Settings:\n"); diff --git a/wand/pixel-view.c b/wand/pixel-view.c index 9f4ce7bcd..7b752d07f 100644 --- a/wand/pixel-view.c +++ b/wand/pixel-view.c @@ -284,7 +284,7 @@ WandExport MagickBooleanType DuplexTransferPixelViewIterator( status=MagickTrue; progress=0; exception=destination->exception; -#if defined(_OPENMP) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) #pragma omp parallel for 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(_OPENMP) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) #pragma omp critical (MagickWand_DuplexTransferPixelViewIterator) #endif proceed=SetImageProgress(source_image,DuplexTransferPixelViewTag, @@ -544,7 +544,7 @@ WandExport MagickBooleanType GetPixelViewIterator(PixelView *source, source_image=source->wand->images; status=MagickTrue; progress=0; -#if defined(_OPENMP) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) #pragma omp parallel for 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(_OPENMP) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) #pragma omp critical (MagickWand_GetPixelViewIterator) #endif proceed=SetImageProgress(source_image,GetPixelViewTag,progress++, @@ -990,7 +990,7 @@ WandExport MagickBooleanType SetPixelViewIterator(PixelView *destination, status=MagickTrue; progress=0; exception=destination->exception; -#if defined(_OPENMP) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) #pragma omp parallel for 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(_OPENMP) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) #pragma omp critical (MagickWand_SetPixelViewIterator) #endif proceed=SetImageProgress(destination_image,SetPixelViewTag,progress++, @@ -1124,7 +1124,7 @@ WandExport MagickBooleanType TransferPixelViewIterator(PixelView *source, status=MagickTrue; progress=0; exception=destination->exception; -#if defined(_OPENMP) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) #pragma omp parallel for 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(_OPENMP) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) #pragma omp critical (MagickWand_TransferPixelViewIterator) #endif proceed=SetImageProgress(source_image,TransferPixelViewTag,progress++, @@ -1282,7 +1282,7 @@ WandExport MagickBooleanType UpdatePixelViewIterator(PixelView *source, status=MagickTrue; progress=0; exception=source->exception; -#if defined(_OPENMP) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) #pragma omp parallel for 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(_OPENMP) && (_OPENMP >= 200203) +#if defined(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203) #pragma omp critical (MagickWand_UpdatePixelViewIterator) #endif proceed=SetImageProgress(source_image,UpdatePixelViewTag,progress++, diff --git a/wand/stream.c b/wand/stream.c index 2eaca1523..55424d919 100644 --- a/wand/stream.c +++ b/wand/stream.c @@ -137,6 +137,7 @@ static MagickBooleanType StreamUsage(void) (void) printf("Version: %s\n",GetMagickVersion((unsigned long *) NULL)); (void) printf("Copyright: %s\n\n",GetMagickCopyright()); + (void) printf("Features: %s\n",GetMagickFeatures()); (void) printf("Usage: %s [options ...] input-image raw-image\n", GetClientName()); (void) printf("\nImage Settings:\n"); diff --git a/wand/studio.h b/wand/studio.h index b60a59aaa..52edfc7db 100644 --- a/wand/studio.h +++ b/wand/studio.h @@ -211,6 +211,7 @@ extern "C" { #if defined(_OPENMP) && (_OPENMP >= 200203) # include +# define MAGICKCORE_OPENMP_SUPPORT 1 #endif #if defined(MAGICKCORE_HAVE_PREAD) && defined(MAGICKCORE_HAVE_DECL_PREAD) && !MAGICKCORE_HAVE_DECL_PREAD -- 2.40.0