From http://www.jwz.org/xscreensaver/xscreensaver-5.39.tar.gz

[xscreensaver] / hacks / glx / gleidescope.c

diff --git a/hacks/glx/gleidescope.c b/hacks/glx/gleidescope.c
index 7e1d73d049bb17c47f113a0c32d8a6671178cab3..ec333880f236d4771fd426c8c7f7a528dd4d5873 100644 (file)
--- a/hacks/glx/gleidescope.c
+++ b/hacks/glx/gleidescope.c
@@ -86,7 +86,7 @@
 #ifdef USE_GL
 
 #include "colors.h"
-#include "xpm-ximage.h"
+#include "ximage-loader.h"
 #include "grab-ximage.h"
 
 #ifdef GRAB
@@ -882,8 +882,7 @@ setup_file_texture (ModeInfo *mi, char *filename, texture *texture)
        Visual *visual = mi->xgwa.visual;
        char buf[1024];
 
-       Colormap cmap = mi->xgwa.colormap;
-       XImage *image = xpm_file_to_ximage (dpy, visual, cmap, filename);
+       XImage *image = file_to_ximage (dpy, visual, filename);
     if (!image) return False;
 
 #ifdef DEBUG