===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/tmux/colour.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -c -r1.3 -r1.4
*** src/usr.bin/tmux/colour.c	2011/01/08 00:48:54	1.3
--- src/usr.bin/tmux/colour.c	2011/08/22 10:14:15	1.4
***************
*** 1,4 ****
! /* $OpenBSD: colour.c,v 1.3 2011/01/08 00:48:54 nicm Exp $ */
  
  /*
   * Copyright (c) 2008 Nicholas Marriott <nicm@users.sourceforge.net>
--- 1,4 ----
! /* $OpenBSD: colour.c,v 1.4 2011/08/22 10:14:15 nicm Exp $ */
  
  /*
   * Copyright (c) 2008 Nicholas Marriott <nicm@users.sourceforge.net>
***************
*** 19,25 ****
  #include <sys/types.h>
  
  #include <ctype.h>
- #include <math.h>
  #include <stdlib.h>
  #include <string.h>
  
--- 19,24 ----
***************
*** 41,47 ****
  struct colour_rgb *colour_rgb_256;
  
  void	colour_rgb_generate256(void);
! double	colour_rgb_distance(struct colour_rgb *, struct colour_rgb *);
  int	colour_rgb_find(struct colour_rgb *);
  
  /* Generate 256 colour RGB table. */
--- 40,46 ----
  struct colour_rgb *colour_rgb_256;
  
  void	colour_rgb_generate256(void);
! u_int	colour_rgb_distance(struct colour_rgb *, struct colour_rgb *);
  int	colour_rgb_find(struct colour_rgb *);
  
  /* Generate 256 colour RGB table. */
***************
*** 91,97 ****
  }
  
  /* Get colour RGB distance. */
! double
  colour_rgb_distance(struct colour_rgb *rgb1, struct colour_rgb *rgb2)
  {
  	int	r, g, b;
--- 90,96 ----
  }
  
  /* Get colour RGB distance. */
! u_int
  colour_rgb_distance(struct colour_rgb *rgb1, struct colour_rgb *rgb2)
  {
  	int	r, g, b;
***************
*** 99,119 ****
  	r = rgb1->r - rgb2->r;
  	g = rgb1->g - rgb2->g;
  	b = rgb1->b - rgb2->b;
! 	return (sqrt(r * r + g * g + b * b));
  }
  
  /* Work out the nearest colour from the 256 colour set. */
  int
  colour_rgb_find(struct colour_rgb *rgb)
  {
! 	double	distance, lowest;
! 	u_int	colour, i;
  
  	if (colour_rgb_256 == NULL)
  		colour_rgb_generate256();
  
  	colour = 16;
! 	lowest = INFINITY;
  	for (i = 0; i < 240; i++) {
  		distance = colour_rgb_distance(&colour_rgb_256[i], rgb);
  		if (distance < lowest) {
--- 98,117 ----
  	r = rgb1->r - rgb2->r;
  	g = rgb1->g - rgb2->g;
  	b = rgb1->b - rgb2->b;
! 	return (r * r + g * g + b * b);
  }
  
  /* Work out the nearest colour from the 256 colour set. */
  int
  colour_rgb_find(struct colour_rgb *rgb)
  {
! 	u_int	distance, lowest, colour, i;
  
  	if (colour_rgb_256 == NULL)
  		colour_rgb_generate256();
  
  	colour = 16;
! 	lowest = UINT_MAX;
  	for (i = 0; i < 240; i++) {
  		distance = colour_rgb_distance(&colour_rgb_256[i], rgb);
  		if (distance < lowest) {