X-Git-Url: http://git.hungrycats.org/cgi-bin/gitweb.cgi?p=xscreensaver;a=blobdiff_plain;f=hacks%2Fslidescreen.c;h=ae08b2ca8a6e3f9d6a79f690230f0d1e774d90cb;hp=dde3a21a5936da401ef191753ed345557d72d877;hb=6a1da724858673ac40aa13a9612340d8bed8c7b9;hpb=96bdd7cf6ea60c418a76921acaf0e34d6f5be930 diff --git a/hacks/slidescreen.c b/hacks/slidescreen.c index dde3a21a..ae08b2ca 100644 --- a/hacks/slidescreen.c +++ b/hacks/slidescreen.c @@ -98,7 +98,7 @@ init_slide (Display *dpy, Window window) for(i = 0; i < max; i++) { long rd, gd, bd; - unsigned long d; + unsigned long dd; if (!fg_ok) { rd = (all[i].red >> 8) - (fgc.red >> 8); @@ -107,12 +107,12 @@ init_slide (Display *dpy, Window window) if (rd < 0) rd = -rd; if (gd < 0) gd = -gd; if (bd < 0) bd = -bd; - d = (rd << 1) + (gd << 2) + bd; - if (d < fgd) + dd = (rd << 1) + (gd << 2) + bd; + if (dd < fgd) { - fgd = d; + fgd = dd; fg = all[i].pixel; - if (d == 0) + if (dd == 0) fg_ok = True; } } @@ -125,12 +125,12 @@ init_slide (Display *dpy, Window window) if (rd < 0) rd = -rd; if (gd < 0) gd = -gd; if (bd < 0) bd = -bd; - d = (rd << 1) + (gd << 2) + bd; - if (d < bgd) + dd = (rd << 1) + (gd << 2) + bd; + if (dd < bgd) { - bgd = d; + bgd = dd; bg = all[i].pixel; - if (d == 0) + if (dd == 0) bg_ok = True; } }