Commit a690a978 authored by Paul Eggert's avatar Paul Eggert
Browse files

* xterm.c (x_alloc_nearest_color_1): Go back to original algorithm.

parent 01103c44
2011-06-13 Paul Eggert <eggert@cs.ucla.edu> 2011-06-13 Paul Eggert <eggert@cs.ucla.edu>
* xterm.c (x_alloc_nearest_color_1): Use a more-precise algorithm * xterm.c (x_alloc_nearest_color_1): Prefer int to long when int works.
for nearest color, one that neither overflows nor relies on unsigned
arithmetic.
Remove unnecessary casts. Remove unnecessary casts.
* xterm.c (x_term_init): * xterm.c (x_term_init):
......
...@@ -1697,7 +1697,7 @@ x_alloc_nearest_color_1 (Display *dpy, Colormap cmap, XColor *color) ...@@ -1697,7 +1697,7 @@ x_alloc_nearest_color_1 (Display *dpy, Colormap cmap, XColor *color)
a least-squares matching, which is what X uses for closest a least-squares matching, which is what X uses for closest
color matching with StaticColor visuals. */ color matching with StaticColor visuals. */
int nearest, i; int nearest, i;
int max_color_delta = (1 << (16 - 2)) - 1; int max_color_delta = 255;
int max_delta = 3 * max_color_delta; int max_delta = 3 * max_color_delta;
int nearest_delta = max_delta + 1; int nearest_delta = max_delta + 1;
int ncells; int ncells;
...@@ -1705,9 +1705,9 @@ x_alloc_nearest_color_1 (Display *dpy, Colormap cmap, XColor *color) ...@@ -1705,9 +1705,9 @@ x_alloc_nearest_color_1 (Display *dpy, Colormap cmap, XColor *color)
for (nearest = i = 0; i < ncells; ++i) for (nearest = i = 0; i < ncells; ++i)
{ {
int dred = (color->red >> 2) - (cells[i].red >> 2); int dred = (color->red >> 8) - (cells[i].red >> 8);
int dgreen = (color->green >> 2) - (cells[i].green >> 2); int dgreen = (color->green >> 8) - (cells[i].green >> 8);
int dblue = (color->blue >> 2) - (cells[i].blue >> 2); int dblue = (color->blue >> 8) - (cells[i].blue >> 8);
int delta = dred * dred + dgreen * dgreen + dblue * dblue; int delta = dred * dred + dgreen * dgreen + dblue * dblue;
if (delta < nearest_delta) if (delta < nearest_delta)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment