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

[xscreensaver] / hacks / glx / timetunnel.c

diff --git a/hacks/glx/timetunnel.c b/hacks/glx/timetunnel.c
index 882635000deee9be0c1b20f31589ec0f6fb2b0c4..1dd5065ddc86f1a5d479defd90fbdca10daf3fc0 100644 (file)
--- a/hacks/glx/timetunnel.c
+++ b/hacks/glx/timetunnel.c
@@ -877,8 +877,8 @@ static void LoadTexture(ModeInfo * mi, char **fn, const char *filename, GLuint t
                        by = by * 2;
        }
 
-#ifndef HAVE_JWZGLES
        if (rescale) {
+#ifndef HAVE_JWZGLES
                tmpbuf = calloc(bx * by * 4, sizeof(unsigned char));
                if (gluScaleImage(GL_RGBA, teximage->width, teximage->height, GL_UNSIGNED_BYTE, teximage->data,
                                bx, by, GL_UNSIGNED_BYTE, tmpbuf))
@@ -888,9 +888,9 @@ static void LoadTexture(ModeInfo * mi, char **fn, const char *filename, GLuint t
                teximage->data = (char *) tmpbuf;
                teximage->width = bx;
                teximage->height= by;
+#endif /* !HAVE_JWZGLES */
        }
        /* end rescale code */
-#endif /* !HAVE_JWZGLES */
                
        if (anegative ) {
                for (ix = 0 ; ix < teximage->height * teximage->width; ix++)
@@ -1031,14 +1031,7 @@ init_tunnel (ModeInfo *mi)
   wire = 0;
 # endif
 
-  if (!tconf) {
-    tconf = (tunnel_configuration *)
-      calloc (MI_NUM_SCREENS(mi), sizeof (tunnel_configuration));
-    if (!tconf) {
-      fprintf(stderr, "%s: out of memory\n", progname);
-      exit(1);
-    }
-  }
+  MI_INIT (mi, tconf, NULL);
 
   tc = &tconf[MI_SCREEN(mi)];