X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=utils%2Flogo.c;h=428aa2f581e2b39b325a052f3fc024b0ee42844a;hb=8eb2873d7054e705c4e83f22d18c40946a9e2529;hp=befb349a1aef3ed4917d213cacdc5defe4d9c77a;hpb=585e1a6717d1dd9b90fbb53acaaae82106354d33;p=xscreensaver

diff --git a/utils/logo.c b/utils/logo.c
index befb349a..428aa2f5 100644
--- a/utils/logo.c
+++ b/utils/logo.c
@@ -33,8 +33,8 @@
 #include <stdio.h>
 #include <X11/Xutil.h>
 
-#include "logo-50.xpm"
-#include "logo-180.xpm"
+#include "images/logo-50.xpm"
+#include "images/logo-180.xpm"
 
 static const char hex[128] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
                               0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
@@ -66,7 +66,8 @@ parse_xpm_data (Display *dpy, Visual *visual, Colormap colormap, int depth,
   unsigned long *pixels;
   XImage *ximage = 0;
 
-  if (4 != sscanf (*data, "%d %d %d %d %c", &w, &h, &ncolors, &nbytes, &c))
+  if (4 != sscanf ((const char *) *data,
+                   "%d %d %d %d %c", &w, &h, &ncolors, &nbytes, &c))
     abort();
   if (ncolors < 1 || ncolors > 255)
     abort();
@@ -79,7 +80,7 @@ parse_xpm_data (Display *dpy, Visual *visual, Colormap colormap, int depth,
   if (mask_ret)
     {
       int s = (w8 * h) + 1;
-      *mask_ret = (char *) malloc (s);
+      *mask_ret = (unsigned char *) malloc (s);
       if (!*mask_ret)
         mask_ret = 0;
       else
@@ -226,8 +227,9 @@ xscreensaver_logo (Display *dpy, Window window, Colormap cmap,
 
       if (mask_ret && mask)
         {
-          *mask_ret = XCreatePixmapFromBitmapData (dpy, window, mask,
-                                                   iw, ih, 1L, 0L, 1);
+          *mask_ret = (Pixmap)
+            XCreatePixmapFromBitmapData (dpy, window, (char *) mask,
+                                         iw, ih, 1L, 0L, 1);
           free (mask);
         }
     }