CVS update of imagemagick/coders (xwd.c)

[Daniel Kobras]

    Date: Saturday, April 28, 2007 @ 19:17:16
  Author: kobras
    Path: /cvsroot/pkg-gmagick/imagemagick/coders

Modified: xwd.c

Rename OVERFLOW macro to avoid conflict with math.h.
Use proper IM syntax for exception macros.


-------+
 xwd.c |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)


Index: imagemagick/coders/xwd.c
diff -u imagemagick/coders/xwd.c:1.3 imagemagick/coders/xwd.c:1.4
--- imagemagick/coders/xwd.c:1.3	Sat Apr 28 14:16:13 2007
+++ imagemagick/coders/xwd.c	Sat Apr 28 19:17:15 2007
@@ -317,16 +317,16 @@
   /*
     Allocate the pixel buffer.
   */
-#define OVERFLOW(c,a,b) ((b) != 0 && ((c)/(b) != (a)))
+#define MAGICK_OVERFLOW(c,a,b) ((b) != 0 && ((c)/(b) != (a)))
   length=ximage->bytes_per_line*ximage->height;
-  if (OVERFLOW(length,ximage->bytes_per_line,ximage->height))
-    ThrowReaderException(ResourceLimitError,MemoryAllocationFailed,image);
+  if (MAGICK_OVERFLOW(length,ximage->bytes_per_line,ximage->height))
+    ThrowReaderException(ResourceLimitError,"MemoryAllocationFailed");
   if (ximage->format != ZPixmap)
     {
       size_t tmp=length;
       length*=ximage->depth;
-      if (OVERFLOW(length,tmp,ximage->depth))
-        ThrowReaderException(ResourceLimitError,MemoryAllocationFailed,image);
+      if (MAGICK_OVERFLOW(length,tmp,ximage->depth))
+        ThrowReaderException(ResourceLimitError,"MemoryAllocationFailed");
     }
   ximage->data=(char *) AcquireMagickMemory(length);
   if (ximage->data == (char *) NULL)