X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?p=xscreensaver;a=blobdiff_plain;f=hacks%2Fglx%2Fextrusion.c;h=3dee71ce0b386b92ce0d4c425b8c59400a9dd603;hp=b175ee4dec5e64ceeac91d2a0b525792d9a25bb3;hb=78add6e627ee5f10e1fa6f3852602ea5066eee5a;hpb=39809ded547bdbb08207d3e514950425215b4410 diff --git a/hacks/glx/extrusion.c b/hacks/glx/extrusion.c index b175ee4d..3dee71ce 100644 --- a/hacks/glx/extrusion.c +++ b/hacks/glx/extrusion.c @@ -51,7 +51,7 @@ #undef countof #define countof(x) (sizeof((x))/sizeof((*x))) -#include "xpm-ximage.h" +#include "ximage-loader.h" #include "rotator.h" #include "gltrackball.h" #include "extrusion.h" @@ -224,8 +224,8 @@ static void Create_Texture(ModeInfo *mi, const char *filename) } 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;