--- ray/src/rt/t_data.c	1992/06/30 19:10:38	2.3
+++ ray/src/rt/t_data.c	2004/03/30 16:13:01	2.8
@@ -1,20 +1,16 @@
-/* Copyright (c) 1992 Regents of the University of California */
-
 #ifndef lint
-static char SCCSid[] = "$SunId$ LBL";
+static const char	RCSid[] = "$Id: t_data.c,v 2.8 2004/03/30 16:13:01 schorsch 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,9 +30,11 @@ static char SCCSid[] = "$SunId$ LBL";
  */
 
 
-t_data(m, r)			/* interpolate texture data */
-register OBJREC  *m;
-RAY  *r;
+extern int
+t_data(			/* interpolate texture data */
+	register OBJREC  *m,
+	RAY  *r
+)
 {
 	int  nv;
 	FVECT  disp;
@@ -55,7 +53,7 @@ RAY  *r;
 	errno = 0;
 	for (i = 0; i < nv; i++)
 		pt[i] = evalue(mf->ep[i]);
-	if (errno)
+	if (errno == EDOM || errno == ERANGE)
 		goto computerr;
 	dval[0] = datavalue(dp, pt);
 	for (i = 1; i < 3; i++) {
@@ -67,7 +65,7 @@ RAY  *r;
 	errno = 0;
 	for (i = 0; i < 3; i++)
 		disp[i] = funvalue(m->oargs.sarg[i], 3, dval);
-	if (errno)
+	if (errno == EDOM || errno == ERANGE)
 		goto computerr;
 	if (mf->f != &unitxf)
 		multv3(disp, disp, mf->f->xfm);
@@ -78,8 +76,8 @@ RAY  *r;
 		d = 1.0 / mf->f->sca;
 	for (i = 0; i < 3; i++)
 		r->pert[i] += disp[i] * d;
-	return;
+	return(0);
 computerr:
 	objerror(m, WARNING, "compute error");
-	return;
+	return(0);
 }