--- ray/src/rt/data.c	1992/11/12 10:11:51	2.4
+++ ray/src/rt/data.c	2004/01/02 11:43:42	2.26
@@ -1,51 +1,57 @@
-/* Copyright (c) 1992 Regents of the University of California */
-
 #ifndef lint
-static char SCCSid[] = "$SunId$ LBL";
+static const char	RCSid[] = "$Id: data.c,v 2.26 2004/01/02 11:43:42 schorsch Exp $";
 #endif
-
 /*
  *  data.c - routines dealing with interpolated data.
- *
- *     6/4/86
  */
 
-#include  "standard.h"
+#include "copyright.h"
 
-#include  "color.h"
+#include  <time.h>
 
+#include  "platform.h"
+#include  "standard.h"
+#include  "color.h"
 #include  "resolu.h"
-
 #include  "data.h"
 
+				/* picture memory usage before warning */
+#ifndef PSIZWARN
+#ifdef SMLMEM
+#define PSIZWARN	1500000
+#else
+#define PSIZWARN	5000000
+#endif
+#endif
 
-extern char  *fgetword();
+#ifndef TABSIZ
+#define TABSIZ		97		/* table size (prime) */
+#endif
 
-extern char  *libpath;			/* library search path */
+#define hash(s)		(shash(s)%TABSIZ)
 
-static DATARRAY	 *dlist = NULL;		/* data array list */
 
-static DATARRAY	 *plist = NULL;		/* picture list */
+static DATARRAY	 *dtab[TABSIZ];		/* data array list */
 
+static gethfunc headaspect;
 
+
 DATARRAY *
 getdata(dname)				/* get data array dname */
 char  *dname;
 {
-	char  word[64];
 	char  *dfname;
 	FILE  *fp;
 	int  asize;
 	register int  i, j;
 	register DATARRAY  *dp;
 						/* look for array in list */
-	for (dp = dlist; dp != NULL; dp = dp->next)
+	for (dp = dtab[hash(dname)]; dp != NULL; dp = dp->next)
 		if (!strcmp(dname, dp->name))
 			return(dp);		/* found! */
-
 	/*
 	 *	If we haven't loaded the data already, we will look
-	 *  for it in the directorys specified by the library path.
+	 *  for it in the directories specified by the library path.
 	 *
 	 *	The file has the following format:
 	 *
@@ -63,51 +69,46 @@ char  *dname;
 	 *		0 0 ni p0i p1i .. pni
 	 */
 
-	if ((dfname = getpath(dname, libpath, R_OK)) == NULL) {
+	if ((dfname = getpath(dname, getrlibpath(), R_OK)) == NULL) {
 		sprintf(errmsg, "cannot find data file \"%s\"", dname);
 		error(USER, errmsg);
 	}
-	if ((dp = (DATARRAY *)malloc(sizeof(DATARRAY))) == NULL)
-		goto memerr;
-
-	dp->name = savestr(dname);
-
 	if ((fp = fopen(dfname, "r")) == NULL) {
 		sprintf(errmsg, "cannot open data file \"%s\"", dfname);
 		error(SYSTEM, errmsg);
 	}
 							/* get dimensions */
-	if (fgetword(word, sizeof(word), fp) == NULL || !isint(word))
+	if (fgetval(fp, 'i', (char *)&asize) <= 0)
 		goto scanerr;
-	dp->nd = atoi(word);
-	if (dp->nd <= 0 || dp->nd > MAXDDIM) {
+	if ((asize <= 0) | (asize > MAXDDIM)) {
 		sprintf(errmsg, "bad number of dimensions for \"%s\"", dname);
 		error(USER, errmsg);
 	}
+	if ((dp = (DATARRAY *)malloc(sizeof(DATARRAY))) == NULL)
+		goto memerr;
+	dp->name = savestr(dname);
+	dp->type = DATATY;
+	dp->nd = asize;
 	asize = 1;
 	for (i = 0; i < dp->nd; i++) {
-		if (fgetword(word, sizeof(word), fp) == NULL || !isflt(word))
+		if (fgetval(fp, DATATY, (char *)&dp->dim[i].org) <= 0)
 			goto scanerr;
-		dp->dim[i].org = atof(word);
-		if (fgetword(word, sizeof(word), fp) == NULL || !isflt(word))
+		if (fgetval(fp, DATATY, (char *)&dp->dim[i].siz) <= 0)
 			goto scanerr;
-		dp->dim[i].siz = atof(word);
-		if (fgetword(word, sizeof(word), fp) == NULL || !isint(word))
+		if (fgetval(fp, 'i', (char *)&dp->dim[i].ne) <= 0)
 			goto scanerr;
-		dp->dim[i].ne = atoi(word);
 		if (dp->dim[i].ne < 2)
 			goto scanerr;
 		asize *= dp->dim[i].ne;
 		if ((dp->dim[i].siz -= dp->dim[i].org) == 0) {
-			dp->dim[i].p = (double *)malloc(dp->dim[i].ne*sizeof(double));
+			dp->dim[i].p = (DATATYPE *)
+					malloc(dp->dim[i].ne*sizeof(DATATYPE));
 			if (dp->dim[i].p == NULL)
 				goto memerr;
-			for (j = 0; j < dp->dim[i].ne; j++) {
-				if (fgetword(word, sizeof(word), fp) == NULL ||
-						!isflt(word))
+			for (j = 0; j < dp->dim[i].ne; j++)
+				if (fgetval(fp, DATATY,
+						(char *)&dp->dim[i].p[j]) <= 0)
 					goto scanerr;
-				dp->dim[i].p[j] = atof(word);
-			}
 			for (j = 1; j < dp->dim[i].ne-1; j++)
 				if ((dp->dim[i].p[j-1] < dp->dim[i].p[j]) !=
 					(dp->dim[i].p[j] < dp->dim[i].p[j+1]))
@@ -118,17 +119,16 @@ char  *dname;
 		} else
 			dp->dim[i].p = NULL;
 	}
-	if ((dp->arr = (DATATYPE *)malloc(asize*sizeof(DATATYPE))) == NULL)
+	if ((dp->arr.d = (DATATYPE *)malloc(asize*sizeof(DATATYPE))) == NULL)
 		goto memerr;
 	
-	for (i = 0; i < asize; i++) {
-		if (fgetword(word, sizeof(word), fp) == NULL || !isflt(word))
+	for (i = 0; i < asize; i++)
+		if (fgetval(fp, DATATY, (char *)&dp->arr.d[i]) <= 0)
 			goto scanerr;
-		dp->arr[i] = atof(word);
-	}
 	fclose(fp);
-	dp->next = dlist;
-	return(dlist = dp);
+	i = hash(dname);
+	dp->next = dtab[i];
+	return(dtab[i] = dp);
 
 memerr:
 	error(SYSTEM, "out of memory in getdata");
@@ -139,13 +139,19 @@ scanerr:
 }
 
 
-static
-headaspect(s, iap)			/* check string for aspect ratio */
-char  *s;
-double  *iap;
+static int
+headaspect(			/* check string for aspect ratio */
+	char  *s,
+	void  *iap
+)
 {
+	char	fmt[32];
+
 	if (isaspect(s))
-		*iap *= aspectval(s);
+		*(double*)iap *= aspectval(s);
+	else if (formatval(fmt, s) && !globmatch(PICFMT, fmt))
+		*(double*)iap = 0.0;
+	return(0);
 }
 
 
@@ -153,89 +159,90 @@ DATARRAY *
 getpict(pname)				/* get picture pname */
 char  *pname;
 {
-	extern char  *libpath;
 	double  inpaspect;
 	char  *pfname;
 	FILE  *fp;
-	COLOR  *scanin;
+	COLR  *scanin;
 	int  sl, ns;
 	RESOLU	inpres;
-	FLOAT  loc[2];
+	RREAL  loc[2];
 	int  y;
 	register int  x, i;
 	register DATARRAY  *pp;
 						/* look for array in list */
-	for (pp = plist; pp != NULL; pp = pp->next)
+	for (pp = dtab[hash(pname)]; pp != NULL; pp = pp->next)
 		if (!strcmp(pname, pp->name))
 			return(pp);		/* found! */
 
-	if ((pfname = getpath(pname, libpath, R_OK)) == NULL) {
+	if ((pfname = getpath(pname, getrlibpath(), R_OK)) == NULL) {
 		sprintf(errmsg, "cannot find picture file \"%s\"", pname);
 		error(USER, errmsg);
 	}
-	if ((pp = (DATARRAY *)calloc(3, sizeof(DATARRAY))) == NULL)
+	if ((pp = (DATARRAY *)malloc(3*sizeof(DATARRAY))) == NULL)
 		goto memerr;
 
-	pp[0].name = 
-	pp[1].name =
-	pp[2].name = savestr(pname);
+	pp[0].name = savestr(pname);
 
 	if ((fp = fopen(pfname, "r")) == NULL) {
 		sprintf(errmsg, "cannot open picture file \"%s\"", pfname);
 		error(SYSTEM, errmsg);
 	}
-#ifdef MSDOS
-	setmode(fileno(fp), O_BINARY);
-#endif
+	SET_FILE_BINARY(fp);
 						/* get dimensions */
 	inpaspect = 1.0;
 	getheader(fp, headaspect, &inpaspect);
-	if (!fgetsresolu(&inpres, fp))
+	if (inpaspect <= FTINY || !fgetsresolu(&inpres, fp))
 		goto readerr;
-	for (i = 0; i < 3; i++) {
-		pp[i].nd = 2;
-		pp[i].dim[0].ne = inpres.yr;
-		pp[i].dim[1].ne = inpres.xr;
-		pp[i].dim[0].org =
-		pp[i].dim[1].org = 0.0;
-		if (inpres.xr <= inpres.yr*inpaspect) {
-			pp[i].dim[0].siz = inpaspect *
-						(double)inpres.yr/inpres.xr;
-			pp[i].dim[1].siz = 1.0;
-		} else {
-			pp[i].dim[0].siz = 1.0;
-			pp[i].dim[1].siz = (double)inpres.xr/inpres.yr /
-						inpaspect;
-		}
-		pp[i].dim[0].p = pp[i].dim[1].p = NULL;
-		pp[i].arr = (DATATYPE *)
-				malloc(inpres.xr*inpres.yr*sizeof(DATATYPE));
-		if (pp[i].arr == NULL)
-			goto memerr;
+	pp[0].nd = 2;
+	pp[0].dim[0].ne = inpres.yr;
+	pp[0].dim[1].ne = inpres.xr;
+	pp[0].dim[0].org =
+	pp[0].dim[1].org = 0.0;
+	if (inpres.xr <= inpres.yr*inpaspect) {
+		pp[0].dim[0].siz = inpaspect *
+					(double)inpres.yr/inpres.xr;
+		pp[0].dim[1].siz = 1.0;
+	} else {
+		pp[0].dim[0].siz = 1.0;
+		pp[0].dim[1].siz = (double)inpres.xr/inpres.yr /
+					inpaspect;
 	}
-							/* load picture */
-	sl = scanlen(&inpres);
+	pp[0].dim[0].p = pp[0].dim[1].p = NULL;
+	sl = scanlen(&inpres);				/* allocate array */
 	ns = numscans(&inpres);
-	if ((scanin = (COLOR *)malloc(sl*sizeof(COLOR))) == NULL)
+	i = ns*sl*sizeof(COLR);
+#if PSIZWARN
+	if (i > PSIZWARN) {				/* memory warning */
+		sprintf(errmsg, "picture file \"%s\" using %d bytes of memory",
+				pname, i);
+		error(WARNING, errmsg);
+	}
+#endif
+	if ((pp[0].arr.c = (COLR *)malloc(i)) == NULL)
 		goto memerr;
+							/* load picture */
+	if ((scanin = (COLR *)malloc(sl*sizeof(COLR))) == NULL)
+		goto memerr;
 	for (y = 0; y < ns; y++) {
-		if (freadscan(scanin, sl, fp) < 0)
+		if (freadcolrs(scanin, sl, fp) < 0)
 			goto readerr;
 		for (x = 0; x < sl; x++) {
 			pix2loc(loc, &inpres, x, y);
 			i = (int)(loc[1]*inpres.yr)*inpres.xr +
 					(int)(loc[0]*inpres.xr);
-			pp[0].arr[i] = colval(scanin[x],RED);
-			pp[1].arr[i] = colval(scanin[x],GRN);
-			pp[2].arr[i] = colval(scanin[x],BLU);
+			copycolr(pp[0].arr.c[i], scanin[x]);
 		}
 	}
-	free((char *)scanin);
+	free((void *)scanin);
 	fclose(fp);
-	pp[0].next =
-	pp[1].next =
-	pp[2].next = plist;
-	return(plist = pp);
+	i = hash(pname);
+	pp[0].next = dtab[i];		/* link into picture list */
+	pp[1] = pp[0];
+	pp[2] = pp[0];
+	pp[0].type = RED;		/* differentiate RGB records */
+	pp[1].type = GRN;
+	pp[2].type = BLU;
+	return(dtab[i] = pp);
 
 memerr:
 	error(SYSTEM, "out of memory in getpict");
@@ -245,50 +252,42 @@ readerr:
 }
 
 
-freedata(dname)			/* free memory associated with dname */
-char  *dname;
+void
+freedata(dta)			/* release data array reference */
+DATARRAY  *dta;
 {
-	register DATARRAY  *dp, *dpl;
+	DATARRAY  head;
+	int  hval, nents;
+	register DATARRAY  *dpl, *dp;
 	register int  i;
 
-	for (dpl = NULL, dp = dlist; dp != NULL; dpl = dp, dp = dp->next)
-		if (!strcmp(dname, dp->name)) {
-			if (dpl == NULL)
-				dlist = dp->next;
-			else
+	if (dta == NULL) {			/* free all if NULL */
+		hval = 0; nents = TABSIZ;
+	} else {
+		hval = hash(dta->name); nents = 1;
+	}
+	while (nents--) {
+		head.next = dtab[hval];
+		dpl = &head;
+		while ((dp = dpl->next) != NULL)
+			if ((dta == NULL) | (dta == dp)) {
 				dpl->next = dp->next;
-			free((char *)dp->arr);
-			for (i = 0; i < dp->nd; i++)
-				if (dp->dim[i].p != NULL)
-					free((char *)dp->dim[i].p);
-			freestr(dp->name);
-			free((char *)dp);
-			return;
-		}
+				if (dp->type == DATATY)
+					free((void *)dp->arr.d);
+				else
+					free((void *)dp->arr.c);
+				for (i = 0; i < dp->nd; i++)
+					if (dp->dim[i].p != NULL)
+						free((void *)dp->dim[i].p);
+				freestr(dp->name);
+				free((void *)dp);
+			} else
+				dpl = dp;
+		dtab[hval++] = head.next;
+	}
 }
 
 
-freepict(pname)			/* free memory associated with pname */
-char  *pname;
-{
-	register DATARRAY  *pp, *ppl;
-
-	for (ppl = NULL, pp = plist; pp != NULL; ppl = pp, pp = pp->next)
-		if (!strcmp(pname, pp->name)) {
-			if (ppl == NULL)
-				plist = pp->next;
-			else
-				ppl->next = pp->next;
-			free((char *)pp[0].arr);
-			free((char *)pp[1].arr);
-			free((char *)pp[2].arr);
-			freestr(pp[0].name);
-			free((char *)pp);
-			return;
-		}
-}
-
-
 double
 datavalue(dp, pt)		/* interpolate data value at a point */
 register DATARRAY  *dp;
@@ -298,20 +297,24 @@ double	*pt;
 	int  asize;
 	int  lower, upper;
 	register int  i;
-	double	x, y, y0, y1;
+	double	x, y0, y1;
 					/* set up dimensions for recursion */
-	sd.nd = dp->nd - 1;
-	asize = 1;
-	for (i = 0; i < sd.nd; i++) {
-		sd.dim[i].org = dp->dim[i+1].org;
-		sd.dim[i].siz = dp->dim[i+1].siz;
-		sd.dim[i].p = dp->dim[i+1].p;
-		asize *= sd.dim[i].ne = dp->dim[i+1].ne;
+	if (dp->nd > 1) {
+		sd.name = dp->name;
+		sd.type = dp->type;
+		sd.nd = dp->nd - 1;
+		asize = 1;
+		for (i = 0; i < sd.nd; i++) {
+			sd.dim[i].org = dp->dim[i+1].org;
+			sd.dim[i].siz = dp->dim[i+1].siz;
+			sd.dim[i].p = dp->dim[i+1].p;
+			asize *= sd.dim[i].ne = dp->dim[i+1].ne;
+		}
 	}
 					/* get independent variable */
 	if (dp->dim[0].p == NULL) {		/* evenly spaced points */
 		x = (pt[0] - dp->dim[0].org)/dp->dim[0].siz;
-		x = x * (dp->dim[0].ne - 1);
+		x *= (double)(dp->dim[0].ne - 1);
 		i = x;
 		if (i < 0)
 			i = 0;
@@ -338,25 +341,36 @@ double	*pt;
 				(dp->dim[0].p[i+1] - dp->dim[0].p[i]);
 	}
 					/* get dependent variable */
-	if (dp->nd == 1) {
-		y0 = dp->arr[i];
-		y1 = dp->arr[i+1];
+	if (dp->nd > 1) {
+		if (dp->type == DATATY) {
+			sd.arr.d = dp->arr.d + i*asize;
+			y0 = datavalue(&sd, pt+1);
+			sd.arr.d = dp->arr.d + (i+1)*asize;
+			y1 = datavalue(&sd, pt+1);
+		} else {
+			sd.arr.c = dp->arr.c + i*asize;
+			y0 = datavalue(&sd, pt+1);
+			sd.arr.c = dp->arr.c + (i+1)*asize;
+			y1 = datavalue(&sd, pt+1);
+		}
 	} else {
-		sd.arr = &dp->arr[i*asize];
-		y0 = datavalue(&sd, pt+1);
-		sd.arr = &dp->arr[(i+1)*asize];
-		y1 = datavalue(&sd, pt+1);
+		if (dp->type == DATATY) {
+			y0 = dp->arr.d[i];
+			y1 = dp->arr.d[i+1];
+		} else {
+			y0 = colrval(dp->arr.c[i],dp->type);
+			y1 = colrval(dp->arr.c[i+1],dp->type);
+		}
 	}
 	/*
 	 * Extrapolate as far as one division, then
 	 * taper off harmonically to zero.
 	 */
 	if (x > i+2)
-		y = (2*y1-y0)/(x-i-1);
-	else if (x < i-1)
-		y = (2*y0-y1)/(i-x);
-	else
-		y = y0*((i+1)-x) + y1*(x-i);
+		return( (2*y1-y0)/(x-(i-1)) );
 
-	return(y);
+	if (x < i-1)
+		return( (2*y0-y1)/(i-x) );
+
+	return( y0*((i+1)-x) + y1*(x-i) );
 }