(no commit message)

[imagemagick] / magick / draw-private.h

diff --git a/magick/draw-private.h b/magick/draw-private.h
index ece53e94da182eaae401cf1037547911aca648d7..0a784523e832a125d1ed2edba3be3cfe6bae15fe 100644 (file)
--- a/magick/draw-private.h
+++ b/magick/draw-private.h
@@ -1,5 +1,5 @@
 /*
-  Copyright 1999-2009 ImageMagick Studio LLC, a non-profit organization
+  Copyright 1999-2010 ImageMagick Studio LLC, a non-profit organization
   dedicated to making software imaging solutions freely available.
   
   You may not use this file except in compliance with the License.
@@ -27,7 +27,7 @@ extern "C" {
 #include "magick/memory_.h"
 
 static inline MagickBooleanType GetFillColor(const DrawInfo *draw_info,
-  const long x,const long y,PixelPacket *pixel)
+  const ssize_t x,const ssize_t y,PixelPacket *pixel)
 {
   Image
     *pattern;
@@ -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(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203)
   #pragma omp critical
 #endif
   status=GetOneVirtualMethodPixel(pattern,TileVirtualPixelMethod,
@@ -53,7 +53,7 @@ static inline MagickBooleanType GetFillColor(const DrawInfo *draw_info,
 }
 
 static inline MagickBooleanType GetStrokeColor(const DrawInfo *draw_info,
-  const long x,const long y,PixelPacket *pixel)
+  const ssize_t x,const ssize_t y,PixelPacket *pixel)
 {
   Image
     *pattern;
@@ -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(MAGICKCORE_OPENMP_SUPPORT) && (_OPENMP >= 200203)
   #pragma omp critical
 #endif
   status=GetOneVirtualMethodPixel(pattern,TileVirtualPixelMethod,