ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/radiance/ray/src/rt/data.c
(Generate patch)

Comparing ray/src/rt/data.c (file contents):
Revision 1.1 by greg, Thu Feb 2 10:41:18 1989 UTC vs.
Revision 1.3 by greg, Tue Sep 12 12:26:14 1989 UTC

# Line 53 | Line 53 | char  *dname;
53           *
54           */
55  
56 <        if ((dfname = getpath(dname, libpath)) == NULL) {
56 >        if ((dfname = getpath(dname, libpath, R_OK)) == NULL) {
57                  sprintf(errmsg, "cannot find data file \"%s\"", dname);
58                  error(USER, errmsg);
59          }
# Line 119 | Line 119 | char  *pname;
119                  if (!strcmp(pname, pp->name))
120                          return(pp);             /* found! */
121  
122 <        if ((pfname = getpath(pname, libpath)) == NULL) {
122 >        if ((pfname = getpath(pname, libpath, R_OK)) == NULL) {
123                  sprintf(errmsg, "cannot find picture file \"%s\"", pname);
124                  error(USER, errmsg);
125          }
# Line 136 | Line 136 | char  *pname;
136          }
137                                                  /* get dimensions */
138          getheader(fp, NULL);
139 <        if (fscanf(fp, "-Y %d +X %d\n", &height, &width) != 2)
139 >        if (fgetresolu(&width, &height, fp) != (YMAJOR|YDECR))
140                  goto readerr;
141          for (i = 0; i < 3; i++) {
142                  pp[i].nd = 2;

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines