--- ray/src/common/color.c	1993/06/04 14:51:39	2.7
+++ ray/src/common/color.c	2004/09/14 02:53:50	2.15
@@ -1,21 +1,29 @@
-/* Copyright (c) 1991 Regents of the University of California */
-
 #ifndef lint
-static char SCCSid[] = "$SunId$ LBL";
+static const char	RCSid[] = "$Id: color.c,v 2.15 2004/09/14 02:53:50 greg Exp $";
 #endif
-
 /*
  *  color.c - routines for color calculations.
  *
- *     10/10/85
+ *  Externals declared in color.h
  */
 
+#include "copyright.h"
+
 #include  <stdio.h>
 
+#include  <stdlib.h>
+
 #include  <math.h>
 
 #include  "color.h"
 
+#ifdef getc_unlocked		/* avoid horrendous overhead of flockfile */
+#undef getc
+#undef putc
+#define getc    getc_unlocked
+#define putc    putc_unlocked
+#endif
+
 #define  MINELEN	8	/* minimum scanline length for encoding */
 #define  MAXELEN	0x7fff	/* maximum scanline length for encoding */
 #define  MINRUN		4	/* minimum run length */
@@ -23,32 +31,32 @@ static char SCCSid[] = "$SunId$ LBL";
 
 char *
 tempbuffer(len)			/* get a temporary buffer */
-unsigned  len;
+unsigned int  len;
 {
-	extern char  *malloc(), *realloc();
 	static char  *tempbuf = NULL;
 	static unsigned  tempbuflen = 0;
 
 	if (len > tempbuflen) {
 		if (tempbuflen > 0)
-			tempbuf = realloc(tempbuf, len);
+			tempbuf = (char *)realloc((void *)tempbuf, len);
 		else
-			tempbuf = malloc(len);
+			tempbuf = (char *)malloc(len);
 		tempbuflen = tempbuf==NULL ? 0 : len;
 	}
 	return(tempbuf);
 }
 
 
+int
 fwritecolrs(scanline, len, fp)		/* write out a colr scanline */
 register COLR  *scanline;
-unsigned  len;
+int  len;
 register FILE  *fp;
 {
-	register int  i, j, beg, cnt;
+	register int  i, j, beg, cnt = 1;
 	int  c2;
 	
-	if (len < MINELEN | len > MAXELEN)	/* OOBs, write out flat */
+	if ((len < MINELEN) | (len > MAXELEN))	/* OOBs, write out flat */
 		return(fwrite((char *)scanline,sizeof(COLR),len,fp) - len);
 					/* put magic header */
 	putc(2, fp);
@@ -92,6 +100,44 @@ register FILE  *fp;
 }
 
 
+static int
+oldreadcolrs(scanline, len, fp)		/* read in an old colr scanline */
+register COLR  *scanline;
+int  len;
+register FILE  *fp;
+{
+	int  rshift;
+	register int  i;
+	
+	rshift = 0;
+	
+	while (len > 0) {
+		scanline[0][RED] = getc(fp);
+		scanline[0][GRN] = getc(fp);
+		scanline[0][BLU] = getc(fp);
+		scanline[0][EXP] = getc(fp);
+		if (feof(fp) || ferror(fp))
+			return(-1);
+		if (scanline[0][RED] == 1 &&
+				scanline[0][GRN] == 1 &&
+				scanline[0][BLU] == 1) {
+			for (i = scanline[0][EXP] << rshift; i > 0; i--) {
+				copycolr(scanline[0], scanline[-1]);
+				scanline++;
+				len--;
+			}
+			rshift += 8;
+		} else {
+			scanline++;
+			len--;
+			rshift = 0;
+		}
+	}
+	return(0);
+}
+
+
+int
 freadcolrs(scanline, len, fp)		/* read in an encoded colr scanline */
 register COLR  *scanline;
 int  len;
@@ -100,7 +146,7 @@ register FILE  *fp;
 	register int  i, j;
 	int  code, val;
 					/* determine scanline type */
-	if (len < MINELEN | len > MAXELEN)
+	if ((len < MINELEN) | (len > MAXELEN))
 		return(oldreadcolrs(scanline, len, fp));
 	if ((i = getc(fp)) == EOF)
 		return(-1);
@@ -126,53 +172,22 @@ register FILE  *fp;
 		    return(-1);
 		if (code > 128) {	/* run */
 		    code &= 127;
-		    val = getc(fp);
+		    if ((val = getc(fp)) == EOF)
+			return -1;
 		    while (code--)
 			scanline[j++][i] = val;
 		} else			/* non-run */
-		    while (code--)
-			scanline[j++][i] = getc(fp);
+		    while (code--) {
+			if ((val = getc(fp)) == EOF)
+			    return -1;
+			scanline[j++][i] = val;
+		    }
 	    }
-	return(feof(fp) ? -1 : 0);
-}
-
-
-oldreadcolrs(scanline, len, fp)		/* read in an old colr scanline */
-register COLR  *scanline;
-int  len;
-register FILE  *fp;
-{
-	int  rshift;
-	register int  i;
-	
-	rshift = 0;
-	
-	while (len > 0) {
-		scanline[0][RED] = getc(fp);
-		scanline[0][GRN] = getc(fp);
-		scanline[0][BLU] = getc(fp);
-		scanline[0][EXP] = getc(fp);
-		if (feof(fp) || ferror(fp))
-			return(-1);
-		if (scanline[0][RED] == 1 &&
-				scanline[0][GRN] == 1 &&
-				scanline[0][BLU] == 1) {
-			for (i = scanline[0][EXP] << rshift; i > 0; i--) {
-				copycolr(scanline[0], scanline[-1]);
-				scanline++;
-				len--;
-			}
-			rshift += 8;
-		} else {
-			scanline++;
-			len--;
-			rshift = 0;
-		}
-	}
 	return(0);
 }
 
 
+int
 fwritescan(scanline, len, fp)		/* write out a scanline */
 register COLOR  *scanline;
 int  len;
@@ -198,6 +213,7 @@ FILE  *fp;
 }
 
 
+int
 freadscan(scanline, len, fp)		/* read in a scanline */
 register COLOR  *scanline;
 int  len;
@@ -225,6 +241,7 @@ FILE  *fp;
 }
 
 
+void
 setcolr(clr, r, g, b)		/* assign a short color value */
 register COLR  clr;
 double  r, g, b;
@@ -241,15 +258,26 @@ double  r, g, b;
 		return;
 	}
 
-	d = frexp(d, &e) * 256.0 / d;
+	d = frexp(d, &e) * 255.9999 / d;
 
-	clr[RED] = r * d;
-	clr[GRN] = g * d;
-	clr[BLU] = b * d;
+	if (r > 0.0)
+		clr[RED] = r * d;
+	else
+		clr[RED] = 0;
+	if (g > 0.0)
+		clr[GRN] = g * d;
+	else
+		clr[GRN] = 0;
+	if (b > 0.0)
+		clr[BLU] = b * d;
+	else
+		clr[BLU] = 0;
+
 	clr[EXP] = e + COLXS;
 }
 
 
+void
 colr_color(col, clr)		/* convert short to float color */
 register COLOR  col;
 register COLR  clr;
@@ -267,6 +295,7 @@ register COLR  clr;
 }
 
 
+int
 bigdiff(c1, c2, md)			/* c1 delta c2 > md? */
 register COLOR  c1, c2;
 double  md;