ftp://ftp.demon.nl/disk1/redhat-contrib/libc5/SRPMS/xscreensaver-2.14-1.src.rpm

[xscreensaver] / utils / colors.c

diff --git a/utils/colors.c b/utils/colors.c
index 86b134426b44306620951295d3b629e5f2913b4e..096311624e207601682f6542056870d1171b86bb 100644 (file)
--- a/utils/colors.c
+++ b/utils/colors.c
@@ -50,7 +50,7 @@ allocate_writable_colors (Display *dpy, Colormap cmap,
   while (got < desired
         && requested > 0)
     {
-      if (desired - got > requested)
+      if (desired - got < requested)
        requested = desired - got;
 
       if (XAllocColorCells (dpy, cmap, False, 0, 0, new_pixels, requested))
@@ -494,7 +494,7 @@ make_smooth_colormap (Display *dpy, Visual *visual, Colormap cmap,
          if (dh < 0) dh = -dh;
          if (dh > 0.5) dh = 0.5 - (dh - 0.5);
          distance = sqrt ((dh * dh) +
-                          ((s[j] - s[i]) * (s[j] - v[i])) +
+                          ((s[j] - s[i]) * (s[j] - s[i])) +
                           ((v[j] - v[i]) * (v[j] - v[i])));
          if (distance < 0.2)
            goto REPICK_THIS_COLOR;