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

Comparing ray/src/rt/rpict.c (file contents):
Revision 2.64 by greg, Mon Oct 20 16:01:55 2003 UTC vs.
Revision 2.66 by greg, Wed Nov 26 19:16:24 2003 UTC

# Line 28 | Line 28 | static const char RCSid[] = "$Id";
28   #include  "view.h"
29   #include  "random.h"
30   #include  "paths.h"
31 + #include  "rtmisc.h" /* myhostname() */
32  
33  
34   #define  RFTEMPLATE     "rfXXXXXX"
# Line 149 | Line 150 | int  code;
150   void
151   report()                /* report progress */
152   {
152        extern char  *myhostname();
153          double  u, s;
154   #ifdef BSD
155          struct rusage  rubuf;
# Line 296 | Line 296 | char  *pout, *zout, *prvr;
296                  }
297                  hres = hresolu; vres = vresolu; pa = pixaspect;
298                  if (prvr != NULL) {
299 <                        if (viewfile(prvr, &ourview, &rs) <= 0
300 <                                        || rs.rt != PIXSTANDARD) {
299 >                        if (viewfile(prvr, &ourview, &rs) <= 0) {
300                                  sprintf(errmsg,
301                          "cannot recover view parameters from \"%s\"", prvr);
302                                  error(WARNING, errmsg);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines