--- ray/src/rt/data.c	1989/02/02 10:41:18	1.1
+++ ray/src/rt/data.c	1989/09/12 12:26:14	1.3
@@ -53,7 +53,7 @@ char  *dname;
 	 *
 	 */
 
-	if ((dfname = getpath(dname, libpath)) == NULL) {
+	if ((dfname = getpath(dname, libpath, R_OK)) == NULL) {
 		sprintf(errmsg, "cannot find data file \"%s\"", dname);
 		error(USER, errmsg);
 	}
@@ -119,7 +119,7 @@ char  *pname;
 		if (!strcmp(pname, pp->name))
 			return(pp);		/* found! */
 
-	if ((pfname = getpath(pname, libpath)) == NULL) {
+	if ((pfname = getpath(pname, libpath, R_OK)) == NULL) {
 		sprintf(errmsg, "cannot find picture file \"%s\"", pname);
 		error(USER, errmsg);
 	}
@@ -136,7 +136,7 @@ char  *pname;
 	}
 						/* get dimensions */
 	getheader(fp, NULL);
-	if (fscanf(fp, "-Y %d +X %d\n", &height, &width) != 2)
+	if (fgetresolu(&width, &height, fp) != (YMAJOR|YDECR))
 		goto readerr;
 	for (i = 0; i < 3; i++) {
 		pp[i].nd = 2;