--- ray/src/common/color.c 1992/10/02 15:59:58 2.4 +++ ray/src/common/color.c 2014/05/31 20:13:31 2.17 @@ -1,55 +1,61 @@ -/* 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.17 2014/05/31 20:13:31 greg Exp $"; #endif - /* * color.c - routines for color calculations. * - * 10/10/85 + * Externals declared in color.h */ -#include +#include "copyright.h" +#include +#include +#include #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 */ -#ifndef frexp -extern double frexp(); -#endif - char * -tempbuffer(len) /* get a temporary buffer */ -unsigned len; +tempbuffer( /* get a temporary buffer */ + unsigned int len +) { - extern char *malloc(), *realloc(); static char *tempbuf = NULL; - static int tempbuflen = 0; + 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); } -fwritecolrs(scanline, len, fp) /* write out a colr scanline */ -register COLR *scanline; -unsigned len; -register FILE *fp; +int +fwritecolrs( /* write out a colr scanline */ + COLR *scanline, + int len, + FILE *fp +) { - register int i, j, beg, cnt; + int i, j, beg, cnt = 1; int c2; - if (len < MINELEN | len > 0x7fff) /* 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); @@ -93,15 +99,55 @@ register FILE *fp; } -freadcolrs(scanline, len, fp) /* read in an encoded colr scanline */ -register COLR *scanline; -int len; -register FILE *fp; +static int +oldreadcolrs( /* read in an old colr scanline */ + COLR *scanline, + int len, + FILE *fp +) { - register int i, j; - int code; + int rshift; + 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( /* read in an encoded colr scanline */ + COLR *scanline, + int len, + FILE *fp +) +{ + int i, j; + int code, val; /* determine scanline type */ - if (len < MINELEN | len > 0x7fff) + if ((len < MINELEN) | (len > MAXELEN)) return(oldreadcolrs(scanline, len, fp)); if ((i = getc(fp)) == EOF) return(-1); @@ -126,61 +172,37 @@ register FILE *fp; if ((code = getc(fp)) == EOF) return(-1); if (code > 128) { /* run */ - scanline[j++][i] = getc(fp); - for (code &= 127; --code; j++) - scanline[j][i] = scanline[j-1][i]; - } else /* non-run */ + code &= 127; + if ((val = getc(fp)) == EOF) + return -1; + if (j + code > len) + return -1; /* overrun */ while (code--) - scanline[j++][i] = getc(fp); - } - 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; + scanline[j++][i] = val; + } else { /* non-run */ + if (j + code > len) + return -1; /* overrun */ + while (code--) { + if ((val = getc(fp)) == EOF) + return -1; + scanline[j++][i] = val; + } } - } + } return(0); } -fwritescan(scanline, len, fp) /* write out a scanline */ -register COLOR *scanline; -int len; -FILE *fp; +int +fwritescan( /* write out a scanline */ + COLOR *scanline, + int len, + FILE *fp +) { COLR *clrscan; int n; - register COLR *sp; + COLR *sp; /* get scanline buffer */ if ((sp = (COLR *)tempbuffer(len*sizeof(COLR))) == NULL) return(-1); @@ -198,12 +220,14 @@ FILE *fp; } -freadscan(scanline, len, fp) /* read in a scanline */ -register COLOR *scanline; -int len; -FILE *fp; +int +freadscan( /* read in a scanline */ + COLOR *scanline, + int len, + FILE *fp +) { - register COLR *clrscan; + COLR *clrscan; if ((clrscan = (COLR *)tempbuffer(len*sizeof(COLR))) == NULL) return(-1); @@ -225,9 +249,13 @@ FILE *fp; } -setcolr(clr, r, g, b) /* assign a short color value */ -register COLR clr; -double r, g, b; +void +setcolr( /* assign a short color value */ + COLR clr, + double r, + double g, + double b +) { double d; int e; @@ -241,18 +269,30 @@ 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; } -colr_color(col, clr) /* convert short to float color */ -register COLOR col; -register COLR clr; +void +colr_color( /* convert short to float color */ + COLOR col, + COLR clr +) { double f; @@ -267,11 +307,14 @@ register COLR clr; } -bigdiff(c1, c2, md) /* c1 delta c2 > md? */ -register COLOR c1, c2; -double md; +int +bigdiff( /* c1 delta c2 > md? */ + COLOR c1, + COLOR c2, + double md +) { - register int i; + int i; for (i = 0; i < 3; i++) if (colval(c1,i)-colval(c2,i) > md*colval(c2,i) ||