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 2.31 by greg, Tue Jul 8 18:25:00 2014 UTC vs.
Revision 2.33 by greg, Thu Aug 2 18:33:48 2018 UTC

# Line 74 | Line 74 | getdata(                               /* get data array dname */
74  
75          if ((dfname = getpath(dname, getrlibpath(), R_OK)) == NULL) {
76                  sprintf(errmsg, "cannot find data file \"%s\"", dname);
77 <                error(USER, errmsg);
77 >                error(SYSTEM, errmsg);
78          }
79          if ((fp = fopen(dfname, "r")) == NULL) {
80                  sprintf(errmsg, "cannot open data file \"%s\"", dfname);
# Line 149 | Line 149 | headaspect(                    /* check string for aspect ratio */
149          void  *iap
150   )
151   {
152 <        char    fmt[32];
152 >        char    fmt[MAXFMTLEN];
153  
154          if (isaspect(s))
155                  *(double*)iap *= aspectval(s);
# Line 181 | Line 181 | getpict(                               /* get picture pname */
181  
182          if ((pfname = getpath(pname, getrlibpath(), R_OK)) == NULL) {
183                  sprintf(errmsg, "cannot find picture file \"%s\"", pname);
184 <                error(USER, errmsg);
184 >                error(SYSTEM, errmsg);
185          }
186          if ((pp = (DATARRAY *)malloc(3*sizeof(DATARRAY))) == NULL)
187                  goto memerr;

Diff Legend

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