--- ray/src/rt/p_data.c	1991/11/25 09:50:53	2.2
+++ ray/src/rt/p_data.c	2004/03/30 16:13:01	2.8
@@ -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: p_data.c,v 2.8 2004/03/30 16:13:01 schorsch Exp $";
 #endif
-
 /*
  *  p_data.c - routine for stored patterns.
- *
- *     6/4/86
  */
 
-#include  "ray.h"
+#include "copyright.h"
 
+#include  "ray.h"
 #include  "data.h"
-
 #include  "func.h"
+#include  "rtotypes.h"
 
 /*
  *	A stored pattern can either be brightness or
@@ -50,9 +46,11 @@ static char SCCSid[] = "$SunId$ LBL";
  */
 
 
-p_bdata(m, r)			/* interpolate brightness data */
-register OBJREC  *m;
-RAY  *r;
+extern int
+p_bdata(			/* interpolate brightness data */
+	register OBJREC  *m,
+	RAY  *r
+)
 {
 	double  bval;
 	double  pt[MAXDIM];
@@ -69,25 +67,27 @@ RAY  *r;
 	errno = 0;
 	for (i = dp->nd; i-- > 0; ) {
 		pt[i] = evalue(mf->ep[i]);
-		if (errno)
+		if (errno == EDOM || errno == ERANGE)
 			goto computerr;
 	}
 	bval = datavalue(dp, pt);
 	errno = 0;
 	bval = funvalue(m->oargs.sarg[0], 1, &bval);
-	if (errno)
+	if (errno == EDOM || errno == ERANGE)
 		goto computerr;
 	scalecolor(r->pcol, bval);
-	return;
+	return(0);
 computerr:
 	objerror(m, WARNING, "compute error");
-	return;
+	return(0);
 }
 
 
-p_cdata(m, r)			/* interpolate color data */
-register OBJREC  *m;
-RAY  *r;
+extern int
+p_cdata(			/* interpolate color data */
+	register OBJREC  *m,
+	RAY  *r
+)
 {
 	double  col[3];
 	COLOR  cval;
@@ -106,7 +106,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;
 	}
 	col[0] = datavalue(dp, pt);
@@ -117,22 +117,26 @@ RAY  *r;
 		col[i] = datavalue(dp, pt);
 	}
 	errno = 0;
-	setcolor(cval,	funvalue(m->oargs.sarg[0], 3, col),
-			funvalue(m->oargs.sarg[1], 3, col),
-			funvalue(m->oargs.sarg[2], 3, col));
-	if (errno)
+	for (i = 0; i < 3; i++)
+		if (fundefined(m->oargs.sarg[i]) < 3)
+			colval(cval,i) = funvalue(m->oargs.sarg[i], 1, col+i);
+		else
+			colval(cval,i) = funvalue(m->oargs.sarg[i], 3, col);
+	if (errno == EDOM || errno == ERANGE)
 		goto computerr;
 	multcolor(r->pcol, cval);
-	return;
+	return(0);
 computerr:
 	objerror(m, WARNING, "compute error");
-	return;
+	return(0);
 }
 
 
-p_pdata(m, r)			/* interpolate picture data */
-register OBJREC  *m;
-RAY  *r;
+extern int
+p_pdata(			/* interpolate picture data */
+	register OBJREC  *m,
+	RAY  *r
+)
 {
 	double  col[3];
 	COLOR  cval;
@@ -148,21 +152,23 @@ RAY  *r;
 	errno = 0;
 	pt[1] = evalue(mf->ep[0]);	/* y major ordering */
 	pt[0] = evalue(mf->ep[1]);
-	if (errno)
+	if (errno == EDOM || errno == ERANGE)
 		goto computerr;
 	dp = getpict(m->oargs.sarg[3]);
 	for (i = 0; i < 3; i++)
 		col[i] = datavalue(dp+i, pt);
 	errno = 0;
-	setcolor(cval,	funvalue(m->oargs.sarg[0], 3, col),
-			funvalue(m->oargs.sarg[1], 3, col),
-			funvalue(m->oargs.sarg[2], 3, col));
-	if (errno)
+	for (i = 0; i < 3; i++)
+		if (fundefined(m->oargs.sarg[i]) < 3)
+			colval(cval,i) = funvalue(m->oargs.sarg[i], 1, col+i);
+		else
+			colval(cval,i) = funvalue(m->oargs.sarg[i], 3, col);
+	if (errno == EDOM || errno == ERANGE)
 		goto computerr;
 	multcolor(r->pcol, cval);
-	return;
+	return(0);
 
 computerr:
 	objerror(m, WARNING, "compute error");
-	return;
+	return(0);
 }