(no commit message)

diff --git a/coders/dpx.c b/coders/dpx.c
index 083f98860b726d7f60b0e7b896f39a8588e347bb..2335d2d80e9d738b23fbb506bfc6cc7e088789ef 100644 (file)
--- 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(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP > 200505)
+#if defined(_OPENMP) && (_OPENMP > 200505)
   #pragma omp parallel for schedule(static,1) 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(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP > 200505)
+#if defined(_OPENMP) && (_OPENMP > 200505)
   #pragma omp critical (MagickCore_ReadDPXImage)
 #endif
         {

diff --git a/coders/hald.c b/coders/hald.c
index 732101f341c8db9be36d59559cd2be2b3f3d4da4..9b538d9a7962077163c46a8df1717dd85c3471b6 100644 (file)
--- 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(MAGICKCORE_OPENMP_SUPPORT)
+#if defined(_OPENMP) && (_OPENMP > 200505)
   #pragma omp parallel for schedule(static,1) shared(status)
 #endif
   for (y=0; y < (long) image->rows; y+=(long) level)

diff --git a/coders/pnm.c b/coders/pnm.c
index e8b0fdfe7d5cb478e30a34aec6be1eb5cd5d4ea3..827cf3fc993987f631375b69bc6bbdcc66b3d1a2 100644 (file)
--- 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(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP > 200505)
+#if defined(_OPENMP) && (_OPENMP > 200505)
   #pragma omp parallel for schedule(static,1) 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(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP > 200505)
+#if defined(_OPENMP) && (_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(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP > 200505)
+#if defined(_OPENMP) && (_OPENMP > 200505)
   #pragma omp parallel for schedule(static,1) 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(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP > 200505)
+#if defined(_OPENMP) && (_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(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP > 200505)
+#if defined(_OPENMP) && (_OPENMP > 200505)
   #pragma omp parallel for schedule(static,1) 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(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP > 200505)
+#if defined(_OPENMP) && (_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(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP > 200505)
+#if defined(_OPENMP) && (_OPENMP > 200505)
   #pragma omp parallel for schedule(static,1) 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(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP > 200505)
+#if defined(_OPENMP) && (_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(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP > 200505)
+#if defined(_OPENMP) && (_OPENMP > 200505)
   #pragma omp parallel for schedule(static,1) 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(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP > 200505)
+#if defined(_OPENMP) && (_OPENMP > 200505)
   #pragma omp critical (MagickCore_ReadPNMImage)
 #endif
           {

diff --git a/magick/colorspace.c b/magick/colorspace.c
index c0123db3881cf2e6f0ae32294ac9710f45f3ce34..237c07145be069c9eadd8008356cd40b76c57b43 100644 (file)
--- 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(MAGICKCORE_OPENMP_SUPPORT)
+#if defined(_OPENMP) && (_OPENMP >= 200203)
   #pragma omp parallel for schedule(static,1) 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(MAGICKCORE_OPENMP_SUPPORT)
+#if defined(_OPENMP) && (_OPENMP >= 200203)
   #pragma omp parallel for schedule(static,1) 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(MAGICKCORE_OPENMP_SUPPORT)
+#if defined(_OPENMP) && (_OPENMP >= 200203)
   #pragma omp parallel for schedule(static,1) 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(MAGICKCORE_OPENMP_SUPPORT)
+#if defined(_OPENMP) && (_OPENMP >= 200203)
   #pragma omp parallel for schedule(static,1) 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(MAGICKCORE_OPENMP_SUPPORT)
+#if defined(_OPENMP) && (_OPENMP >= 200203)
   #pragma omp parallel for schedule(static,1) 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(MAGICKCORE_OPENMP_SUPPORT)
+#if defined(_OPENMP) && (_OPENMP >= 200203)
   #pragma omp parallel for schedule(static,1) 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(MAGICKCORE_OPENMP_SUPPORT)
+#if defined(_OPENMP) && (_OPENMP >= 200203)
   #pragma omp parallel for schedule(static,1)
 #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(MAGICKCORE_OPENMP_SUPPORT)
+#if defined(_OPENMP) && (_OPENMP >= 200203)
   #pragma omp parallel for schedule(static,1) 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(MAGICKCORE_OPENMP_SUPPORT)
+#if defined(_OPENMP) && (_OPENMP >= 200203)
   #pragma omp parallel for schedule(static,1)
 #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(MAGICKCORE_OPENMP_SUPPORT)
+#if defined(_OPENMP) && (_OPENMP >= 200203)
   #pragma omp parallel for schedule(static,1)
 #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(MAGICKCORE_OPENMP_SUPPORT)
+#if defined(_OPENMP) && (_OPENMP >= 200203)
   #pragma omp parallel for schedule(static,1)
 #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(MAGICKCORE_OPENMP_SUPPORT)
+#if defined(_OPENMP) && (_OPENMP >= 200203)
   #pragma omp parallel for schedule(static,1)
 #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(MAGICKCORE_OPENMP_SUPPORT)
+#if defined(_OPENMP) && (_OPENMP >= 200203)
   #pragma omp parallel for schedule(static,1)
 #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(MAGICKCORE_OPENMP_SUPPORT)
+#if defined(_OPENMP) && (_OPENMP >= 200203)
   #pragma omp parallel for schedule(static,1)
 #endif
       for (i=0; i <= (long) MaxMap; i++)
@@ -843,7 +843,7 @@ MagickExport MagickBooleanType RGBTransformImage(Image *image,
           Y = 0.2126560*R+0.7151580*G+0.0721856*B
           Z = 0.0193324*R+0.1191930*G+0.9504440*B
       */
-#if defined(MAGICKCORE_OPENMP_SUPPORT)
+#if defined(_OPENMP) && (_OPENMP >= 200203)
   #pragma omp parallel for schedule(static,1)
 #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(MAGICKCORE_OPENMP_SUPPORT)
+#if defined(_OPENMP) && (_OPENMP >= 200203)
   #pragma omp parallel for schedule(static,1)
 #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(MAGICKCORE_OPENMP_SUPPORT)
+#if defined(_OPENMP) && (_OPENMP >= 200203)
   #pragma omp parallel for schedule(static,1)
 #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(MAGICKCORE_OPENMP_SUPPORT)
+#if defined(_OPENMP) && (_OPENMP >= 200203)
   #pragma omp parallel for schedule(static,1)
 #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(MAGICKCORE_OPENMP_SUPPORT)
+#if defined(_OPENMP) && (_OPENMP >= 200203)
   #pragma omp parallel for schedule(static,1) shared(status)
 #endif
       for (y=0; y < (long) image->rows; y++)
@@ -1058,7 +1058,7 @@ MagickExport MagickBooleanType RGBTransformImage(Image *image,
             MagickBooleanType
               proceed;
 
-#if defined(MAGICKCORE_OPENMP_SUPPORT)
+#if defined(_OPENMP) && (_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(MAGICKCORE_OPENMP_SUPPORT)
+#if defined(_OPENMP) && (_OPENMP >= 200203)
   #pragma omp parallel for schedule(static,1) 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(MAGICKCORE_OPENMP_SUPPORT)
+#if defined(_OPENMP) && (_OPENMP >= 200203)
   #pragma omp parallel for schedule(static,1) 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(MAGICKCORE_OPENMP_SUPPORT)
+#if defined(_OPENMP) && (_OPENMP >= 200203)
   #pragma omp parallel for schedule(static,1) 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(MAGICKCORE_OPENMP_SUPPORT)
+#if defined(_OPENMP) && (_OPENMP >= 200203)
   #pragma omp parallel for schedule(static,1) 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(MAGICKCORE_OPENMP_SUPPORT)
+#if defined(_OPENMP) && (_OPENMP >= 200203)
   #pragma omp parallel for schedule(static,1) 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(MAGICKCORE_OPENMP_SUPPORT)
+#if defined(_OPENMP) && (_OPENMP >= 200203)
   #pragma omp parallel for schedule(static,1) 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(MAGICKCORE_OPENMP_SUPPORT)
+#if defined(_OPENMP) && (_OPENMP >= 200203)
   #pragma omp parallel for schedule(static,1) 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(MAGICKCORE_OPENMP_SUPPORT)
+#if defined(_OPENMP) && (_OPENMP >= 200203)
   #pragma omp parallel for schedule(static,1)
 #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(MAGICKCORE_OPENMP_SUPPORT)
+#if defined(_OPENMP) && (_OPENMP >= 200203)
   #pragma omp parallel for schedule(static,1)
 #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(MAGICKCORE_OPENMP_SUPPORT)
+#if defined(_OPENMP) && (_OPENMP >= 200203)
   #pragma omp parallel for schedule(static,1)
 #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(MAGICKCORE_OPENMP_SUPPORT)
+#if defined(_OPENMP) && (_OPENMP >= 200203)
   #pragma omp parallel for schedule(static,1)
 #endif
       for (i=0; i <= (long) MaxMap; i++)
@@ -2013,7 +2013,7 @@ MagickExport MagickBooleanType TransformRGBImage(Image *image,
           G = -0.9692580*X+1.8759900*Y+0.0415557*Z
           B =  0.0556352*X-0.2039960*Y+1.0570700*Z
       */
-#if defined(MAGICKCORE_OPENMP_SUPPORT)
+#if defined(_OPENMP) && (_OPENMP >= 200203)
   #pragma omp parallel for schedule(static,1)
 #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(MAGICKCORE_OPENMP_SUPPORT)
+#if defined(_OPENMP) && (_OPENMP >= 200203)
   #pragma omp parallel for schedule(static,1)
 #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(MAGICKCORE_OPENMP_SUPPORT)
+#if defined(_OPENMP) && (_OPENMP >= 200203)
   #pragma omp parallel for schedule(static,1)
 #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(MAGICKCORE_OPENMP_SUPPORT)
+#if defined(_OPENMP) && (_OPENMP >= 200203)
   #pragma omp parallel for schedule(static,1)
 #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(MAGICKCORE_OPENMP_SUPPORT)
+#if defined(_OPENMP) && (_OPENMP >= 200203)
   #pragma omp parallel for schedule(static,1)
 #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(MAGICKCORE_OPENMP_SUPPORT)
+#if defined(_OPENMP) && (_OPENMP >= 200203)
   #pragma omp parallel for schedule(static,1) shared(status)
 #endif
       for (y=0; y < (long) image->rows; y++)
@@ -2268,7 +2268,7 @@ MagickExport MagickBooleanType TransformRGBImage(Image *image,
             MagickBooleanType
               proceed;
 
-#if defined(MAGICKCORE_OPENMP_SUPPORT)
+#if defined(_OPENMP) && (_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(MAGICKCORE_OPENMP_SUPPORT)
+#if defined(_OPENMP) && (_OPENMP >= 200203)
   #pragma omp parallel for schedule(static,1) shared(status)
 #endif
       for (i=0; i < (long) image->colors; i++)

diff --git a/magick/compare.c b/magick/compare.c
index 8271a2b9ad7e4c3ed1a3f6855e50963454450d39..5cb1c2dc0f8856fb506a7bdce7753daeedf90298 100644 (file)
--- 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(MAGICKCORE_OPENMP_SUPPORT)
+#if defined(_OPENMP) && (_OPENMP >= 200203)
   #pragma omp parallel for schedule(static,1) 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(MAGICKCORE_OPENMP_SUPPORT)
+#if defined(_OPENMP) && (_OPENMP >= 200203)
   #pragma omp parallel for schedule(static,1) shared(status)
 #endif
   for (y=0; y < (long) image->rows; y++)
@@ -432,7 +432,7 @@ static MagickBooleanType GetAbsoluteError(const Image *image,
       p++;
       q++;
     }
-#if defined(MAGICKCORE_OPENMP_SUPPORT)
+#if defined(_OPENMP) && (_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(MAGICKCORE_OPENMP_SUPPORT)
+#if defined(_OPENMP) && (_OPENMP >= 200203)
   #pragma omp parallel for schedule(static,1) shared(status)
 #endif
   for (y=0; y < (long) image->rows; y++)
@@ -559,7 +559,7 @@ static MagickBooleanType GetMeanAbsoluteError(const Image *image,
       p++;
       q++;
     }
-#if defined(MAGICKCORE_OPENMP_SUPPORT)
+#if defined(_OPENMP) && (_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(MAGICKCORE_OPENMP_SUPPORT)
+#if defined(_OPENMP) && (_OPENMP >= 200203)
   #pragma omp parallel for schedule(static,1) shared(status)
 #endif
   for (y=0; y < (long) image->rows; y++)
@@ -797,7 +797,7 @@ static MagickBooleanType GetMeanSquaredError(const Image *image,
       p++;
       q++;
     }
-#if defined(MAGICKCORE_OPENMP_SUPPORT)
+#if defined(_OPENMP) && (_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(MAGICKCORE_OPENMP_SUPPORT)
+#if defined(_OPENMP) && (_OPENMP >= 200203)
   #pragma omp parallel for schedule(static,1) shared(status)
 #endif
   for (y=0; y < (long) image->rows; y++)
@@ -913,7 +913,7 @@ static MagickBooleanType GetPeakAbsoluteError(const Image *image,
       p++;
       q++;
     }
-#if defined(MAGICKCORE_OPENMP_SUPPORT)
+#if defined(_OPENMP) && (_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(MAGICKCORE_OPENMP_SUPPORT)
+#if defined(_OPENMP) && (_OPENMP >= 200203)
   #pragma omp parallel for schedule(static,1) shared(status)
 #endif
   for (y=0; y < (long) reference->rows; y++)
@@ -1460,7 +1460,7 @@ static double GetSimilarityMetric(const Image *image,const Image *reference,
             reference_indexes[x]);
           thread_similarity+=distance*distance;
         }
-#if defined(MAGICKCORE_OPENMP_SUPPORT)
+#if defined(_OPENMP) && (_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(MAGICKCORE_OPENMP_SUPPORT)
+#if defined(_OPENMP) && (_OPENMP >= 200203)
   #pragma omp parallel for schedule(static,1) shared(progress,status)
 #endif
   for (y=0; y < (long) (image->rows-reference->rows+1); y++)
@@ -1549,7 +1549,7 @@ MagickExport Image *SimilarityImage(Image *image,const Image *reference,
     for (x=0; x < (long) (image->columns-reference->columns+1); x++)
     {
       similarity=GetSimilarityMetric(image,reference,x,y,exception);
-#if defined(MAGICKCORE_OPENMP_SUPPORT)
+#if defined(_OPENMP) && (_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(MAGICKCORE_OPENMP_SUPPORT)
+#if defined(_OPENMP) && (_OPENMP >= 200203)
   #pragma omp critical (MagickCore_SimilarityImage)
 #endif
         proceed=SetImageProgress(image,SimilarityImageTag,progress++,

diff --git a/magick/composite.c b/magick/composite.c
index c51da7e05268de7cb424692011f153e95fd9dbe5..61f28f8bf5283f8727d2fc0acf7bd5d4cf9350b8 100644 (file)
--- a/magick/composite.c
+++ b/magick/composite.c
@@ -1767,7 +1767,7 @@ MagickExport MagickBooleanType CompositeImageChannel(Image *image,
   exception=(&image->exception);
   image_view=AcquireCacheView(image);
   composite_view=AcquireCacheView(composite_image);
-#if defined(MAGICKCORE_OPENMP_SUPPORT)
+#if defined(_OPENMP) && (_OPENMP >= 200203)
   #pragma omp parallel for schedule(static,1) shared(progress,status)
 #endif
   for (y=0; y < (long) image->rows; y++)
@@ -2354,7 +2354,7 @@ MagickExport MagickBooleanType CompositeImageChannel(Image *image,
         MagickBooleanType
           proceed;
 
-#if defined(MAGICKCORE_OPENMP_SUPPORT)
+#if defined(_OPENMP) && (_OPENMP >= 200203)
   #pragma omp critical (MagickCore_CompositeImageChannel)
 #endif
         proceed=SetImageProgress(image,CompositeImageTag,progress++,

diff --git a/magick/decorate.c b/magick/decorate.c
index 2818feb34be5ac20e0299c4bbc94a3edeb571e94..210d16bcb4e5f3a7fd9a5e5a2b6bdfdcc7c25c80 100644 (file)
--- a/magick/decorate.c
+++ b/magick/decorate.c
@@ -401,7 +401,7 @@ MagickExport Image *FrameImage(const Image *image,const FrameInfo *frame_info,
   /*
     Draw sides of ornamental border.
   */
-#if defined(MAGICKCORE_OPENMP_SUPPORT)
+#if defined(_OPENMP) && (_OPENMP >= 200203)
   #pragma omp parallel for schedule(static,1) shared(progress,status)
 #endif
   for (y=0; y < (long) image->rows; y++)
@@ -481,7 +481,7 @@ MagickExport Image *FrameImage(const Image *image,const FrameInfo *frame_info,
         MagickBooleanType
           proceed;
 
-#if defined(MAGICKCORE_OPENMP_SUPPORT)
+#if defined(_OPENMP) && (_OPENMP >= 200203)
   #pragma omp critical (MagickCore_FrameImage)
 #endif
         proceed=SetImageProgress(image,FrameImageTag,progress++,image->rows);
@@ -691,7 +691,7 @@ MagickExport MagickBooleanType RaiseImage(Image *image,
   progress=0;
   exception=(&image->exception);
   image_view=AcquireCacheView(image);
-#if defined(MAGICKCORE_OPENMP_SUPPORT)
+#if defined(_OPENMP) && (_OPENMP >= 200203)
   #pragma omp parallel for schedule(static,1) shared(progress,status)
 #endif
   for (y=0; y < (long) raise_info->height; y++)
@@ -758,7 +758,7 @@ MagickExport MagickBooleanType RaiseImage(Image *image,
           status=MagickFalse;
       }
   }
-#if defined(MAGICKCORE_OPENMP_SUPPORT)
+#if defined(_OPENMP) && (_OPENMP >= 200203)
   #pragma omp parallel for schedule(static,1) shared(progress,status)
 #endif
   for (y=(long) raise_info->height; y < (long) (image->rows-raise_info->height); y++)
@@ -814,7 +814,7 @@ MagickExport MagickBooleanType RaiseImage(Image *image,
           status=MagickFalse;
       }
   }
-#if defined(MAGICKCORE_OPENMP_SUPPORT)
+#if defined(_OPENMP) && (_OPENMP >= 200203)
   #pragma omp parallel for schedule(static,1) shared(progress,status)
 #endif
   for (y=(long) (image->rows-raise_info->height); y < (long) image->rows; y++)
@@ -873,7 +873,7 @@ MagickExport MagickBooleanType RaiseImage(Image *image,
         MagickBooleanType
           proceed;
 
-#if defined(MAGICKCORE_OPENMP_SUPPORT)
+#if defined(_OPENMP) && (_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 81e564291a0d1f041efae659252787aba2de057b..1a3e9f0da8f3e78a3ca9eeed9a7df59390f32388 100644 (file)
--- a/magick/deprecate.c
+++ b/magick/deprecate.c
@@ -1705,7 +1705,7 @@ MagickExport Image *ExtractSubimageFromImage(Image *image,
     return((Image *) NULL);
   similarity_threshold=image->columns*image->rows;
   SetGeometry(reference,&offset);
-#if defined(MAGICKCORE_OPENMP_SUPPORT)
+#if defined(_OPENMP) && (_OPENMP >= 200203)
   #pragma omp parallel for schedule(static,1)
 #endif
   for (y=0; y < (long) (image->rows-reference->rows); y++)
@@ -1720,7 +1720,7 @@ MagickExport Image *ExtractSubimageFromImage(Image *image,
     {
       similarity=GetSimilarityMetric(image,reference,x,y,similarity_threshold,
         exception);
-#if defined(MAGICKCORE_OPENMP_SUPPORT)
+#if defined(_OPENMP) && (_OPENMP >= 200203)
   #pragma omp critical (MagickCore_ExtractSubimageFromImage)
 #endif
       if (similarity < similarity_threshold)

diff --git a/magick/distort.c b/magick/distort.c
index 8dc73a405b08913cee0c161782dc63238ac9fced..5f2dea2411c00a10eee6d22306e90a734a43bee5 100644 (file)
--- a/magick/distort.c
+++ b/magick/distort.c
@@ -1869,7 +1869,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(MAGICKCORE_OPENMP_SUPPORT)
+#if defined(_OPENMP) && (_OPENMP >= 200203)
   #pragma omp parallel for schedule(static,1) shared(progress,status)
 #endif
     for (j=0; j < (long) distort_image->rows; j++)
@@ -2217,7 +2217,7 @@ fprintf(stderr, "s=%lf,%lf   b=%lf  r=%lf\n", s.x,s.y,b,r );
           MagickBooleanType
             proceed;
 
-#if defined(MAGICKCORE_OPENMP_SUPPORT)
+#if defined(_OPENMP) && (_OPENMP >= 200203)
   #pragma omp critical (MagickCore_DistortImage)
 #endif
           proceed=SetImageProgress(image,DistortImageTag,progress++,
@@ -2424,7 +2424,7 @@ MagickExport Image *SparseColorImage(const Image *image,
     progress=0;
     GetMagickPixelPacket(sparse_image,&zero);
     sparse_view=AcquireCacheView(sparse_image);
-#if defined(MAGICKCORE_OPENMP_SUPPORT)
+#if defined(_OPENMP) && (_OPENMP >= 200203)
   #pragma omp parallel for schedule(static,1) shared(progress,status)
 #endif
     for (j=0; j < (long) sparse_image->rows; j++)
@@ -2583,7 +2583,7 @@ MagickExport Image *SparseColorImage(const Image *image,
           MagickBooleanType
             proceed;
 
-#if defined(MAGICKCORE_OPENMP_SUPPORT)
+#if defined(_OPENMP) && (_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 ece53e94da182eaae401cf1037547911aca648d7..7ca5f70eb1339c483e5da54ac82f628f32c73db8 100644 (file)
--- 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(MAGICKCORE_OPENMP_SUPPORT)
+#if defined(_OPENMP) && (_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(MAGICKCORE_OPENMP_SUPPORT)
+#if defined(_OPENMP) && (_OPENMP >= 200203)
   #pragma omp critical
 #endif
   status=GetOneVirtualMethodPixel(pattern,TileVirtualPixelMethod,

diff --git a/magick/draw.c b/magick/draw.c
index b63dea78a2df4865cd65e8ff00518ffd40e09f8f..1aa8c32fbd746f457eb63e9d3e5ddf36c70177e5 100644 (file)
--- 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(MAGICKCORE_OPENMP_SUPPORT)
+#if defined(_OPENMP) && (_OPENMP >= 200203)
   #pragma omp parallel for schedule(static,1) 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(MAGICKCORE_OPENMP_SUPPORT)
+#if defined(_OPENMP) && (_OPENMP >= 200203)
   #pragma omp parallel for schedule(static,1) 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(MAGICKCORE_OPENMP_SUPPORT)
+#if defined(_OPENMP) && (_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(MAGICKCORE_OPENMP_SUPPORT)
+#if defined(_OPENMP) && (_OPENMP >= 200203)
   #pragma omp parallel for schedule(static,1) shared(status)
 #endif
   for (y=(long) (bounds.y1+0.5); y <= (long) (bounds.y2+0.5); y++)

diff --git a/magick/effect.c b/magick/effect.c
index d3bbc526d672b5d0c4485d2f87e94119e9f5a3e2..fc24328242db9c069a3b7ff96978d107e47f6894 100644 (file)
--- 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(MAGICKCORE_OPENMP_SUPPORT)
+#if defined(_OPENMP) && (_OPENMP >= 200203)
   #pragma omp parallel for schedule(static,1) 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(MAGICKCORE_OPENMP_SUPPORT)
+#if defined(_OPENMP) && (_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(MAGICKCORE_OPENMP_SUPPORT)
+#if defined(_OPENMP) && (_OPENMP >= 200203)
   #pragma omp parallel for schedule(static,1) 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(MAGICKCORE_OPENMP_SUPPORT)
+#if defined(_OPENMP) && (_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(MAGICKCORE_OPENMP_SUPPORT)
+#if defined(_OPENMP) && (_OPENMP >= 200203)
   #pragma omp parallel for schedule(static,1) 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(MAGICKCORE_OPENMP_SUPPORT)
+#if defined(_OPENMP) && (_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(MAGICKCORE_OPENMP_SUPPORT)
+#if defined(_OPENMP) && (_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(MAGICKCORE_OPENMP_SUPPORT)
+#if defined(_OPENMP) && (_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(MAGICKCORE_OPENMP_SUPPORT)
+#if defined(_OPENMP) && (_OPENMP >= 200203)
   #pragma omp parallel for schedule(static,1) 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(MAGICKCORE_OPENMP_SUPPORT)
+#if defined(_OPENMP) && (_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(MAGICKCORE_OPENMP_SUPPORT)
+#if defined(_OPENMP) && (_OPENMP >= 200203)
   #pragma omp parallel for schedule(static,1) 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(MAGICKCORE_OPENMP_SUPPORT)
+#if defined(_OPENMP) && (_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(MAGICKCORE_OPENMP_SUPPORT)
+#if defined(_OPENMP) && (_OPENMP >= 200203)
   #pragma omp parallel for schedule(static,1) 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(MAGICKCORE_OPENMP_SUPPORT)
+#if defined(_OPENMP) && (_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(MAGICKCORE_OPENMP_SUPPORT)
+#if defined(_OPENMP) && (_OPENMP >= 200203)
   #pragma omp parallel for schedule(static,1) 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(MAGICKCORE_OPENMP_SUPPORT)
+#if defined(_OPENMP) && (_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(MAGICKCORE_OPENMP_SUPPORT)
+#if defined(_OPENMP) && (_OPENMP >= 200203)
   #pragma omp parallel for schedule(static,1) 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(MAGICKCORE_OPENMP_SUPPORT)
+#if defined(_OPENMP) && (_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(MAGICKCORE_OPENMP_SUPPORT)
+#if defined(_OPENMP) && (_OPENMP >= 200203)
   #pragma omp parallel for schedule(static,1) 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(MAGICKCORE_OPENMP_SUPPORT)
+#if defined(_OPENMP) && (_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(MAGICKCORE_OPENMP_SUPPORT)
+#if defined(_OPENMP) && (_OPENMP >= 200203)
   #pragma omp parallel for schedule(static,1) 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(MAGICKCORE_OPENMP_SUPPORT)
+#if defined(_OPENMP) && (_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(MAGICKCORE_OPENMP_SUPPORT)
+#if defined(_OPENMP) && (_OPENMP >= 200203)
   #pragma omp parallel for schedule(static,1) 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(MAGICKCORE_OPENMP_SUPPORT)
+#if defined(_OPENMP) && (_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(MAGICKCORE_OPENMP_SUPPORT)
+#if defined(_OPENMP) && (_OPENMP >= 200203)
   #pragma omp parallel for schedule(static,1) 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(MAGICKCORE_OPENMP_SUPPORT)
+#if defined(_OPENMP) && (_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 5f012b8fdd8ef9a9e9d500ecbc85d775925b9a96..3e90c65aa0774e49d793a1319dff063b7206654a 100644 (file)
--- 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(MAGICKCORE_OPENMP_SUPPORT)
+#if defined(_OPENMP) && (_OPENMP >= 200203)
   #pragma omp parallel for schedule(static,1)
 #endif
   for (i=0; i <= (long) MaxMap; i++)
@@ -479,7 +479,7 @@ MagickExport MagickBooleanType ColorDecisionListImage(Image *image,
       /*
         Apply transfer function to colormap.
       */
-#if defined(MAGICKCORE_OPENMP_SUPPORT)
+#if defined(_OPENMP) && (_OPENMP >= 200203)
   #pragma omp parallel for schedule(static,1) 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(MAGICKCORE_OPENMP_SUPPORT)
+#if defined(_OPENMP) && (_OPENMP >= 200203)
   #pragma omp parallel for schedule(static,1) shared(progress,status)
 #endif
   for (y=0; y < (long) image->rows; y++)
@@ -545,7 +545,7 @@ MagickExport MagickBooleanType ColorDecisionListImage(Image *image,
         MagickBooleanType
           proceed;
 
-#if defined(MAGICKCORE_OPENMP_SUPPORT)
+#if defined(_OPENMP) && (_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(MAGICKCORE_OPENMP_SUPPORT)
+#if defined(_OPENMP) && (_OPENMP >= 200203)
   #pragma omp parallel for schedule(static,1) shared(progress,status)
 #endif
   for (y=0; y < (long) image->rows; y++)
@@ -769,7 +769,7 @@ MagickExport MagickBooleanType ClutImageChannel(Image *image,
         MagickBooleanType
           proceed;
 
-#if defined(MAGICKCORE_OPENMP_SUPPORT)
+#if defined(_OPENMP) && (_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(MAGICKCORE_OPENMP_SUPPORT)
+#if defined(_OPENMP) && (_OPENMP >= 200203)
   #pragma omp parallel for schedule(static,1) shared(progress,status)
 #endif
   for (y=0; y < (long) image->rows; y++)
@@ -917,7 +917,7 @@ MagickExport MagickBooleanType ContrastImage(Image *image,
         MagickBooleanType
           proceed;
 
-#if defined(MAGICKCORE_OPENMP_SUPPORT)
+#if defined(_OPENMP) && (_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(MAGICKCORE_OPENMP_SUPPORT)
+#if defined(_OPENMP) && (_OPENMP >= 200203)
   #pragma omp parallel for schedule(static,1) shared(progress,status)
 #endif
   for (i=0; i <= (long) MaxMap; i++)
@@ -1306,7 +1306,7 @@ MagickExport MagickBooleanType ContrastStretchImageChannel(Image *image,
       /*
         Stretch colormap.
       */
-#if defined(MAGICKCORE_OPENMP_SUPPORT)
+#if defined(_OPENMP) && (_OPENMP >= 200203)
   #pragma omp parallel for schedule(static,1) 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(MAGICKCORE_OPENMP_SUPPORT)
+#if defined(_OPENMP) && (_OPENMP >= 200203)
   #pragma omp parallel for schedule(static,1) shared(progress,status)
 #endif
   for (y=0; y < (long) image->rows; y++)
@@ -1406,7 +1406,7 @@ MagickExport MagickBooleanType ContrastStretchImageChannel(Image *image,
         MagickBooleanType
           proceed;
 
-#if defined(MAGICKCORE_OPENMP_SUPPORT)
+#if defined(_OPENMP) && (_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(MAGICKCORE_OPENMP_SUPPORT)
+#if defined(_OPENMP) && (_OPENMP >= 200203)
   #pragma omp parallel for schedule(static,1) shared(progress,status)
 #endif
   for (y=0; y < (long) image->rows; y++)
@@ -1597,7 +1597,7 @@ MagickExport Image *EnhanceImage(const Image *image,ExceptionInfo *exception)
         MagickBooleanType
           proceed;
 
-#if defined(MAGICKCORE_OPENMP_SUPPORT)
+#if defined(_OPENMP) && (_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(MAGICKCORE_OPENMP_SUPPORT)
+#if defined(_OPENMP) && (_OPENMP >= 200203)
   #pragma omp parallel for schedule(static,1) shared(progress,status)
 #endif
   for (i=0; i <= (long) MaxMap; i++)
@@ -1785,7 +1785,7 @@ MagickExport MagickBooleanType EqualizeImageChannel(Image *image,
       /*
         Equalize colormap.
       */
-#if defined(MAGICKCORE_OPENMP_SUPPORT)
+#if defined(_OPENMP) && (_OPENMP >= 200203)
   #pragma omp parallel for schedule(static,1) 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(MAGICKCORE_OPENMP_SUPPORT)
+#if defined(_OPENMP) && (_OPENMP >= 200203)
   #pragma omp parallel for schedule(static,1) shared(progress,status)
 #endif
   for (y=0; y < (long) image->rows; y++)
@@ -1861,7 +1861,7 @@ MagickExport MagickBooleanType EqualizeImageChannel(Image *image,
         MagickBooleanType
           proceed;
 
-#if defined(MAGICKCORE_OPENMP_SUPPORT)
+#if defined(_OPENMP) && (_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(MAGICKCORE_OPENMP_SUPPORT)
+#if defined(_OPENMP) && (_OPENMP >= 200203)
   #pragma omp parallel for schedule(static,1)
 #endif
     for (i=0; i <= (long) MaxMap; i++)
@@ -1999,7 +1999,7 @@ MagickExport MagickBooleanType GammaImageChannel(Image *image,
       /*
         Gamma-correct colormap.
       */
-#if defined(MAGICKCORE_OPENMP_SUPPORT)
+#if defined(_OPENMP) && (_OPENMP >= 200203)
   #pragma omp parallel for schedule(static,1) 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(MAGICKCORE_OPENMP_SUPPORT)
+#if defined(_OPENMP) && (_OPENMP >= 200203)
   #pragma omp parallel for schedule(static,1) shared(progress,status)
 #endif
   for (y=0; y < (long) image->rows; y++)
@@ -2084,7 +2084,7 @@ MagickExport MagickBooleanType GammaImageChannel(Image *image,
         MagickBooleanType
           proceed;
 
-#if defined(MAGICKCORE_OPENMP_SUPPORT)
+#if defined(_OPENMP) && (_OPENMP >= 200203)
   #pragma omp critical (MagickCore_GammaImageChannel)
 #endif
         proceed=SetImageProgress(image,GammaCorrectImageTag,progress++,
@@ -2211,7 +2211,7 @@ MagickExport MagickBooleanType HaldClutImageChannel(Image *image,
   resample_filter=AcquireResampleFilterThreadSet(hald_image,MagickTrue,
     exception);
   image_view=AcquireCacheView(image);
-#if defined(MAGICKCORE_OPENMP_SUPPORT)
+#if defined(_OPENMP) && (_OPENMP >= 200203)
   #pragma omp parallel for schedule(static,1) shared(progress,status)
 #endif
   for (y=0; y < (long) image->rows; y++)
@@ -2298,7 +2298,7 @@ MagickExport MagickBooleanType HaldClutImageChannel(Image *image,
         MagickBooleanType
           proceed;
 
-#if defined(MAGICKCORE_OPENMP_SUPPORT)
+#if defined(_OPENMP) && (_OPENMP >= 200203)
   #pragma omp critical (MagickCore_HaldClutImageChannel)
 #endif
         proceed=SetImageProgress(image,HaldClutImageTag,progress++,image->rows);
@@ -2469,7 +2469,7 @@ MagickExport MagickBooleanType LevelImageChannel(Image *image,
   if (image->debug != MagickFalse)
     (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
   if (image->storage_class == PseudoClass)
-#if defined(MAGICKCORE_OPENMP_SUPPORT)
+#if defined(_OPENMP) && (_OPENMP >= 200203)
   #pragma omp parallel for schedule(static,1) shared(progress,status)
 #endif
     for (i=0; i < (long) image->colors; i++)
@@ -2493,7 +2493,7 @@ MagickExport MagickBooleanType LevelImageChannel(Image *image,
   progress=0;
   exception=(&image->exception);
   image_view=AcquireCacheView(image);
-#if defined(MAGICKCORE_OPENMP_SUPPORT)
+#if defined(_OPENMP) && (_OPENMP >= 200203)
   #pragma omp parallel for schedule(static,1) shared(progress,status)
 #endif
   for (y=0; y < (long) image->rows; y++)
@@ -2539,7 +2539,7 @@ MagickExport MagickBooleanType LevelImageChannel(Image *image,
         MagickBooleanType
           proceed;
 
-#if defined(MAGICKCORE_OPENMP_SUPPORT)
+#if defined(_OPENMP) && (_OPENMP >= 200203)
   #pragma omp critical (MagickCore_LevelImageChannel)
 #endif
         proceed=SetImageProgress(image,LevelImageTag,progress++,image->rows);
@@ -2626,7 +2626,7 @@ MagickExport MagickBooleanType LevelizeImageChannel(Image *image,
   if (image->debug != MagickFalse)
     (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",image->filename);
   if (image->storage_class == PseudoClass)
-#if defined(MAGICKCORE_OPENMP_SUPPORT)
+#if defined(_OPENMP) && (_OPENMP >= 200203)
   #pragma omp parallel for schedule(static,1) shared(progress,status)
 #endif
     for (i=0; i < (long) image->colors; i++)
@@ -2650,7 +2650,7 @@ MagickExport MagickBooleanType LevelizeImageChannel(Image *image,
   progress=0;
   exception=(&image->exception);
   image_view=AcquireCacheView(image);
-#if defined(MAGICKCORE_OPENMP_SUPPORT)
+#if defined(_OPENMP) && (_OPENMP >= 200203)
   #pragma omp parallel for schedule(static,1) shared(progress,status)
 #endif
   for (y=0; y < (long) image->rows; y++)
@@ -2696,7 +2696,7 @@ MagickExport MagickBooleanType LevelizeImageChannel(Image *image,
         MagickBooleanType
           proceed;
 
-#if defined(MAGICKCORE_OPENMP_SUPPORT)
+#if defined(_OPENMP) && (_OPENMP >= 200203)
   #pragma omp critical (MagickCore_LevelizeImageChannel)
 #endif
         proceed=SetImageProgress(image,LevelizeImageTag,progress++,image->rows);
@@ -3085,7 +3085,7 @@ MagickExport MagickBooleanType ModulateImage(Image *image,const char *modulate)
       /*
         Modulate colormap.
       */
-#if defined(MAGICKCORE_OPENMP_SUPPORT)
+#if defined(_OPENMP) && (_OPENMP >= 200203)
   #pragma omp parallel for schedule(static,1) shared(progress,status)
 #endif
       for (i=0; i < (long) image->colors; i++)
@@ -3122,7 +3122,7 @@ MagickExport MagickBooleanType ModulateImage(Image *image,const char *modulate)
   progress=0;
   exception=(&image->exception);
   image_view=AcquireCacheView(image);
-#if defined(MAGICKCORE_OPENMP_SUPPORT)
+#if defined(_OPENMP) && (_OPENMP >= 200203)
   #pragma omp parallel for schedule(static,1) shared(progress,status)
 #endif
   for (y=0; y < (long) image->rows; y++)
@@ -3174,7 +3174,7 @@ MagickExport MagickBooleanType ModulateImage(Image *image,const char *modulate)
         MagickBooleanType
           proceed;
 
-#if defined(MAGICKCORE_OPENMP_SUPPORT)
+#if defined(_OPENMP) && (_OPENMP >= 200203)
   #pragma omp critical (MagickCore_ModulateImage)
 #endif
         proceed=SetImageProgress(image,ModulateImageTag,progress++,image->rows);
@@ -3257,7 +3257,7 @@ MagickExport MagickBooleanType NegateImageChannel(Image *image,
       /*
         Negate colormap.
       */
-#if defined(MAGICKCORE_OPENMP_SUPPORT)
+#if defined(_OPENMP) && (_OPENMP >= 200203)
   #pragma omp parallel for schedule(static,1) shared(progress,status)
 #endif
       for (i=0; i < (long) image->colors; i++)
@@ -3286,7 +3286,7 @@ MagickExport MagickBooleanType NegateImageChannel(Image *image,
   image_view=AcquireCacheView(image);
   if (grayscale != MagickFalse)
     {
-#if defined(MAGICKCORE_OPENMP_SUPPORT)
+#if defined(_OPENMP) && (_OPENMP >= 200203)
   #pragma omp parallel for schedule(static,1) shared(progress,status)
 #endif
       for (y=0; y < (long) image->rows; y++)
@@ -3341,7 +3341,7 @@ MagickExport MagickBooleanType NegateImageChannel(Image *image,
             MagickBooleanType
               proceed;
 
-#if defined(MAGICKCORE_OPENMP_SUPPORT)
+#if defined(_OPENMP) && (_OPENMP >= 200203)
   #pragma omp critical (MagickCore_NegateImageChannel)
 #endif
             proceed=SetImageProgress(image,NegateImageTag,progress++,
@@ -3356,7 +3356,7 @@ MagickExport MagickBooleanType NegateImageChannel(Image *image,
   /*
     Negate image.
   */
-#if defined(MAGICKCORE_OPENMP_SUPPORT)
+#if defined(_OPENMP) && (_OPENMP >= 200203)
   #pragma omp parallel for schedule(static,1) shared(progress,status)
 #endif
   for (y=0; y < (long) image->rows; y++)
@@ -3401,7 +3401,7 @@ MagickExport MagickBooleanType NegateImageChannel(Image *image,
         MagickBooleanType
           proceed;
 
-#if defined(MAGICKCORE_OPENMP_SUPPORT)
+#if defined(_OPENMP) && (_OPENMP >= 200203)
   #pragma omp critical (MagickCore_NegateImageChannel)
 #endif
         proceed=SetImageProgress(image,NegateImageTag,progress++,image->rows);
@@ -3565,7 +3565,7 @@ MagickExport MagickBooleanType SigmoidalContrastImageChannel(Image *image,
     ThrowBinaryException(ResourceLimitError,"MemoryAllocationFailed",
       image->filename);
   (void) ResetMagickMemory(sigmoidal_map,0,(MaxMap+1)*sizeof(*sigmoidal_map));
-#if defined(MAGICKCORE_OPENMP_SUPPORT)
+#if defined(_OPENMP) && (_OPENMP >= 200203)
   #pragma omp parallel for schedule(static,1) shared(progress,status)
 #endif
   for (i=0; i <= (long) MaxMap; i++)
@@ -3595,7 +3595,7 @@ MagickExport MagickBooleanType SigmoidalContrastImageChannel(Image *image,
       /*
         Sigmoidal-contrast enhance colormap.
       */
-#if defined(MAGICKCORE_OPENMP_SUPPORT)
+#if defined(_OPENMP) && (_OPENMP >= 200203)
   #pragma omp parallel for schedule(static,1) shared(progress,status)
 #endif
       for (i=0; i < (long) image->colors; i++)
@@ -3621,7 +3621,7 @@ MagickExport MagickBooleanType SigmoidalContrastImageChannel(Image *image,
   progress=0;
   exception=(&image->exception);
   image_view=AcquireCacheView(image);
-#if defined(MAGICKCORE_OPENMP_SUPPORT)
+#if defined(_OPENMP) && (_OPENMP >= 200203)
   #pragma omp parallel for schedule(static,1) shared(progress,status)
 #endif
   for (y=0; y < (long) image->rows; y++)
@@ -3667,7 +3667,7 @@ MagickExport MagickBooleanType SigmoidalContrastImageChannel(Image *image,
         MagickBooleanType
           proceed;
 
-#if defined(MAGICKCORE_OPENMP_SUPPORT)
+#if defined(_OPENMP) && (_OPENMP >= 200203)
   #pragma omp critical (MagickCore_SigmoidalContrastImageChannel)
 #endif
         proceed=SetImageProgress(image,SigmoidalContrastImageTag,progress++,

diff --git a/magick/fourier.c b/magick/fourier.c
index e5267c08ea00082d63422817df9e2488a2663a1d..90dc015816ab369f9d385e9109bdeee83312e03b 100644 (file)
--- a/magick/fourier.c
+++ b/magick/fourier.c
@@ -490,7 +490,7 @@ static MagickBooleanType ForwardFourierTransform(FourierInfo *fourier_info,
       source=(double *) RelinquishMagickMemory(source);
       return(MagickFalse);
     }
-#if defined(MAGICKCORE_OPENMP_SUPPORT)
+#if defined(_OPENMP) && (_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(MAGICKCORE_OPENMP_SUPPORT)
+#if defined(_OPENMP) && (_OPENMP >= 200203)
   #pragma omp parallel for schedule(static,1) shared(status)
 #endif
             for (i=0L; i < 5L; i++)
@@ -1033,7 +1033,7 @@ static MagickBooleanType InverseFourierTransform(FourierInfo *fourier_info,
         ResourceLimitError,"MemoryAllocationFailed","`%s'",image->filename);
       return(MagickFalse);
     }
-#if defined(MAGICKCORE_OPENMP_SUPPORT)
+#if defined(_OPENMP) && (_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(MAGICKCORE_OPENMP_SUPPORT)
+#if defined(_OPENMP) && (_OPENMP >= 200203)
         #pragma omp parallel for schedule(static,1) shared(status)
 #endif
         for (i=0L; i < 5L; i++)

diff --git a/magick/fx.c b/magick/fx.c
index d012e9d4405494687ad1b4cbd741666176032196..e450c2a3718e354aaf2a5d2a0631ce65eb60b634 100644 (file)
--- a/magick/fx.c
+++ b/magick/fx.c
@@ -398,7 +398,7 @@ MagickExport Image *AddNoiseImageChannel(const Image *image,
         MagickBooleanType
           proceed;
 
-#if defined(MAGICKCORE_OPENMP_SUPPORT)
+#if defined(_OPENMP) && (_OPENMP >= 200203)
         #pragma omp critical (MagickCore_AverageImages)
 #endif
         proceed=SetImageProgress(image,AddNoiseImageTag,progress++,
@@ -957,7 +957,7 @@ MagickExport Image *ConvolveImageChannel(const Image *image,
   bias=image->bias;
   image_view=AcquireCacheView(image);
   convolve_view=AcquireCacheView(convolve_image);
-#if defined(MAGICKCORE_OPENMP_SUPPORT)
+#if defined(_OPENMP) && (_OPENMP >= 200203)
   #pragma omp parallel for schedule(static,1) shared(progress,status)
 #endif
   for (y=0; y < (long) image->rows; y++)
@@ -1146,7 +1146,7 @@ MagickExport Image *ConvolveImageChannel(const Image *image,
         MagickBooleanType
           proceed;
 
-#if defined(MAGICKCORE_OPENMP_SUPPORT)
+#if defined(_OPENMP) && (_OPENMP >= 200203)
   #pragma omp critical (MagickCore_ConvolveImageChannel)
 #endif
         proceed=SetImageProgress(image,ConvolveImageTag,progress++,image->rows);
@@ -1472,7 +1472,7 @@ MagickExport MagickBooleanType EvaluateImageChannel(Image *image,
   progress=0;
   random_info=AcquireRandomInfoThreadSet();
   image_view=AcquireCacheView(image);
-#if defined(MAGICKCORE_OPENMP_SUPPORT)
+#if defined(_OPENMP) && (_OPENMP >= 200203)
   #pragma omp parallel for schedule(static,1) shared(progress,status)
 #endif
   for (y=0; y < (long) image->rows; y++)
@@ -1526,7 +1526,7 @@ MagickExport MagickBooleanType EvaluateImageChannel(Image *image,
         MagickBooleanType
           proceed;
 
-#if defined(MAGICKCORE_OPENMP_SUPPORT)
+#if defined(_OPENMP) && (_OPENMP >= 200203)
   #pragma omp critical (MagickCore_EvaluateImageChannel)
 #endif
         proceed=SetImageProgress(image,EvaluateImageTag,progress++,image->rows);
@@ -1704,7 +1704,7 @@ MagickExport MagickBooleanType FunctionImageChannel(Image *image,
   status=MagickTrue;
   progress=0;
   image_view=AcquireCacheView(image);
-#if defined(MAGICKCORE_OPENMP_SUPPORT)
+#if defined(_OPENMP) && (_OPENMP >= 200203)
   #pragma omp parallel for schedule(static,1) shared(progress,status)
 #endif
   for (y=0; y < (long) image->rows; y++)
@@ -1760,7 +1760,7 @@ MagickExport MagickBooleanType FunctionImageChannel(Image *image,
         MagickBooleanType
           proceed;
 
-#if defined(MAGICKCORE_OPENMP_SUPPORT)
+#if defined(_OPENMP) && (_OPENMP >= 200203)
   #pragma omp critical (MagickCore_FunctionImageChannel)
 #endif
         proceed=SetImageProgress(image,FunctionImageTag,progress++,image->rows);
@@ -3540,7 +3540,7 @@ MagickExport Image *FxImageChannel(const Image *image,const ChannelType channel,
   status=MagickTrue;
   progress=0;
   fx_view=AcquireCacheView(fx_image);
-#if defined(MAGICKCORE_OPENMP_SUPPORT)
+#if defined(_OPENMP) && (_OPENMP >= 200203)
   #pragma omp parallel for schedule(static,1) shared(progress,status)
 #endif
   for (y=0; y < (long) fx_image->rows; y++)
@@ -3616,7 +3616,7 @@ MagickExport Image *FxImageChannel(const Image *image,const ChannelType channel,
         MagickBooleanType
           proceed;
 
-#if defined(MAGICKCORE_OPENMP_SUPPORT)
+#if defined(_OPENMP) && (_OPENMP >= 200203)
   #pragma omp critical (MagickCore_FxImageChannel)
 #endif
         proceed=SetImageProgress(image,FxImageTag,progress++,image->rows);
@@ -3743,7 +3743,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(MAGICKCORE_OPENMP_SUPPORT)
+#if defined(_OPENMP) && (_OPENMP >= 200203)
   #pragma omp parallel for schedule(static,1) shared(progress,status)
 #endif
   for (y=0; y < (long) image->rows; y++)
@@ -3813,7 +3813,7 @@ MagickExport Image *ImplodeImage(const Image *image,const double amount,
         MagickBooleanType
           proceed;
 
-#if defined(MAGICKCORE_OPENMP_SUPPORT)
+#if defined(_OPENMP) && (_OPENMP >= 200203)
   #pragma omp critical (MagickCore_ImplodeImage)
 #endif
         proceed=SetImageProgress(image,ImplodeImageTag,progress++,image->rows);
@@ -3965,7 +3965,7 @@ MagickExport Image *MorphImages(const Image *image,
         }
       image_view=AcquireCacheView(morph_image);
       morph_view=AcquireCacheView(morph_images);
-#if defined(MAGICKCORE_OPENMP_SUPPORT)
+#if defined(_OPENMP) && (_OPENMP >= 200203)
   #pragma omp parallel for schedule(static,1) shared(status)
 #endif
       for (y=0; y < (long) morph_images->rows; y++)
@@ -4028,7 +4028,7 @@ MagickExport Image *MorphImages(const Image *image,
         MagickBooleanType
           proceed;
 
-#if defined(MAGICKCORE_OPENMP_SUPPORT)
+#if defined(_OPENMP) && (_OPENMP >= 200203)
   #pragma omp critical (MagickCore_MorphImages)
 #endif
         proceed=SetImageProgress(image,MorphImageTag,scene,
@@ -4592,7 +4592,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(MAGICKCORE_OPENMP_SUPPORT)
+#if defined(_OPENMP) && (_OPENMP >= 200203)
   #pragma omp parallel for schedule(static,1) shared(progress,status)
 #endif
   for (y=0; y < (long) image->rows; y++)
@@ -4716,7 +4716,7 @@ MagickExport Image *RecolorImage(const Image *image,const unsigned long order,
         MagickBooleanType
           proceed;
 
-#if defined(MAGICKCORE_OPENMP_SUPPORT)
+#if defined(_OPENMP) && (_OPENMP >= 200203)
   #pragma omp critical (MagickCore_RecolorImage)
 #endif
         proceed=SetImageProgress(image,RecolorImageTag,progress++,image->rows);
@@ -4805,7 +4805,7 @@ MagickExport Image *SepiaToneImage(const Image *image,const double threshold,
   progress=0;
   image_view=AcquireCacheView(image);
   sepia_view=AcquireCacheView(sepia_image);
-#if defined(MAGICKCORE_OPENMP_SUPPORT)
+#if defined(_OPENMP) && (_OPENMP >= 200203)
   #pragma omp parallel for schedule(static,1) shared(progress,status)
 #endif
   for (y=0; y < (long) image->rows; y++)
@@ -4859,7 +4859,7 @@ MagickExport Image *SepiaToneImage(const Image *image,const double threshold,
         MagickBooleanType
           proceed;
 
-#if defined(MAGICKCORE_OPENMP_SUPPORT)
+#if defined(_OPENMP) && (_OPENMP >= 200203)
   #pragma omp critical (MagickCore_SepiaToneImage)
 #endif
         proceed=SetImageProgress(image,SepiaToneImageTag,progress++,
@@ -4963,7 +4963,7 @@ MagickExport Image *ShadowImage(const Image *image,const double opacity,
   status=MagickTrue;
   progress=0;
   image_view=AcquireCacheView(border_image);
-#if defined(MAGICKCORE_OPENMP_SUPPORT)
+#if defined(_OPENMP) && (_OPENMP >= 200203)
   #pragma omp parallel for schedule(static,1) shared(progress,status)
 #endif
   for (y=0; y < (long) border_image->rows; y++)
@@ -5002,7 +5002,7 @@ MagickExport Image *ShadowImage(const Image *image,const double opacity,
         MagickBooleanType
           proceed;
 
-#if defined(MAGICKCORE_OPENMP_SUPPORT)
+#if defined(_OPENMP) && (_OPENMP >= 200203)
   #pragma omp critical (MagickCore_ShadowImage)
 #endif
         proceed=SetImageProgress(image,ShadowImageTag,progress++,
@@ -5252,7 +5252,7 @@ MagickExport MagickBooleanType SolarizeImage(Image *image,
   progress=0;
   exception=(&image->exception);
   image_view=AcquireCacheView(image);
-#if defined(MAGICKCORE_OPENMP_SUPPORT)
+#if defined(_OPENMP) && (_OPENMP >= 200203)
   #pragma omp parallel for schedule(static,1) shared(progress,status)
 #endif
   for (y=0; y < (long) image->rows; y++)
@@ -5289,7 +5289,7 @@ MagickExport MagickBooleanType SolarizeImage(Image *image,
         MagickBooleanType
           proceed;
 
-#if defined(MAGICKCORE_OPENMP_SUPPORT)
+#if defined(_OPENMP) && (_OPENMP >= 200203)
   #pragma omp critical (MagickCore_SolarizeImage)
 #endif
         proceed=SetImageProgress(image,SolarizeImageTag,progress++,image->rows);
@@ -5693,7 +5693,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(MAGICKCORE_OPENMP_SUPPORT)
+#if defined(_OPENMP) && (_OPENMP >= 200203)
   #pragma omp parallel for schedule(static,1) shared(progress,status)
 #endif
   for (y=0; y < (long) image->rows; y++)
@@ -5764,7 +5764,7 @@ MagickExport Image *SwirlImage(const Image *image,double degrees,
         MagickBooleanType
           proceed;
 
-#if defined(MAGICKCORE_OPENMP_SUPPORT)
+#if defined(_OPENMP) && (_OPENMP >= 200203)
   #pragma omp critical (MagickCore_SwirlImage)
 #endif
         proceed=SetImageProgress(image,SwirlImageTag,progress++,image->rows);
@@ -5890,7 +5890,7 @@ MagickExport Image *TintImage(const Image *image,const char *opacity,
   progress=0;
   image_view=AcquireCacheView(image);
   tint_view=AcquireCacheView(tint_image);
-#if defined(MAGICKCORE_OPENMP_SUPPORT)
+#if defined(_OPENMP) && (_OPENMP >= 200203)
   #pragma omp parallel for schedule(static,1) shared(progress,status)
 #endif
   for (y=0; y < (long) image->rows; y++)
@@ -5945,7 +5945,7 @@ MagickExport Image *TintImage(const Image *image,const char *opacity,
         MagickBooleanType
           proceed;
 
-#if defined(MAGICKCORE_OPENMP_SUPPORT)
+#if defined(_OPENMP) && (_OPENMP >= 200203)
   #pragma omp critical (MagickCore_TintImage)
 #endif
         proceed=SetImageProgress(image,TintImageTag,progress++,image->rows);
@@ -6156,7 +6156,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(MAGICKCORE_OPENMP_SUPPORT)
+#if defined(_OPENMP) && (_OPENMP >= 200203)
   #pragma omp parallel for schedule(static,1) shared(progress,status)
 #endif
   for (y=0; y < (long) wave_image->rows; y++)
@@ -6202,7 +6202,7 @@ MagickExport Image *WaveImage(const Image *image,const double amplitude,
         MagickBooleanType
           proceed;
 
-#if defined(MAGICKCORE_OPENMP_SUPPORT)
+#if defined(_OPENMP) && (_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 e02d0ebcc84f3afadc9755bca3c0af5850d8c6a9..a0e9ec05947ecb255c3d23e81487e7f01722eca7 100644 (file)
--- a/magick/image.c
+++ b/magick/image.c
@@ -548,7 +548,7 @@ MagickExport Image *AppendImages(const Image *image,
     else
       y_offset-=geometry.y;
     image_view=AcquireCacheView(image);
-#if defined(MAGICKCORE_OPENMP_SUPPORT)
+#if defined(_OPENMP) && (_OPENMP >= 200203)
     #pragma omp parallel for schedule(static,1) shared(status)
 #endif
     for (y=0; y < (long) image->rows; y++)
@@ -760,7 +760,7 @@ MagickExport Image *AverageImages(const Image *image,ExceptionInfo *exception)
   GetMagickPixelPacket(image,&zero);
   number_images=GetImageListLength(image);
   average_view=AcquireCacheView(average_image);
-#if defined(MAGICKCORE_OPENMP_SUPPORT)
+#if defined(_OPENMP) && (_OPENMP >= 200203)
   #pragma omp parallel for schedule(static,1) shared(progress,status)
 #endif
   for (y=0; y < (long) average_image->rows; y++)
@@ -857,7 +857,7 @@ MagickExport Image *AverageImages(const Image *image,ExceptionInfo *exception)
         MagickBooleanType
           proceed;
 
-#if defined(MAGICKCORE_OPENMP_SUPPORT)
+#if defined(_OPENMP) && (_OPENMP >= 200203)
         #pragma omp critical (MagickCore_AverageImages)
 #endif
         proceed=SetImageProgress(image,AverageImageTag,progress++,
@@ -1340,7 +1340,7 @@ MagickExport Image *CombineImages(const Image *image,const ChannelType channel,
   status=MagickTrue;
   progress=0;
   combine_view=AcquireCacheView(combine_image);
-#if defined(MAGICKCORE_OPENMP_SUPPORT)
+#if defined(_OPENMP) && (_OPENMP >= 200203)
   #pragma omp parallel for schedule(static,1) shared(progress,status)
 #endif
   for (y=0; y < (long) combine_image->rows; y++)
@@ -1463,7 +1463,7 @@ MagickExport Image *CombineImages(const Image *image,const ChannelType channel,
         MagickBooleanType
           proceed;
 
-#if defined(MAGICKCORE_OPENMP_SUPPORT)
+#if defined(_OPENMP) && (_OPENMP >= 200203)
         #pragma omp critical (MagickCore_CombineImages)
 #endif
         proceed=SetImageProgress(image,CombineImageTag,progress++,
@@ -1528,7 +1528,7 @@ MagickExport MagickBooleanType CycleColormapImage(Image *image,
   status=MagickTrue;
   exception=(&image->exception);
   image_view=AcquireCacheView(image);
-#if defined(MAGICKCORE_OPENMP_SUPPORT)
+#if defined(_OPENMP) && (_OPENMP >= 200203)
   #pragma omp parallel for schedule(static,1) shared(status)
 #endif
   for (y=0; y < (long) image->rows; y++)
@@ -2287,7 +2287,7 @@ MagickExport MagickBooleanType IsHighDynamicRangeImage(const Image *image,
   status=MagickTrue;
   GetMagickPixelPacket(image,&zero);
   image_view=AcquireCacheView(image);
-#if defined(MAGICKCORE_OPENMP_SUPPORT)
+#if defined(_OPENMP) && (_OPENMP >= 200203)
   #pragma omp parallel for schedule(static,1) shared(status)
 #endif
   for (y=0; y < (long) image->rows; y++)
@@ -2747,7 +2747,7 @@ MagickExport MagickBooleanType SeparateImageChannel(Image *image,
   progress=0;
   exception=(&image->exception);
   image_view=AcquireCacheView(image);
-#if defined(MAGICKCORE_OPENMP_SUPPORT)
+#if defined(_OPENMP) && (_OPENMP >= 200203)
   #pragma omp parallel for schedule(static,1) shared(progress,status)
 #endif
   for (y=0; y < (long) image->rows; y++)
@@ -2857,7 +2857,7 @@ MagickExport MagickBooleanType SeparateImageChannel(Image *image,
         MagickBooleanType
           proceed;
 
-#if defined(MAGICKCORE_OPENMP_SUPPORT)
+#if defined(_OPENMP) && (_OPENMP >= 200203)
         #pragma omp critical (MagickCore_SeparateImageChannel)
 #endif
         proceed=SetImageProgress(image,SeparateImageTag,progress++,image->rows);
@@ -3034,7 +3034,7 @@ MagickExport MagickBooleanType SetImageAlphaChannel(Image *image,
       status=MagickTrue;
       exception=(&image->exception);
       image_view=AcquireCacheView(image);
-      #if defined(MAGICKCORE_OPENMP_SUPPORT)
+      #if defined(_OPENMP) && (_OPENMP >= 200203)
         #pragma omp parallel for schedule(static,1) shared(status)
       #endif
       for (y=0; y < (long) image->rows; y++)
@@ -3211,7 +3211,7 @@ MagickExport MagickBooleanType SetImageBackgroundColor(Image *image)
   status=MagickTrue;
   exception=(&image->exception);
   image_view=AcquireCacheView(image);
-#if defined(MAGICKCORE_OPENMP_SUPPORT)
+#if defined(_OPENMP) && (_OPENMP >= 200203)
   #pragma omp parallel for schedule(static,1) shared(status)
 #endif
   for (y=0; y < (long) image->rows; y++)
@@ -3878,7 +3878,7 @@ MagickExport MagickBooleanType SetImageOpacity(Image *image,
   status=MagickTrue;
   exception=(&image->exception);
   image_view=AcquireCacheView(image);
-#if defined(MAGICKCORE_OPENMP_SUPPORT)
+#if defined(_OPENMP) && (_OPENMP >= 200203)
   #pragma omp parallel for schedule(static,1) shared(status)
 #endif
   for (y=0; y < (long) image->rows; y++)
@@ -4209,7 +4209,7 @@ MagickExport MagickBooleanType SortColormapByIntensity(Image *image)
   /*
     Assign index values to colormap entries.
   */
-#if defined(MAGICKCORE_OPENMP_SUPPORT)
+#if defined(_OPENMP) && (_OPENMP >= 200203)
   #pragma omp parallel for schedule(static,1) shared(status)
 #endif
   for (i=0; i < (long) image->colors; i++)
@@ -4222,7 +4222,7 @@ MagickExport MagickBooleanType SortColormapByIntensity(Image *image)
   /*
     Update image colormap indexes to sorted colormap order.
   */
-#if defined(MAGICKCORE_OPENMP_SUPPORT)
+#if defined(_OPENMP) && (_OPENMP >= 200203)
   #pragma omp parallel for schedule(static,1) shared(status)
 #endif
   for (i=0; i < (long) image->colors; i++)

diff --git a/magick/paint.c b/magick/paint.c
index 1ae2aa41e01f6ce91436032c2a7f693c34efbdfd..38da0f63176e5f305689c0c83d135f7742a4e130 100644 (file)
--- 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(MAGICKCORE_OPENMP_SUPPORT)
+#if defined(_OPENMP) && (_OPENMP >= 200203)
   #pragma omp parallel for schedule(static,1) shared(progress,status)
 #endif
   for (y=0; y < (long) image->rows; y++)
@@ -685,7 +685,7 @@ MagickExport Image *OilPaintImage(const Image *image,const double radius,
         MagickBooleanType
           proceed;
 
-#if defined(MAGICKCORE_OPENMP_SUPPORT)
+#if defined(_OPENMP) && (_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(MAGICKCORE_OPENMP_SUPPORT)
+#if defined(_OPENMP) && (_OPENMP >= 200203)
   #pragma omp parallel for schedule(static,1) shared(progress,status)
 #endif
   for (y=0; y < (long) image->rows; y++)
@@ -842,7 +842,7 @@ MagickExport MagickBooleanType OpaquePaintImageChannel(Image *image,
         MagickBooleanType
           proceed;
 
-#if defined(MAGICKCORE_OPENMP_SUPPORT)
+#if defined(_OPENMP) && (_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(MAGICKCORE_OPENMP_SUPPORT)
+#if defined(_OPENMP) && (_OPENMP >= 200203)
   #pragma omp parallel for schedule(static,1) shared(progress,status)
 #endif
   for (y=0; y < (long) image->rows; y++)
@@ -972,7 +972,7 @@ MagickExport MagickBooleanType TransparentPaintImage(Image *image,
         MagickBooleanType
           proceed;
 
-#if defined(MAGICKCORE_OPENMP_SUPPORT)
+#if defined(_OPENMP) && (_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(MAGICKCORE_OPENMP_SUPPORT)
+#if defined(_OPENMP) && (_OPENMP >= 200203)
   #pragma omp parallel for schedule(static,1) shared(progress,status)
 #endif
   for (y=0; y < (long) image->rows; y++)
@@ -1109,7 +1109,7 @@ MagickExport MagickBooleanType TransparentPaintImageChroma(Image *image,
         MagickBooleanType
           proceed;
 
-#if defined(MAGICKCORE_OPENMP_SUPPORT)
+#if defined(_OPENMP) && (_OPENMP >= 200203)
   #pragma omp critical (MagickCore_TransparentPaintImageChroma)
 #endif
         proceed=SetImageProgress(image,TransparentPaintImageTag,progress++,

diff --git a/magick/prepress.c b/magick/prepress.c
index 0fe46f1a0dbcec2139c918ede538cfdbeaacc395..1d034552e9165631e30361625efc72cd851a44fd 100644 (file)
--- 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(MAGICKCORE_OPENMP_SUPPORT)
+#if defined(_OPENMP) && (_OPENMP >= 200203)
   #pragma omp parallel for schedule(static,1) shared(status)
 #endif
   for (y=0; y < (long) image->rows; y++)
@@ -136,7 +136,7 @@ MagickExport double GetImageTotalInkDensity(Image *image)
     {
       density=(double) p->red+p->green+p->blue+indexes[x];
       if (density > total_ink_density)
-#if defined(MAGICKCORE_OPENMP_SUPPORT)
+#if defined(_OPENMP) && (_OPENMP >= 200203)
   #pragma omp critical (MagickCore_GetImageTotalInkDensity)
 #endif
         {

diff --git a/magick/profile.c b/magick/profile.c
index f6e100b8671c8ec31a0deae3dd789c6f0573302a..95e053693726e7ec6c0a9a1d4e198d8dd6ce0821 100644 (file)
--- a/magick/profile.c
+++ b/magick/profile.c
@@ -1153,7 +1153,7 @@ MagickExport MagickBooleanType ProfileImage(Image *image,const char *name,
           status=MagickTrue;
           progress=0;
           image_view=AcquireCacheView(image);
-#if defined(MAGICKCORE_OPENMP_SUPPORT)
+#if defined(_OPENMP) && (_OPENMP >= 200203)
           #pragma omp parallel for schedule(static,1) shared(status)
 #endif
           for (y=0; y < (long) image->rows; y++)
@@ -1230,7 +1230,7 @@ MagickExport MagickBooleanType ProfileImage(Image *image,const char *name,
                 MagickBooleanType
                   proceed;
 
-#if defined(MAGICKCORE_OPENMP_SUPPORT)
+#if defined(_OPENMP) && (_OPENMP >= 200203)
   #pragma omp critical (MagickCore_ProfileImage)
 #endif
                 proceed=SetImageProgress(image,ProfileImageTag,progress++,

diff --git a/magick/quantize.c b/magick/quantize.c
index 0eeeb3fb46ceb337bbbb66a34a8cf166b7ad3053..038db65532c1133b88cf83e2c1322f4d6ba20c3c 100644 (file)
--- a/magick/quantize.c
+++ b/magick/quantize.c
@@ -3021,7 +3021,7 @@ static MagickBooleanType SetGrayscaleImage(Image *image)
       status=MagickTrue;
       exception=(&image->exception);
       image_view=AcquireCacheView(image);
-#if defined(MAGICKCORE_OPENMP_SUPPORT)
+#if defined(_OPENMP) && (_OPENMP >= 200203)
   #pragma omp parallel for schedule(static,1) shared(status)
 #endif
       for (y=0; y < (long) image->rows; y++)
@@ -3053,7 +3053,7 @@ static MagickBooleanType SetGrayscaleImage(Image *image)
           intensity=ScaleQuantumToMap(q->red);
           if (colormap_index[intensity] < 0)
             {
-#if defined(MAGICKCORE_OPENMP_SUPPORT)
+#if defined(_OPENMP) && (_OPENMP >= 200203)
     #pragma omp critical (MagickCore_SetGrayscaleImage)
 #endif
               if (colormap_index[intensity] < 0)
@@ -3097,7 +3097,7 @@ static MagickBooleanType SetGrayscaleImage(Image *image)
   status=MagickTrue;
   exception=(&image->exception);
   image_view=AcquireCacheView(image);
-#if defined(MAGICKCORE_OPENMP_SUPPORT)
+#if defined(_OPENMP) && (_OPENMP >= 200203)
   #pragma omp parallel for schedule(static,1) shared(status)
 #endif
   for (y=0; y < (long) image->rows; y++)

diff --git a/magick/resize.c b/magick/resize.c
index bfad6ecbb16dddfd7bace48cfdfd53d1c01a794d..d113354eb58496376827944a83355a49dac8212b 100644 (file)
--- a/magick/resize.c
+++ b/magick/resize.c
@@ -1721,7 +1721,7 @@ static MagickBooleanType HorizontalFilter(const ResizeFilter *resize_filter,
   (void) ResetMagickMemory(&zero,0,sizeof(zero));
   image_view=AcquireCacheView(image);
   resize_view=AcquireCacheView(resize_image);
-#if defined(MAGICKCORE_OPENMP_SUPPORT)
+#if defined(_OPENMP) && (_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(MAGICKCORE_OPENMP_SUPPORT)
+#if defined(_OPENMP) && (_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(MAGICKCORE_OPENMP_SUPPORT)
+#if defined(_OPENMP) && (_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(MAGICKCORE_OPENMP_SUPPORT)
+#if defined(_OPENMP) && (_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(MAGICKCORE_OPENMP_SUPPORT)
+#if defined(_OPENMP) && (_OPENMP >= 200203)
   #pragma omp parallel for schedule(static,1) shared(progress,status)
 #endif
   for (y=0; y < (long) sample_image->rows; y++)
@@ -2388,7 +2388,7 @@ MagickExport Image *SampleImage(const Image *image,const unsigned long columns,
         MagickBooleanType
           proceed;
 
-#if defined(MAGICKCORE_OPENMP_SUPPORT)
+#if defined(_OPENMP) && (_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 5e5aae6b1f42a49ec9663e6765faeec579ec0845..4e06245211f7b0a886f220eb88c96c621b4d7caf 100644 (file)
--- a/magick/segment.c
+++ b/magick/segment.c
@@ -394,7 +394,7 @@ static MagickBooleanType Classify(Image *image,short **extrema,
         MagickBooleanType
           proceed;
 
-#if defined(MAGICKCORE_OPENMP_SUPPORT)
+#if defined(_OPENMP) && (_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(MAGICKCORE_OPENMP_SUPPORT)
+#if defined(_OPENMP) && (_OPENMP >= 200203)
   #pragma omp parallel for schedule(static,1) shared(progress,status)
 #endif
   for (y=0; y < (long) image->rows; y++)
@@ -632,7 +632,7 @@ static MagickBooleanType Classify(Image *image,short **extrema,
         MagickBooleanType
           proceed;
 
-#if defined(MAGICKCORE_OPENMP_SUPPORT)
+#if defined(_OPENMP) && (_OPENMP >= 200203)
         #pragma omp critical (MagickCore_Classify)
 #endif
         proceed=SetImageProgress(image,SegmentImageTag,progress++,

diff --git a/magick/shear.c b/magick/shear.c
index a82b739938db48035a408ef7b19a79d8e405f436..23ab86535a924fce1487373e83f8ea0eeceb6d5e 100644 (file)
--- a/magick/shear.c
+++ b/magick/shear.c
@@ -445,7 +445,7 @@ static inline ssize_t ReadRadonCell(const RadonInfo *radon_info,
     count;
 
 #if !defined(MAGICKCORE_HAVE_PPREAD)
-#if defined(MAGICKCORE_OPENMP_SUPPORT)
+#if defined(_OPENMP) && (_OPENMP >= 200203)
   #pragma omp critical (MagickCore_ReadRadonCell)
 #endif
   {
@@ -489,7 +489,7 @@ static inline ssize_t WriteRadonCell(const RadonInfo *radon_info,
     count;
 
 #if !defined(MAGICKCORE_HAVE_PWRITE)
-#if defined(MAGICKCORE_OPENMP_SUPPORT)
+#if defined(_OPENMP) && (_OPENMP >= 200203)
   #pragma omp critical (MagickCore_WriteRadonCell)
 #endif
   {
@@ -625,7 +625,7 @@ static void RadonProjection(RadonInfo *source_cells,
     p=q;
     q=swap;
   }
-#if defined(MAGICKCORE_OPENMP_SUPPORT)
+#if defined(_OPENMP) && (_OPENMP >= 200203)
   #pragma omp parallel for
 #endif
   for (x=0; x < (long) p->width; x++)
@@ -705,7 +705,7 @@ static MagickBooleanType RadonTransform(const Image *image,
   }
   status=MagickTrue;
   image_view=AcquireCacheView(image);
-#if defined(MAGICKCORE_OPENMP_SUPPORT)
+#if defined(_OPENMP) && (_OPENMP >= 200203)
   #pragma omp parallel for schedule(static,1) shared(status)
 #endif
   for (y=0; y < (long) image->rows; y++)
@@ -756,7 +756,7 @@ static MagickBooleanType RadonTransform(const Image *image,
   }
   RadonProjection(source_cells,destination_cells,-1,projection);
   (void) ResetRadonCells(source_cells);
-#if defined(MAGICKCORE_OPENMP_SUPPORT)
+#if defined(_OPENMP) && (_OPENMP >= 200203)
   #pragma omp parallel for schedule(static,1) shared(status)
 #endif
   for (y=0; y < (long) image->rows; y++)
@@ -1073,7 +1073,7 @@ static Image *IntegralRotateImage(const Image *image,unsigned long rotations,
         Rotate 90 degrees.
       */
       GetPixelCacheTileSize(image,&tile_width,&tile_height);
-#if defined(MAGICKCORE_OPENMP_SUPPORT)
+#if defined(_OPENMP) && (_OPENMP >= 200203)
   #pragma omp parallel for schedule(static,1) shared(progress, status)
 #endif
       for (tile_y=0; tile_y < (long) image->rows; tile_y+=tile_height)
@@ -1187,7 +1187,7 @@ static Image *IntegralRotateImage(const Image *image,unsigned long rotations,
       /*
         Rotate 180 degrees.
       */
-#if defined(MAGICKCORE_OPENMP_SUPPORT)
+#if defined(_OPENMP) && (_OPENMP >= 200203)
   #pragma omp parallel for schedule(static,1) shared(progress, status)
 #endif
       for (y=0; y < (long) image->rows; y++)
@@ -1263,7 +1263,7 @@ static Image *IntegralRotateImage(const Image *image,unsigned long rotations,
         Rotate 270 degrees.
       */
       GetPixelCacheTileSize(image,&tile_width,&tile_height);
-#if defined(MAGICKCORE_OPENMP_SUPPORT)
+#if defined(_OPENMP) && (_OPENMP >= 200203)
   #pragma omp parallel for schedule(static,1) shared(progress, status)
 #endif
       for (tile_y=0; tile_y < (long) image->rows; tile_y+=tile_height)
@@ -1459,7 +1459,7 @@ static MagickBooleanType XShearImage(Image *image,const MagickRealType degrees,
   progress=0;
   exception=(&image->exception);
   image_view=AcquireCacheView(image);
-#if defined(MAGICKCORE_OPENMP_SUPPORT)
+#if defined(_OPENMP) && (_OPENMP >= 200203)
   #pragma omp parallel for schedule(static,1) shared(progress, status)
 #endif
   for (y=0; y < (long) height; y++)
@@ -1589,7 +1589,7 @@ static MagickBooleanType XShearImage(Image *image,const MagickRealType degrees,
         MagickBooleanType
           proceed;
 
-#if defined(MAGICKCORE_OPENMP_SUPPORT)
+#if defined(_OPENMP) && (_OPENMP >= 200203)
   #pragma omp critical (MagickCore_XShearImage)
 #endif
         proceed=SetImageProgress(image,XShearImageTag,progress++,height);
@@ -1679,7 +1679,7 @@ static MagickBooleanType YShearImage(Image *image,const MagickRealType degrees,
   progress=0;
   exception=(&image->exception);
   image_view=AcquireCacheView(image);
-#if defined(MAGICKCORE_OPENMP_SUPPORT)
+#if defined(_OPENMP) && (_OPENMP >= 200203)
   #pragma omp parallel for schedule(static,1) shared(progress, status)
 #endif
   for (x=0; x < (long) width; x++)
@@ -1809,7 +1809,7 @@ static MagickBooleanType YShearImage(Image *image,const MagickRealType degrees,
         MagickBooleanType
           proceed;
 
-#if defined(MAGICKCORE_OPENMP_SUPPORT)
+#if defined(_OPENMP) && (_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 43f9a291bab22ffcc949408710313ab13b6f6632..46505dcb88dea0b086028db6d1ed91e9630c0155 100644 (file)
--- a/magick/statistic.c
+++ b/magick/statistic.c
@@ -167,7 +167,7 @@ MagickExport RectangleInfo GetImageBoundingBox(const Image *image,
     &target[2]);
   status=MagickTrue;
   GetMagickPixelPacket(image,&zero);
-#if defined(MAGICKCORE_OPENMP_SUPPORT)
+#if defined(_OPENMP) && (_OPENMP >= 200203)
   #pragma omp parallel for schedule(static,1) shared(status)
 #endif
   for (y=0; y < (long) image->rows; y++)
@@ -323,7 +323,7 @@ MagickExport unsigned long GetImageChannelDepth(const Image *image,
         i;
 
       p=image->colormap;
-#if defined(MAGICKCORE_OPENMP_SUPPORT)
+#if defined(_OPENMP) && (_OPENMP >= 200203)
   #pragma omp parallel for schedule(static,1) shared(status)
 #endif
       for (i=0; i < (long) image->colors; i++)
@@ -364,7 +364,7 @@ MagickExport unsigned long GetImageChannelDepth(const Image *image,
       return(depth);
     }
   image_view=AcquireCacheView(image);
-#if defined(MAGICKCORE_OPENMP_SUPPORT)
+#if defined(_OPENMP) && (_OPENMP >= 200203)
   #pragma omp parallel for schedule(static,1) shared(status)
 #endif
   for (y=0; y < (long) image->rows; y++)
@@ -1323,7 +1323,7 @@ MagickExport MagickBooleanType SetImageChannelDepth(Image *image,
   range=GetQuantumRange(depth);
   exception=(&image->exception);
   image_view=AcquireCacheView(image);
-#if defined(MAGICKCORE_OPENMP_SUPPORT)
+#if defined(_OPENMP) && (_OPENMP >= 200203)
   #pragma omp parallel for schedule(static,1) shared(status)
 #endif
   for (y=0; y < (long) image->rows; y++)
@@ -1382,7 +1382,7 @@ MagickExport MagickBooleanType SetImageChannelDepth(Image *image,
 
       p=image->colormap;
       range=GetQuantumRange(depth);
-#if defined(MAGICKCORE_OPENMP_SUPPORT)
+#if defined(_OPENMP) && (_OPENMP >= 200203)
   #pragma omp parallel for schedule(static,1) shared(status)
 #endif
       for (i=0; i < (long) image->colors; i++)

diff --git a/magick/studio.h b/magick/studio.h
index 356b9691b77e763cd9b2d77f5bc902c1af3d92ae..af808ebc02f78c80f7f3ca307b14b1af57d09926 100644 (file)
--- a/magick/studio.h
+++ b/magick/studio.h
@@ -203,7 +203,6 @@ extern "C" {
 
 #if defined(_OPENMP) && (_OPENMP >= 200203)
 #  include <omp.h>
-#  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 5ae3dbeb4ac490b4406d5468ddc0b7b277d0f55d..1595694a8f2d7c2f93d0fdac55a75ee034b61bcb 100644 (file)
--- 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(MAGICKCORE_OPENMP_SUPPORT)
+#if defined(_OPENMP) && (_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(MAGICKCORE_OPENMP_SUPPORT)
+#if defined(_OPENMP) && (_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(MAGICKCORE_OPENMP_SUPPORT)
+#if defined(_OPENMP) && (_OPENMP >= 200203)
   omp_set_num_threads(threads);
 #else
   (void) threads;

diff --git a/magick/threshold.c b/magick/threshold.c
index b1d37655333cb067342a34a6b45456fcb5c5df66..4b6add502d90e4f34ce6d0a57b56cfcd4a7c5398 100644 (file)
--- 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(MAGICKCORE_OPENMP_SUPPORT)
+#if defined(_OPENMP) && (_OPENMP >= 200203)
   #pragma omp parallel for schedule(static,1) shared(progress,status)
 #endif
   for (y=0; y < (long) image->rows; y++)
@@ -286,7 +286,7 @@ MagickExport Image *AdaptiveThresholdImage(const Image *image,
         MagickBooleanType
           proceed;
 
-#if defined(MAGICKCORE_OPENMP_SUPPORT)
+#if defined(_OPENMP) && (_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(MAGICKCORE_OPENMP_SUPPORT)
+#if defined(_OPENMP) && (_OPENMP >= 200203)
   #pragma omp parallel for schedule(static,1) shared(progress,status)
 #endif
   for (y=0; y < (long) image->rows; y++)
@@ -453,7 +453,7 @@ MagickExport MagickBooleanType BilevelImageChannel(Image *image,
         MagickBooleanType
           proceed;
 
-#if defined(MAGICKCORE_OPENMP_SUPPORT)
+#if defined(_OPENMP) && (_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(MAGICKCORE_OPENMP_SUPPORT)
+#if defined(_OPENMP) && (_OPENMP >= 200203)
   #pragma omp parallel for schedule(static,1) shared(progress,status)
 #endif
   for (y=0; y < (long) image->rows; y++)
@@ -636,7 +636,7 @@ MagickExport MagickBooleanType BlackThresholdImageChannel(Image *image,
         MagickBooleanType
           proceed;
 
-#if defined(MAGICKCORE_OPENMP_SUPPORT)
+#if defined(_OPENMP) && (_OPENMP >= 200203)
   #pragma omp critical (MagickCore_BlackThresholdImageChannel)
 #endif
         proceed=SetImageProgress(image,ThresholdImageTag,progress++,
@@ -1321,7 +1321,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(MAGICKCORE_OPENMP_SUPPORT)
+#if defined(_OPENMP) && (_OPENMP >= 200203)
   #pragma omp parallel for schedule(static,1) shared(progress,status)
 #endif
     for (y=0; y < (long) image->rows; y++)
@@ -1404,7 +1404,7 @@ printf("DEBUG levels  r=%ld g=%ld b=%ld a=%ld i=%ld\n",
           MagickBooleanType
             proceed;
 
-#if defined(MAGICKCORE_OPENMP_SUPPORT)
+#if defined(_OPENMP) && (_OPENMP >= 200203)
   #pragma omp critical (MagickCore_OrderedPosterizeImageChannel)
 #endif
           proceed=SetImageProgress(image,DitherImageTag,progress++,image->rows);
@@ -1540,7 +1540,7 @@ MagickExport MagickBooleanType RandomThresholdImageChannel(Image *image,
           image->filename);
       random_info=AcquireRandomInfoThreadSet();
       image_view=AcquireCacheView(image);
-#if defined(MAGICKCORE_OPENMP_SUPPORT)
+#if defined(_OPENMP) && (_OPENMP >= 200203)
   #pragma omp parallel for schedule(static,1) shared(progress,status)
 #endif
       for (y=0; y < (long) image->rows; y++)
@@ -1597,7 +1597,7 @@ MagickExport MagickBooleanType RandomThresholdImageChannel(Image *image,
             MagickBooleanType
               proceed;
 
-#if defined(MAGICKCORE_OPENMP_SUPPORT)
+#if defined(_OPENMP) && (_OPENMP >= 200203)
   #pragma omp critical (MagickCore_RandomThresholdImageChannel)
 #endif
             proceed=SetImageProgress(image,ThresholdImageTag,progress++,
@@ -1617,7 +1617,7 @@ MagickExport MagickBooleanType RandomThresholdImageChannel(Image *image,
     }
   random_info=AcquireRandomInfoThreadSet();
   image_view=AcquireCacheView(image);
-#if defined(MAGICKCORE_OPENMP_SUPPORT)
+#if defined(_OPENMP) && (_OPENMP >= 200203)
   #pragma omp parallel for schedule(static,1) shared(progress,status)
 #endif
   for (y=0; y < (long) image->rows; y++)
@@ -1725,7 +1725,7 @@ MagickExport MagickBooleanType RandomThresholdImageChannel(Image *image,
         MagickBooleanType
           proceed;
 
-#if defined(MAGICKCORE_OPENMP_SUPPORT)
+#if defined(_OPENMP) && (_OPENMP >= 200203)
   #pragma omp critical (MagickCore_RandomThresholdImageChannel)
 #endif
         proceed=SetImageProgress(image,ThresholdImageTag,progress++,
@@ -1844,7 +1844,7 @@ MagickExport MagickBooleanType WhiteThresholdImageChannel(Image *image,
   status=MagickTrue;
   progress=0;
   image_view=AcquireCacheView(image);
-#if defined(MAGICKCORE_OPENMP_SUPPORT)
+#if defined(_OPENMP) && (_OPENMP >= 200203)
   #pragma omp parallel for schedule(static,1) shared(progress,status)
 #endif
   for (y=0; y < (long) image->rows; y++)
@@ -1894,7 +1894,7 @@ MagickExport MagickBooleanType WhiteThresholdImageChannel(Image *image,
         MagickBooleanType
           proceed;
 
-#if defined(MAGICKCORE_OPENMP_SUPPORT)
+#if defined(_OPENMP) && (_OPENMP >= 200203)
   #pragma omp critical (MagickCore_WhiteThresholdImageChannel)
 #endif
         proceed=SetImageProgress(image,ThresholdImageTag,progress++,

diff --git a/magick/transform.c b/magick/transform.c
index 4d66e9791632e1219d78c7bcf1b5afcb72893463..fc3168ce6d7f80c606678014814064448c0d63cb 100644 (file)
--- a/magick/transform.c
+++ b/magick/transform.c
@@ -584,7 +584,7 @@ MagickExport Image *CropImage(const Image *image,const RectangleInfo *geometry,
   progress=0;
   image_view=AcquireCacheView(image);
   crop_view=AcquireCacheView(crop_image);
-#if defined(MAGICKCORE_OPENMP_SUPPORT)
+#if defined(_OPENMP) && (_OPENMP >= 200203)
   #pragma omp parallel for schedule(static,1) shared(progress,status)
 #endif
   for (y=0; y < (long) crop_image->rows; y++)
@@ -628,7 +628,7 @@ MagickExport Image *CropImage(const Image *image,const RectangleInfo *geometry,
         MagickBooleanType
           proceed;
 
-#if defined(MAGICKCORE_OPENMP_SUPPORT)
+#if defined(_OPENMP) && (_OPENMP >= 200203)
   #pragma omp critical (MagickCore_CropImage)
 #endif
         proceed=SetImageProgress(image,CropImageTag,progress++,image->rows);
@@ -712,7 +712,7 @@ MagickExport Image *ExcerptImage(const Image *image,
   progress=0;
   image_view=AcquireCacheView(image);
   excerpt_view=AcquireCacheView(excerpt_image);
-#if defined(MAGICKCORE_OPENMP_SUPPORT)
+#if defined(_OPENMP) && (_OPENMP >= 200203)
   #pragma omp parallel for schedule(static,1) shared(progress,status)
 #endif
   for (y=0; y < (long) excerpt_image->rows; y++)
@@ -754,7 +754,7 @@ MagickExport Image *ExcerptImage(const Image *image,
         MagickBooleanType
           proceed;
 
-#if defined(MAGICKCORE_OPENMP_SUPPORT)
+#if defined(_OPENMP) && (_OPENMP >= 200203)
   #pragma omp critical (MagickCore_ExcerptImage)
 #endif
         proceed=SetImageProgress(image,ExcerptImageTag,progress++,image->rows);
@@ -893,7 +893,7 @@ MagickExport Image *FlipImage(const Image *image,ExceptionInfo *exception)
   progress=0;
   image_view=AcquireCacheView(image);
   flip_view=AcquireCacheView(flip_image);
-#if defined(MAGICKCORE_OPENMP_SUPPORT)
+#if defined(_OPENMP) && (_OPENMP >= 200203)
   #pragma omp parallel for schedule(static,1) shared(progress,status)
 #endif
   for (y=0; y < (long) flip_image->rows; y++)
@@ -936,7 +936,7 @@ MagickExport Image *FlipImage(const Image *image,ExceptionInfo *exception)
         MagickBooleanType
           proceed;
 
-#if defined(MAGICKCORE_OPENMP_SUPPORT)
+#if defined(_OPENMP) && (_OPENMP >= 200203)
   #pragma omp critical (MagickCore_FlipImage)
 #endif
         proceed=SetImageProgress(image,FlipImageTag,progress++,image->rows);
@@ -1011,7 +1011,7 @@ MagickExport Image *FlopImage(const Image *image,ExceptionInfo *exception)
   progress=0;
   image_view=AcquireCacheView(image);
   flop_view=AcquireCacheView(flop_image);
-#if defined(MAGICKCORE_OPENMP_SUPPORT)
+#if defined(_OPENMP) && (_OPENMP >= 200203)
   #pragma omp parallel for schedule(static,1) shared(progress,status)
 #endif
   for (y=0; y < (long) flop_image->rows; y++)
@@ -1058,7 +1058,7 @@ MagickExport Image *FlopImage(const Image *image,ExceptionInfo *exception)
         MagickBooleanType
           proceed;
 
-#if defined(MAGICKCORE_OPENMP_SUPPORT)
+#if defined(_OPENMP) && (_OPENMP >= 200203)
   #pragma omp critical (MagickCore_FlopImage)
 #endif
         proceed=SetImageProgress(image,FlopImageTag,progress++,image->rows);
@@ -1122,7 +1122,7 @@ static inline MagickBooleanType CopyImageRegion(Image *destination,
   status=MagickTrue;
   source_view=AcquireCacheView(source);
   destination_view=AcquireCacheView(destination);
-#if defined(MAGICKCORE_OPENMP_SUPPORT)
+#if defined(_OPENMP) && (_OPENMP >= 200203)
   #pragma omp parallel for schedule(static,1) shared(status)
 #endif
   for (y=0; y < (long) rows; y++)
@@ -1437,7 +1437,7 @@ MagickExport Image *SpliceImage(const Image *image,
   progress=0;
   image_view=AcquireCacheView(image);
   splice_view=AcquireCacheView(splice_image);
-#if defined(MAGICKCORE_OPENMP_SUPPORT)
+#if defined(_OPENMP) && (_OPENMP >= 200203)
   #pragma omp parallel for schedule(static,1) shared(progress,status)
 #endif
   for (y=0; y < (long) splice_geometry.y; y++)
@@ -1503,7 +1503,7 @@ MagickExport Image *SpliceImage(const Image *image,
         MagickBooleanType
           proceed;
 
-#if defined(MAGICKCORE_OPENMP_SUPPORT)
+#if defined(_OPENMP) && (_OPENMP >= 200203)
   #pragma omp critical (MagickCore_TransposeImage)
 #endif
         proceed=SetImageProgress(image,SpliceImageTag,progress++,
@@ -1512,7 +1512,7 @@ MagickExport Image *SpliceImage(const Image *image,
           status=MagickFalse;
       }
   }
-#if defined(MAGICKCORE_OPENMP_SUPPORT)
+#if defined(_OPENMP) && (_OPENMP >= 200203)
   #pragma omp parallel for schedule(static,1) shared(progress,status)
 #endif
   for (y=(long) (splice_geometry.y+splice_geometry.height);
@@ -1579,7 +1579,7 @@ MagickExport Image *SpliceImage(const Image *image,
         MagickBooleanType
           proceed;
 
-#if defined(MAGICKCORE_OPENMP_SUPPORT)
+#if defined(_OPENMP) && (_OPENMP >= 200203)
   #pragma omp critical (MagickCore_TransposeImage)
 #endif
         proceed=SetImageProgress(image,SpliceImageTag,progress++,
@@ -1874,7 +1874,7 @@ MagickExport Image *TransposeImage(const Image *image,ExceptionInfo *exception)
   progress=0;
   image_view=AcquireCacheView(image);
   transpose_view=AcquireCacheView(transpose_image);
-#if defined(MAGICKCORE_OPENMP_SUPPORT)
+#if defined(_OPENMP) && (_OPENMP >= 200203)
   #pragma omp parallel for schedule(static,1) shared(progress,status)
 #endif
   for (y=0; y < (long) image->rows; y++)
@@ -1916,7 +1916,7 @@ MagickExport Image *TransposeImage(const Image *image,ExceptionInfo *exception)
         MagickBooleanType
           proceed;
 
-#if defined(MAGICKCORE_OPENMP_SUPPORT)
+#if defined(_OPENMP) && (_OPENMP >= 200203)
   #pragma omp critical (MagickCore_TransposeImage)
 #endif
         proceed=SetImageProgress(image,TransposeImageTag,progress++,
@@ -2002,7 +2002,7 @@ MagickExport Image *TransverseImage(const Image *image,ExceptionInfo *exception)
   progress=0;
   image_view=AcquireCacheView(image);
   transverse_view=AcquireCacheView(transverse_image);
-#if defined(MAGICKCORE_OPENMP_SUPPORT)
+#if defined(_OPENMP) && (_OPENMP >= 200203)
   #pragma omp parallel for schedule(static,1) shared(progress,status)
 #endif
   for (y=0; y < (long) image->rows; y++)
@@ -2052,7 +2052,7 @@ MagickExport Image *TransverseImage(const Image *image,ExceptionInfo *exception)
         MagickBooleanType
           proceed;
 
-#if defined(MAGICKCORE_OPENMP_SUPPORT)
+#if defined(_OPENMP) && (_OPENMP >= 200203)
   #pragma omp critical (MagickCore_TransverseImage)
 #endif
         proceed=SetImageProgress(image,TransverseImageTag,progress++,

diff --git a/wand/pixel-view.c b/wand/pixel-view.c
index cb664f48bbf4b31d489ab000984a01c64f5614a1..2179dd0fd3cfae7b42305bff61c6fe32542ac51d 100644 (file)
--- 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(MAGICKCORE_OPENMP_SUPPORT)
+#if defined(_OPENMP) && (_OPENMP >= 200203)
   #pragma omp parallel for schedule(static,1) shared(progress,status)
 #endif
   for (y=source->region.y; y < (long) source->region.height; y++)
@@ -384,7 +384,7 @@ WandExport MagickBooleanType DuplexTransferPixelViewIterator(
         MagickBooleanType
           proceed;
 
-#if defined(MAGICKCORE_OPENMP_SUPPORT)
+#if defined(_OPENMP) && (_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(MAGICKCORE_OPENMP_SUPPORT)
+#if defined(_OPENMP) && (_OPENMP >= 200203)
   #pragma omp parallel for schedule(static,1) shared(progress,status)
 #endif
   for (y=source->region.y; y < (long) source->region.height; y++)
@@ -585,7 +585,7 @@ WandExport MagickBooleanType GetPixelViewIterator(PixelView *source,
         MagickBooleanType
           proceed;
 
-#if defined(MAGICKCORE_OPENMP_SUPPORT)
+#if defined(_OPENMP) && (_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(MAGICKCORE_OPENMP_SUPPORT)
+#if defined(_OPENMP) && (_OPENMP >= 200203)
   #pragma omp parallel for schedule(static,1) shared(progress,status)
 #endif
   for (y=destination->region.y; y < (long) destination->region.height; y++)
@@ -1040,7 +1040,7 @@ WandExport MagickBooleanType SetPixelViewIterator(PixelView *destination,
         MagickBooleanType
           proceed;
 
-#if defined(MAGICKCORE_OPENMP_SUPPORT)
+#if defined(_OPENMP) && (_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(MAGICKCORE_OPENMP_SUPPORT)
+#if defined(_OPENMP) && (_OPENMP >= 200203)
   #pragma omp parallel for schedule(static,1) shared(progress,status)
 #endif
   for (y=source->region.y; y < (long) source->region.height; y++)
@@ -1204,7 +1204,7 @@ WandExport MagickBooleanType TransferPixelViewIterator(PixelView *source,
         MagickBooleanType
           proceed;
 
-#if defined(MAGICKCORE_OPENMP_SUPPORT)
+#if defined(_OPENMP) && (_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(MAGICKCORE_OPENMP_SUPPORT)
+#if defined(_OPENMP) && (_OPENMP >= 200203)
   #pragma omp parallel for schedule(static,1) shared(progress,status)
 #endif
   for (y=source->region.y; y < (long) source->region.height; y++)
@@ -1332,7 +1332,7 @@ WandExport MagickBooleanType UpdatePixelViewIterator(PixelView *source,
         MagickBooleanType
           proceed;
 
-#if defined(MAGICKCORE_OPENMP_SUPPORT)
+#if defined(_OPENMP) && (_OPENMP >= 200203)
   #pragma omp critical (MagickWand_UpdatePixelViewIterator)
 #endif
         proceed=SetImageProgress(source_image,UpdatePixelViewTag,progress++,

diff --git a/wand/studio.h b/wand/studio.h
index 8726f793e2dffc5bef54010499e2476740149413..ef98a8c4b23654cacb6919bfbf846e068a0fbb3b 100644 (file)
--- a/wand/studio.h
+++ b/wand/studio.h
@@ -203,7 +203,6 @@ extern "C" {
 
 #if defined(_OPENMP) && (_OPENMP >= 200203)
 #  include <omp.h>
-#  define MAGICKCORE_OPENMP_SUPPORT 1
 #endif
 
 #if defined(MAGICKCORE_HAVE_PREAD) && defined(MAGICKCORE_HAVE_DECL_PREAD) && !MAGICKCORE_HAVE_DECL_PREAD