From: cristy <urban-warrior@git.imagemagick.org>
Date: Sun, 11 Oct 2009 17:37:39 +0000 (+0000)
Subject: (no commit message)
X-Git-Tag: 7.0.1-0~10536
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=10814dfec107069563f3bf016b08d0197ab70363;p=imagemagick

---

diff --git a/magick/memory.c b/magick/memory.c
index 077b5f8dc..095c19596 100644
--- a/magick/memory.c
+++ b/magick/memory.c
@@ -137,7 +137,12 @@ typedef struct _MagickMemoryMethods
   Global declarations.
 */
 static MagickMemoryMethods
-  memory_methods = { malloc, realloc, free };
+  memory_methods =
+  {
+    (AcquireMemoryHandler) malloc,
+    (ResizeMemoryHandler) realloc,
+    (DestroyMemoryHandler)free
+  };
 
 #if defined(MAGICKCORE_EMBEDDABLE_SUPPORT)
 static MemoryInfo
diff --git a/magick/xwindow.c b/magick/xwindow.c
index 3fae76c28..cb640f12b 100644
--- a/magick/xwindow.c
+++ b/magick/xwindow.c
@@ -5453,9 +5453,9 @@ MagickExport MagickBooleanType XMakeImage(Display *display,
             }
         }
       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.