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
/
extrusion.c
diff --git
a/hacks/glx/extrusion.c
b/hacks/glx/extrusion.c
index b175ee4dec5e64ceeac91d2a0b525792d9a25bb3..3dee71ce0b386b92ce0d4c425b8c59400a9dd603 100644
(file)
--- a/
hacks/glx/extrusion.c
+++ b/
hacks/glx/extrusion.c
@@
-51,7
+51,7
@@
#undef countof
#define countof(x) (sizeof((x))/sizeof((*x)))
#undef countof
#define countof(x) (sizeof((x))/sizeof((*x)))
-#include "x
pm-ximage
.h"
+#include "x
image-loader
.h"
#include "rotator.h"
#include "gltrackball.h"
#include "extrusion.h"
#include "rotator.h"
#include "gltrackball.h"
#include "extrusion.h"
@@
-224,8
+224,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;