(no commit message)

diff --git a/magick/magick-type.h b/magick/magick-type.h
index 5d4f4608c8e51098dcd7bbb4e49d093b3aaf3db2..bb7559eea1785947b61c94473fab57605487c17d 100644 (file)
--- a/magick/magick-type.h
+++ b/magick/magick-type.h
@@ -149,7 +149,7 @@ typedef enum
   BlackChannel = 0x0020,
   IndexChannel = 0x0020,
   CompositeChannels = 0x002F,
-  AllChannels = ~0UL,
+  AllChannels = ~0L,
   /*
     Special purpose channel types.
   */

diff --git a/magick/property.c b/magick/property.c
index c3ee031fb4a91d0e3d21ef59799fbeed75a48809..5d8929948e4f45994295931f8573129631bfe2d7 100644 (file)
--- a/magick/property.c
+++ b/magick/property.c
@@ -1659,10 +1659,10 @@ static char *TracePSClippath(const unsigned char *blob,size_t length,
           xx=ReadPropertyMSBLong(&blob,&length);
           x=(ssize_t) xx;
           if (xx > 2147483647)
-            x=(ssize_t) xx-4294967295-1;
+            x=(ssize_t) xx-4294967295U-1;
           y=(ssize_t) yy;
           if (yy > 2147483647)
-            y=(ssize_t) yy-4294967295-1;
+            y=(ssize_t) yy-4294967295U-1;
           point[i].x=(double) x/4096/4096;
           point[i].y=1.0-(double) y/4096/4096;
         }
@@ -1856,10 +1856,10 @@ static char *TraceSVGClippath(const unsigned char *blob,size_t length,
           xx=ReadPropertyMSBLong(&blob,&length);
           x=(ssize_t) xx;
           if (xx > 2147483647)
-            x=(ssize_t) xx-4294967295-1;
+            x=(ssize_t) xx-4294967295U-1;
           y=(ssize_t) yy;
           if (yy > 2147483647)
-            y=(ssize_t) yy-4294967295-1;
+            y=(ssize_t) yy-4294967295U-1;
           point[i].x=(double) x*columns/4096/4096;
           point[i].y=(double) y*rows/4096/4096;
         }