--- ray/src/rt/t_data.c	1991/11/25 09:50:54	2.2
+++ ray/src/rt/t_data.c	2014/07/08 18:25:00	2.11
@@ -1,20 +1,16 @@
-/* Copyright (c) 1991 Regents of the University of California */
-
 #ifndef lint
-static char SCCSid[] = "$SunId$ LBL";
+static const char	RCSid[] = "$Id: t_data.c,v 2.11 2014/07/08 18:25:00 greg Exp $";
 #endif
-
 /*
  *  t_data.c - routine for stored textures
- *
- *     6/4/86
  */
 
-#include  "ray.h"
+#include "copyright.h"
 
+#include  "ray.h"
 #include  "data.h"
-
 #include  "func.h"
+#include  "rtotypes.h"
 
 /*
  *	A stored texture is specified as follows:
@@ -34,17 +30,19 @@ static char SCCSid[] = "$SunId$ LBL";
  */
 
 
-t_data(m, r)			/* interpolate texture data */
-register OBJREC  *m;
-RAY  *r;
+int
+t_data(			/* interpolate texture data */
+	OBJREC  *m,
+	RAY  *r
+)
 {
 	int  nv;
-	FVECT  dval, disp;
-	double  pt[MAXDIM];
+	FVECT  disp;
+	double  dval[3], pt[MAXDIM];
 	double  d;
 	DATARRAY  *dp;
-	register MFUNC  *mf;
-	register int  i;
+	MFUNC  *mf;
+	int  i;
 
 	if (m->oargs.nsargs < 8)
 		objerror(m, USER, "bad # arguments");
@@ -53,11 +51,10 @@ RAY  *r;
 	mf = getfunc(m, 6, i<<7, 1);
 	setfunc(m, r);
 	errno = 0;
-	for (i = 0; i < nv; i++) {
+	for (i = 0; i < nv; i++)
 		pt[i] = evalue(mf->ep[i]);
-		if (errno)
-			goto computerr;
-	}
+	if (errno == EDOM || errno == ERANGE)
+		goto computerr;
 	dval[0] = datavalue(dp, pt);
 	for (i = 1; i < 3; i++) {
 		dp = getdata(m->oargs.sarg[i+3]);
@@ -66,22 +63,20 @@ RAY  *r;
 		dval[i] = datavalue(dp, pt);
 	}
 	errno = 0;
-	for (i = 0; i < 3; i++) {
+	for (i = 0; i < 3; i++)
 		disp[i] = funvalue(m->oargs.sarg[i], 3, dval);
-		if (errno)
-			goto computerr;
-	}
-	if (mf->f != &unitxf)
-		multv3(disp, disp, mf->f->xfm);
+	if (errno == EDOM || errno == ERANGE)
+		goto computerr;
+	if (mf->fxp != &unitxf)
+		multv3(disp, disp, mf->fxp->xfm);
 	if (r->rox != NULL) {
 		multv3(disp, disp, r->rox->f.xfm);
-		d = 1.0 / (mf->f->sca * r->rox->f.sca);
+		d = 1.0 / (mf->fxp->sca * r->rox->f.sca);
 	} else
-		d = 1.0 / mf->f->sca;
-	for (i = 0; i < 3; i++)
-		r->pert[i] += disp[i] * d;
-	return;
+		d = 1.0 / mf->fxp->sca;
+	VSUM(r->pert, r->pert, disp, d);
+	return(0);
 computerr:
 	objerror(m, WARNING, "compute error");
-	return;
+	return(0);
 }