(no commit message)

[imagemagick] / magick / PreRvIcccm.c

diff --git a/magick/PreRvIcccm.c b/magick/PreRvIcccm.c
index 034cef5cc26345f1214f70d89fc5379627dbd8b5..5f714ccce495eab2b247934824ce773a8ae6abc8 100644 (file)
--- a/magick/PreRvIcccm.c
+++ b/magick/PreRvIcccm.c
@@ -127,17 +127,17 @@ Bool XSupportsLocale()
 */
 XClassHint *XAllocClassHint)
 {
-  return((XClassHint *) AcquireMagickMemory(sizeof(XClassHint)));
+  return((XClassHint *) AcquireAlignedMemory(1,sizeof(XClassHint)));
 }
 
 XIconSize *XAllocIconSize)
 {
-  return((XIconSize *) AcquireMagickMemory(sizeof(XIconSize)));
+  return((XIconSize *) AcquireAlignedMemory(1,sizeof(XIconSize)));
 }
 
 XSizeHints *XAllocSizeHints)
 {
-  return((XSizeHints *) AcquireMagickMemory(sizeof(XSizeHints)));
+  return((XSizeHints *) AcquireAlignedMemory(1,sizeof(XSizeHints)));
 }
 
 Status XReconfigureWMWindow(Display *display,Window window,int screen_number,
@@ -148,15 +148,15 @@ Status XReconfigureWMWindow(Display *display,Window window,int screen_number,
 
 XStandardColormap *XAllocStandardColormap)
 {
-  return((XStandardColormap *) AcquireMagickMemory(sizeof(XStandardColormap)));
+  return((XStandardColormap *) AcquireAlignedMemory(1,sizeof(XStandardColormap)));
 }
 
 XWMHints *XAllocWMHints)
 {
-  return((XWMHints *) AcquireMagickMemory(sizeof(XWMHints)));
+  return((XWMHints *) AcquireAlignedMemory(1,sizeof(XWMHints)));
 }
 
-Status XGetGCValues(Display *display,GC gc,unsigned long mask,
+Status XGetGCValues(Display *display,GC gc,size_t mask,
   XGCValues *values)
 {
   return(MagickTrue);
@@ -181,7 +181,7 @@ Status XGetWMColormapWindows(Display *display,Window window,
     actual_format,
     status;
 
-  unsigned long
+  size_t
     leftover,
     number_items;
 
@@ -276,7 +276,7 @@ int XStringListToTextProperty(char **argv,int argc,XTextProperty *property)
      protocol;
 
   number_bytes=0;
-  for (i=0; i < (long) argc; i++)
+  for (i=0; i < (ssize_t) argc; i++)
     number_bytes+=(unsigned int) ((argv[i] ? strlen(argv[i]) : 0)+1);
   protocol.encoding=XA_STRING;
   protocol.format=8;
@@ -301,7 +301,7 @@ int XStringListToTextProperty(char **argv,int argc,XTextProperty *property)
       if (buffer == (char *) NULL)
         return(MagickFalse);
       protocol.value=(unsigned char *) buffer;
-      for (i=0; i < (long) argc; i++)
+      for (i=0; i < (ssize_t) argc; i++)
       {
         char
           *argument;