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
/
jigglypuff.c
diff --git
a/hacks/glx/jigglypuff.c
b/hacks/glx/jigglypuff.c
index 8556a5beceeab8e8fbf7b97c54175ca682081983..fea13fdd675b4a25b5b4264e4c9a806f7ca9f917 100644
(file)
--- a/
hacks/glx/jigglypuff.c
+++ b/
hacks/glx/jigglypuff.c
@@
-52,9
+52,9
@@
# include "config.h"
#endif
# include "config.h"
#endif
-#include "x
pm-ximage
.h"
+#include "x
image-loader
.h"
#include "gltrackball.h"
#include "gltrackball.h"
-#include "
../images/jigglymap.xpm
"
+#include "
images/gen/jigglymap_png.h
"
#ifdef USE_GL
#ifdef USE_GL
@@
-768,8
+768,8
@@
static void update_shape(jigglystruct *js)
static void init_texture(ModeInfo *mi)
{
static void init_texture(ModeInfo *mi)
{
- XImage *img =
xpm
_to_ximage(mi->dpy, mi->xgwa.visual,
-
mi->xgwa.colormap, jigglymap_xpm
);
+ XImage *img =
image_data
_to_ximage(mi->dpy, mi->xgwa.visual,
+
jigglymap_png, sizeof(jigglymap_png)
);
glTexImage2D(GL_TEXTURE_2D, 0, GL_RGB,
img->width, img->height, 0, GL_RGBA,
glTexImage2D(GL_TEXTURE_2D, 0, GL_RGB,
img->width, img->height, 0, GL_RGBA,