http://packetstormsecurity.org/UNIX/admin/xscreensaver-4.14.tar.gz

[xscreensaver] / hacks / swirl.c

diff --git a/hacks/swirl.c b/hacks/swirl.c
index 5ea1598c54efe007530ea299307c6151fe22f471..93f0c0a63da6721ffdeb3d0e8b4064680de2b171 100644 (file)
--- a/hacks/swirl.c
+++ b/hacks/swirl.c
@@ -1,7 +1,7 @@
 /* -*- Mode: C; tab-width: 4 -*-
  * swirl --- swirly color-cycling patterns.
  */
-#if !defined( lint ) && !defined( SABER )
+#if 0
 static const char sccsid[] = "@(#)swirl.c      4.00 97/01/01 xlockmore";
 #endif
 
@@ -224,9 +224,7 @@ initialise_swirl(ModeInfo * mi, SWIRL_P swirl)
 #endif /* !STANDALONE */
 
 
-#ifdef STANDALONE
-# define MI_COLORMAP MI_WIN_COLORMAP
-#else /* !STANDALONE */
+#ifndef STANDALONE
        swirl->fg = MI_FG_COLOR(mi);
        swirl->bg = MI_BG_COLOR(mi);
        swirl->fgcol.pixel = swirl->fg;
@@ -270,8 +268,9 @@ initialise_image(ModeInfo * mi, SWIRL_P swirl)
          swirl->ximage = XCreateImage(dpy, swirl->visual, swirl->rdepth, ZPixmap,
                                                                   0, 0, swirl->width, swirl->height,
                                                                   8, 0);
-         swirl->ximage->data = swirl->image =
-               (char *) calloc(swirl->height, swirl->ximage->bytes_per_line);
+         swirl->image = (unsigned char *)
+        calloc(swirl->height, swirl->ximage->bytes_per_line);
+      swirl->ximage->data = (char *) swirl->image;
        }
 }