(no commit message)

diff --git a/magick/memory.c b/magick/memory.c
index 077b5f8dcf92fe0e7867e30fdb4afbcecec3ae19..095c1959641709b396c92beaf72e1f354737caf8 100644 (file)
--- 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 3fae76c285af4a90dcb105cff8ea0bd7670a07da..cb640f12b21a45d8ab16c3cb0ee956bb41f2ccb5 100644 (file)
--- 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.