X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?p=xscreensaver;a=blobdiff_plain;f=hacks%2Fglx%2Fjigglypuff.c;h=fea13fdd675b4a25b5b4264e4c9a806f7ca9f917;hp=8556a5beceeab8e8fbf7b97c54175ca682081983;hb=78add6e627ee5f10e1fa6f3852602ea5066eee5a;hpb=39809ded547bdbb08207d3e514950425215b4410 diff --git a/hacks/glx/jigglypuff.c b/hacks/glx/jigglypuff.c index 8556a5be..fea13fdd 100644 --- a/hacks/glx/jigglypuff.c +++ b/hacks/glx/jigglypuff.c @@ -52,9 +52,9 @@ # include "config.h" #endif -#include "xpm-ximage.h" +#include "ximage-loader.h" #include "gltrackball.h" -#include "../images/jigglymap.xpm" +#include "images/gen/jigglymap_png.h" #ifdef USE_GL @@ -768,8 +768,8 @@ static void update_shape(jigglystruct *js) 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,