projects
/
xscreensaver
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
http://svn.poeml.de/viewvc/ppc/src-unpacked/xscreensaver/xscreensaver-4.12.tar.bz2...
[xscreensaver]
/
hacks
/
glx
/
pulsar.c
diff --git
a/hacks/glx/pulsar.c
b/hacks/glx/pulsar.c
index 0e99abbe26ee0aa911bedf9e4e99b003cb996a6c..f4535670bf7250c0d1ebd70326b1b07da55a8fd4 100644
(file)
--- 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);
{
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;
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)
{
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)"));
fprintf (stderr, "%s: error mipmapping %dx%d texture: %s\n",
progname, width, height,
(s ? s : "(unknown)"));