--- ray/src/rt/data.c	1996/02/15 18:46:54	2.12
+++ ray/src/rt/data.c	2003/05/13 17:58:33	2.17
@@ -1,13 +1,12 @@
-/* Copyright (c) 1996 Regents of the University of California */
-
 #ifndef lint
-static char SCCSid[] = "$SunId$ LBL";
+static const char	RCSid[] = "$Id: data.c,v 2.17 2003/05/13 17:58:33 greg Exp $";
 #endif
-
 /*
  *  data.c - routines dealing with interpolated data.
  */
 
+#include "copyright.h"
+
 #include  "standard.h"
 
 #include  "color.h"
@@ -19,9 +18,9 @@ static char SCCSid[] = "$SunId$ LBL";
 				/* picture memory usage before warning */
 #ifndef PSIZWARN
 #ifdef BIGMEM
-#define PSIZWARN	3000000
+#define PSIZWARN	5000000
 #else
-#define PSIZWARN	1000000
+#define PSIZWARN	1500000
 #endif
 #endif
 
@@ -32,8 +31,6 @@ static char SCCSid[] = "$SunId$ LBL";
 #define hash(s)		(shash(s)%TABSIZ)
 
 
-extern char  *getlibpath();		/* library search path */
-
 static DATARRAY	 *dtab[TABSIZ];		/* data array list */
 
 
@@ -50,7 +47,6 @@ char  *dname;
 	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 directories specified by the library path.
@@ -71,7 +67,7 @@ char  *dname;
 	 *		0 0 ni p0i p1i .. pni
 	 */
 
-	if ((dfname = getpath(dname, getlibpath(), R_OK)) == NULL) {
+	if ((dfname = getpath(dname, getrlibpath(), R_OK)) == NULL) {
 		sprintf(errmsg, "cannot find data file \"%s\"", dname);
 		error(USER, errmsg);
 	}
@@ -80,7 +76,7 @@ char  *dname;
 		error(SYSTEM, errmsg);
 	}
 							/* get dimensions */
-	if (fgetval(fp, 'i', &asize) <= 0)
+	if (fgetval(fp, 'i', (char *)&asize) <= 0)
 		goto scanerr;
 	if (asize <= 0 | asize > MAXDDIM) {
 		sprintf(errmsg, "bad number of dimensions for \"%s\"", dname);
@@ -93,11 +89,11 @@ char  *dname;
 	dp->nd = asize;
 	asize = 1;
 	for (i = 0; i < dp->nd; i++) {
-		if (fgetval(fp, DATATY, &dp->dim[i].org) <= 0)
+		if (fgetval(fp, DATATY, (char *)&dp->dim[i].org) <= 0)
 			goto scanerr;
-		if (fgetval(fp, DATATY, &dp->dim[i].siz) <= 0)
+		if (fgetval(fp, DATATY, (char *)&dp->dim[i].siz) <= 0)
 			goto scanerr;
-		if (fgetval(fp, 'i', &dp->dim[i].ne) <= 0)
+		if (fgetval(fp, 'i', (char *)&dp->dim[i].ne) <= 0)
 			goto scanerr;
 		if (dp->dim[i].ne < 2)
 			goto scanerr;
@@ -108,7 +104,8 @@ char  *dname;
 			if (dp->dim[i].p == NULL)
 				goto memerr;
 			for (j = 0; j < dp->dim[i].ne; j++)
-				if (fgetval(fp, DATATY, &dp->dim[i].p[j]) <= 0)
+				if (fgetval(fp, DATATY,
+						(char *)&dp->dim[i].p[j]) <= 0)
 					goto scanerr;
 			for (j = 1; j < dp->dim[i].ne-1; j++)
 				if ((dp->dim[i].p[j-1] < dp->dim[i].p[j]) !=
@@ -124,7 +121,7 @@ char  *dname;
 		goto memerr;
 	
 	for (i = 0; i < asize; i++)
-		if (fgetval(fp, DATATY, &dp->arr.d[i]) <= 0)
+		if (fgetval(fp, DATATY, (char *)&dp->arr.d[i]) <= 0)
 			goto scanerr;
 	fclose(fp);
 	i = hash(dname);
@@ -140,13 +137,18 @@ scanerr:
 }
 
 
-static
+static int
 headaspect(s, iap)			/* check string for aspect ratio */
 char  *s;
 double  *iap;
 {
+	char	fmt[32];
+
 	if (isaspect(s))
 		*iap *= aspectval(s);
+	else if (formatval(fmt, s) && !globmatch(PICFMT, fmt))
+		*iap = 0.0;
+	return(0);
 }
 
 
@@ -169,7 +171,7 @@ char  *pname;
 		if (!strcmp(pname, pp->name))
 			return(pp);		/* found! */
 
-	if ((pfname = getpath(pname, getlibpath(), R_OK)) == NULL) {
+	if ((pfname = getpath(pname, getrlibpath(), R_OK)) == NULL) {
 		sprintf(errmsg, "cannot find picture file \"%s\"", pname);
 		error(USER, errmsg);
 	}
@@ -187,8 +189,8 @@ char  *pname;
 #endif
 						/* get dimensions */
 	inpaspect = 1.0;
-	getheader(fp, headaspect, &inpaspect);
-	if (!fgetsresolu(&inpres, fp))
+	getheader(fp, headaspect, (char *)&inpaspect);
+	if (inpaspect <= FTINY || !fgetsresolu(&inpres, fp))
 		goto readerr;
 	pp[0].nd = 2;
 	pp[0].dim[0].ne = inpres.yr;
@@ -230,7 +232,7 @@ char  *pname;
 			copycolr(pp[0].arr.c[i], scanin[x]);
 		}
 	}
-	free((char *)scanin);
+	free((void *)scanin);
 	fclose(fp);
 	i = hash(pname);
 	pp[0].next = dtab[i];		/* link into picture list */
@@ -249,34 +251,35 @@ readerr:
 }
 
 
-freedata(dname)			/* free memory associated with dname */
-char  *dname;
+void
+freedata(dta)			/* release data array reference */
+DATARRAY  *dta;
 {
 	DATARRAY  head;
 	int  hval, nents;
-	register DATARRAY  *dp, *dpl;
+	register DATARRAY  *dpl, *dp;
 	register int  i;
 
-	if (dname == NULL) {			/* free all if NULL */
+	if (dta == NULL) {			/* free all if NULL */
 		hval = 0; nents = TABSIZ;
 	} else {
-		hval = hash(dname); nents = 1;
+		hval = hash(dta->name); nents = 1;
 	}
 	while (nents--) {
 		head.next = dtab[hval];
 		dpl = &head;
 		while ((dp = dpl->next) != NULL)
-			if (dname == NULL || !strcmp(dname, dp->name)) {
+			if ((dta == NULL | dta == dp)) {
 				dpl->next = dp->next;
 				if (dp->type == DATATY)
-					free((char *)dp->arr.d);
+					free((void *)dp->arr.d);
 				else
-					free((char *)dp->arr.c);
+					free((void *)dp->arr.c);
 				for (i = 0; i < dp->nd; i++)
 					if (dp->dim[i].p != NULL)
-						free((char *)dp->dim[i].p);
+						free((void *)dp->dim[i].p);
 				freestr(dp->name);
-				free((char *)dp);
+				free((void *)dp);
 			} else
 				dpl = dp;
 		dtab[hval++] = head.next;