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.40.tar.gz
[xscreensaver]
/
hacks
/
glx
/
atlantis.c
diff --git
a/hacks/glx/atlantis.c
b/hacks/glx/atlantis.c
index 44bc6eb69488bf1d2abe98ab684a1c86f425368b..04bde12e5a5434f62c8543019428cedc83da6fb3 100644
(file)
--- a/
hacks/glx/atlantis.c
+++ b/
hacks/glx/atlantis.c
@@
-165,19
+165,18
@@
ModStruct atlantis_description =
static atlantisstruct *atlantis = NULL;
static atlantisstruct *atlantis = NULL;
-#include "x
pm-ximage
.h"
+#include "x
image-loader
.h"
-#include "
../images/sea-texture.xpm
"
+#include "
images/gen/sea-texture_png.h
"
static void
parse_image_data(ModeInfo *mi)
{
atlantisstruct *ap = &atlantis[MI_SCREEN(mi)];
static void
parse_image_data(ModeInfo *mi)
{
atlantisstruct *ap = &atlantis[MI_SCREEN(mi)];
- ap->texture = xpm_to_ximage (mi->dpy,
- mi->xgwa.visual,
- mi->xgwa.colormap,
- sea_texture);
+ ap->texture = image_data_to_ximage (mi->dpy, mi->xgwa.visual,
+ sea_texture_png,
+ sizeof(sea_texture_png));
}
static void
}
static void