commit 10814dfec107069563f3bf016b08d0197ab70363
author cristy <urban-warrior@git.imagemagick.org> Sun Oct 11 17:37:39 2009 +0000
committer cristy <urban-warrior@git.imagemagick.org> Sun Oct 11 17:37:39 2009 +0000
tree b8df68f401254bf692861c2f4ba4b9d9f5aefcc0
parent 9612c573fa0259630a293ac4965abc119d6806f7

magick/memory.c

diff --git a/magick/memory.c b/magick/memory.c
index 077b5f8..095c195 100644
--- a/magick/memory.c
+++ b/magick/memory.c
@@ -137,7 +137,12 @@
   Global declarations.
 */
 static MagickMemoryMethods
-  memory_methods = { malloc, realloc, free };
+  memory_methods =
+  {
+    (AcquireMemoryHandler) malloc,
+    (ResizeMemoryHandler) realloc,
+    (DestroyMemoryHandler)free
+  };
 
 #if defined(MAGICKCORE_EMBEDDABLE_SUPPORT)
 static MemoryInfo

magick/xwindow.c

diff --git a/magick/xwindow.c b/magick/xwindow.c
index 3fae76c..cb640f1 100644
--- a/magick/xwindow.c
+++ b/magick/xwindow.c
@@ -5453,9 +5453,9 @@
             }
         }
       width=(unsigned int) window->image->columns;
-      assert(width == window->image->columns);
+      assert((unsigned long) width == window->image->columns);
       height=(unsigned int) window->image->rows;
-      assert(height == window->image->rows);
+      assert((unsigned long) height == window->image->rows);
     }
   /*
     Create X image.