X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?p=xscreensaver;a=blobdiff_plain;f=hacks%2Fglx%2Fpulsar.c;h=f4535670bf7250c0d1ebd70326b1b07da55a8fd4;hp=0e99abbe26ee0aa911bedf9e4e99b003cb996a6c;hb=6a1da724858673ac40aa13a9612340d8bed8c7b9;hpb=96bdd7cf6ea60c418a76921acaf0e34d6f5be930 diff --git a/hacks/glx/pulsar.c b/hacks/glx/pulsar.c index 0e99abbe..f4535670 100644 --- a/hacks/glx/pulsar.c +++ b/hacks/glx/pulsar.c @@ -266,7 +266,7 @@ void Create_Texture(ModeInfo *mi, const char *filename) { XImage *ximage = xpm_file_to_ximage (MI_DISPLAY (mi), MI_VISUAL (mi), MI_COLORMAP (mi), filename); - image = ximage->data; + image = (GLubyte *) ximage->data; width = ximage->width; height = ximage->height; format = GL_RGBA; @@ -301,7 +301,7 @@ void Create_Texture(ModeInfo *mi, const char *filename) GL_UNSIGNED_BYTE, image); if (status) { - const char *s = gluErrorString (status); + const char *s = (char *) gluErrorString (status); fprintf (stderr, "%s: error mipmapping %dx%d texture: %s\n", progname, width, height, (s ? s : "(unknown)"));