--- ray/src/rt/p_data.c	1991/11/25 09:50:53	2.2
+++ ray/src/rt/p_data.c	2003/03/05 16:16:53	2.7
@@ -1,15 +1,12 @@
-/* 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.7 2003/03/05 16:16:53 greg Exp $";
 #endif
-
 /*
  *  p_data.c - routine for stored patterns.
- *
- *     6/4/86
  */
 
+#include "copyright.h"
+
 #include  "ray.h"
 
 #include  "data.h"
@@ -69,19 +66,19 @@ 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);
 }
 
 
@@ -106,7 +103,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,16 +114,18 @@ 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);
 }
 
 
@@ -148,21 +147,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);
 }