--- ray/src/rt/data.c	2003/05/13 17:58:33	2.17
+++ ray/src/rt/data.c	2003/10/22 02:06:35	2.25
@@ -1,5 +1,5 @@
 #ifndef lint
-static const char	RCSid[] = "$Id: data.c,v 2.17 2003/05/13 17:58:33 greg Exp $";
+static const char	RCSid[] = "$Id: data.c,v 2.25 2003/10/22 02:06:35 greg Exp $";
 #endif
 /*
  *  data.c - routines dealing with interpolated data.
@@ -7,20 +7,20 @@ static const char	RCSid[] = "$Id: data.c,v 2.17 2003/0
 
 #include "copyright.h"
 
-#include  "standard.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 BIGMEM
-#define PSIZWARN	5000000
-#else
+#ifdef SMLMEM
 #define PSIZWARN	1500000
+#else
+#define PSIZWARN	5000000
 #endif
 #endif
 
@@ -78,7 +78,7 @@ char  *dname;
 							/* get dimensions */
 	if (fgetval(fp, 'i', (char *)&asize) <= 0)
 		goto scanerr;
-	if (asize <= 0 | asize > MAXDDIM) {
+	if ((asize <= 0) | (asize > MAXDDIM)) {
 		sprintf(errmsg, "bad number of dimensions for \"%s\"", dname);
 		error(USER, errmsg);
 	}
@@ -162,7 +162,7 @@ char  *pname;
 	COLR  *scanin;
 	int  sl, ns;
 	RESOLU	inpres;
-	FLOAT  loc[2];
+	RREAL  loc[2];
 	int  y;
 	register int  x, i;
 	register DATARRAY  *pp;
@@ -184,9 +184,7 @@ char  *pname;
 		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, (char *)&inpaspect);
@@ -236,8 +234,8 @@ char  *pname;
 	fclose(fp);
 	i = hash(pname);
 	pp[0].next = dtab[i];		/* link into picture list */
-	copystruct(&pp[1], &pp[0]);
-	copystruct(&pp[2], &pp[0]);
+	pp[1] = pp[0];
+	pp[2] = pp[0];
 	pp[0].type = RED;		/* differentiate RGB records */
 	pp[1].type = GRN;
 	pp[2].type = BLU;
@@ -269,7 +267,7 @@ DATARRAY  *dta;
 		head.next = dtab[hval];
 		dpl = &head;
 		while ((dp = dpl->next) != NULL)
-			if ((dta == NULL | dta == dp)) {
+			if ((dta == NULL) | (dta == dp)) {
 				dpl->next = dp->next;
 				if (dp->type == DATATY)
 					free((void *)dp->arr.d);