--- ray/src/rt/data.c	1990/05/08 10:37:57	1.7
+++ ray/src/rt/data.c	1991/05/23 08:14:57	1.9
@@ -1,4 +1,4 @@
-/* Copyright (c) 1986 Regents of the University of California */
+/* Copyright (c) 1991 Regents of the University of California */
 
 #ifndef lint
 static char SCCSid[] = "$SunId$ LBL";
@@ -74,7 +74,7 @@ char  *dname;
 							/* get dimensions */
 	if (fscanf(fp, "%d", &dp->nd) != 1)
 		goto scanerr;
-	if (dp->nd <= 0 || dp->nd > MAXDIM) {
+	if (dp->nd <= 0 || dp->nd > MAXDDIM) {
 		sprintf(errmsg, "bad number of dimensions for \"%s\"", dname);
 		error(USER, errmsg);
 	}
@@ -299,12 +299,10 @@ double  *pt;
 			i = (lower + upper) >> 1;
 			if (pt[0] >= dp->dim[0].p[i])
 				lower = i;
-			else if (pt[0] < dp->dim[0].p[i])
+			else
 				upper = i;
 		} while (i != (lower + upper) >> 1);
-		if (i < 0)
-			i = 0;
-		else if (i > dp->dim[0].ne - 2)
+		if (i > dp->dim[0].ne - 2)
 			i = dp->dim[0].ne - 2;
 		x = i + (pt[0] - dp->dim[0].p[i]) /
 				(dp->dim[0].p[i+1] - dp->dim[0].p[i]);