circlecloud/tmux
1
0
Fork 0
mirror of https://github.com/tmux/tmux.git synced 2024-12-13 10:08:47 +00:00
Code Issues Projects Releases Wiki Activity

Sync OpenBSD patchset 948:

Browse Source 
There is no need to use sqrt()/INFINITY here which simplifies the code
and makes it more portable, from Havard Eidnes.
This commit is contained in:
Tiago Cunha 2011-08-25 21:11:16 +00:00
parent 2651c0d69c
commit a54e670301
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
colour.c
View File

@ -19,7 +19,6 @@
#include <sys/types.h> #include <sys/types.h>
#include <ctype.h> #include <ctype.h>
#include <math.h>
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
@ -41,7 +40,7 @@ struct colour_rgb {
struct colour_rgb *colour_rgb_256; struct colour_rgb *colour_rgb_256;
void colour_rgb_generate256(void); void colour_rgb_generate256(void);
double colour_rgb_distance(struct colour_rgb *, struct colour_rgb *); u_int colour_rgb_distance(struct colour_rgb *, struct colour_rgb *);
int colour_rgb_find(struct colour_rgb *); int colour_rgb_find(struct colour_rgb *);
/* Generate 256 colour RGB table. */ /* Generate 256 colour RGB table. */
@ -91,7 +90,7 @@ colour_rgb_generate256(void)
} }
/* Get colour RGB distance. */ /* Get colour RGB distance. */
double u_int
colour_rgb_distance(struct colour_rgb *rgb1, struct colour_rgb *rgb2) colour_rgb_distance(struct colour_rgb *rgb1, struct colour_rgb *rgb2)
{ {
int r, g, b; int r, g, b;
@ -99,21 +98,20 @@ colour_rgb_distance(struct colour_rgb *rgb1, struct colour_rgb *rgb2)
r = rgb1->r - rgb2->r; r = rgb1->r - rgb2->r;
g = rgb1->g - rgb2->g; g = rgb1->g - rgb2->g;
b = rgb1->b - rgb2->b; b = rgb1->b - rgb2->b;
return (sqrt(r * r + g * g + b * b)); return (r * r + g * g + b * b);
} }
/* Work out the nearest colour from the 256 colour set. */ /* Work out the nearest colour from the 256 colour set. */
int int
colour_rgb_find(struct colour_rgb *rgb) colour_rgb_find(struct colour_rgb *rgb)
{ {
double distance, lowest; u_int distance, lowest, colour, i;
u_int colour, i;
if (colour_rgb_256 == NULL) if (colour_rgb_256 == NULL)
colour_rgb_generate256(); colour_rgb_generate256();
colour = 16; colour = 16;
lowest = INFINITY; lowest = UINT_MAX;
for (i = 0; i < 240; i++) { for (i = 0; i < 240; i++) {
distance = colour_rgb_distance(&colour_rgb_256[i], rgb); distance = colour_rgb_distance(&colour_rgb_256[i], rgb);
if (distance < lowest) { if (distance < lowest) {