--- ray/src/rt/t_data.c 2003/02/25 02:47:23 2.6 +++ ray/src/rt/t_data.c 2004/03/30 16:13:01 2.8 @@ -1,5 +1,5 @@ #ifndef lint -static const char RCSid[] = "$Id: t_data.c,v 2.6 2003/02/25 02:47:23 greg Exp $"; +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 @@ -8,10 +8,9 @@ static const char RCSid[] = "$Id: t_data.c,v 2.6 2003/ #include "copyright.h" #include "ray.h" - #include "data.h" - #include "func.h" +#include "rtotypes.h" /* * A stored texture is specified as follows: @@ -31,9 +30,11 @@ static const char RCSid[] = "$Id: t_data.c,v 2.6 2003/ */ -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; @@ -52,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++) { @@ -64,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);