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
/
lavalite.c
diff --git
a/hacks/glx/lavalite.c
b/hacks/glx/lavalite.c
index 6f57bf7d0d592284972bff53df522a81c5ddc6b0..73d5805ed0d093218c7830d2236485f21be04192 100644
(file)
--- a/
hacks/glx/lavalite.c
+++ b/
hacks/glx/lavalite.c
@@
-92,7
+92,7
@@
#include "marching.h"
#include "rotator.h"
#include "gltrackball.h"
#include "marching.h"
#include "rotator.h"
#include "gltrackball.h"
-#include "x
pm-ximage
.h"
+#include "x
image-loader
.h"
#include <ctype.h>
#ifdef USE_GL /* whole file */
#include <ctype.h>
#ifdef USE_GL /* whole file */
@@
-333,7
+333,6
@@
load_texture (ModeInfo *mi, const char *filename)
{
Display *dpy = mi->dpy;
Visual *visual = mi->xgwa.visual;
{
Display *dpy = mi->dpy;
Visual *visual = mi->xgwa.visual;
- Colormap cmap = mi->xgwa.colormap;
char buf[1024];
XImage *image;
char buf[1024];
XImage *image;
@@
-345,7
+344,7
@@
load_texture (ModeInfo *mi, const char *filename)
return False;
}
return False;
}
- image =
xpm_file_to_ximage (dpy, visual, cmap
, filename);
+ image =
file_to_ximage (dpy, visual
, filename);
if (!image) return False;
clear_gl_error();
if (!image) return False;
clear_gl_error();