projects
/
xscreensaver
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
From http://www.jwz.org/xscreensaver/xscreensaver-5.39.tar.gz
[xscreensaver]
/
hacks
/
glx
/
pulsar.c
diff --git
a/hacks/glx/pulsar.c
b/hacks/glx/pulsar.c
index 869933b6e24a4c89e11935b5d062eaf87187a4fa..285b5decc344fed70bda1c3a65fe1d70630cd6e1 100644
(file)
--- a/
hacks/glx/pulsar.c
+++ b/
hacks/glx/pulsar.c
@@
-61,7
+61,7
@@
# endif /* VMS */
#endif
# endif /* VMS */
#endif
-#include "x
pm-ximage
.h"
+#include "x
image-loader
.h"
/* Functions for loading and storing textures */
/* Functions for loading and storing textures */
@@
-236,8
+236,8
@@
static void Create_Texture(ModeInfo *mi, const char *filename)
}
else
{
}
else
{
- XImage *ximage =
xpm_
file_to_ximage (MI_DISPLAY (mi), MI_VISUAL (mi),
-
MI_COLORMAP (mi),
filename);
+ XImage *ximage = file_to_ximage (MI_DISPLAY (mi), MI_VISUAL (mi),
+ filename);
if (! ximage)
goto BUILTIN;
image = (GLubyte *) ximage->data;
if (! ximage)
goto BUILTIN;
image = (GLubyte *) ximage->data;