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

[xscreensaver] / hacks / glx / cage.c

diff --git a/hacks/glx/cage.c b/hacks/glx/cage.c
index 654510d28e51f15f159e7a69965a4e8f1cbea6d9..66f48aadc30ab57a8342ced10b64a4f7f54c7612 100644 (file)
--- a/hacks/glx/cage.c
+++ b/hacks/glx/cage.c
@@ -95,8 +95,8 @@ static const char sccsid[] = "@(#)cage.c      5.01 2001/03/01 xlockmore";
 #if 0
 #include "e_textures.h"
 #else
-#include "xpm-ximage.h"
-#include "../images/wood.xpm"
+#include "ximage-loader.h"
+#include "images/gen/wood_png.h"
 #endif
 
 ENTRYPOINT ModeSpecOpt cage_opts =
@@ -363,16 +363,11 @@ pinit(ModeInfo *mi)
        check_gl_error("mipmapping");
 #else
     {
-      XImage *img = xpm_to_ximage (mi->dpy,
-                                   mi->xgwa.visual,
-                                   mi->xgwa.colormap,
-                                   wood_texture);
+      XImage *img = image_data_to_ximage (mi->dpy, mi->xgwa.visual,
+                                          wood_png, sizeof(wood_png));
          glTexImage2D (GL_TEXTURE_2D, 0, GL_RGBA,
                     img->width, img->height, 0,
-                    GL_RGBA,
-                    /* GL_UNSIGNED_BYTE, */
-                    GL_UNSIGNED_INT_8_8_8_8_REV,
-                    img->data);
+                    GL_RGBA, GL_UNSIGNED_BYTE, img->data);
       check_gl_error("texture");
       XDestroyImage (img);
     }