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

Comparing ray/src/gen/mkillum.c (file contents):
Revision 2.13 by schorsch, Sun Jun 8 12:03:10 2003 UTC vs.
Revision 2.17 by greg, Wed Sep 24 14:55:54 2003 UTC

# Line 7 | Line 7 | static const char RCSid[] = "$Id$";
7  
8   #include  <signal.h>
9   #include  <ctype.h>
10 #include  <stdio.h>
10  
12 #include  "platform.h"
11   #include  "mkillum.h"
12 + #include  "platform.h"
13  
14                                  /* default parameters */
15   #define  SAMPDENS       48              /* points per projected steradian */
# Line 25 | Line 24 | static const char RCSid[] = "$Id$";
24  
25                                  /* rtrace command and defaults */
26   char  *rtargv[64] = { "rtrace", "-dj", ".25", "-dr", "3", "-dv-",
27 <                "-ab", "2", "-ad", "256", "-as", "128", "-aa", ".15", };
27 >                "-ab", "2", "-ad", "1024", "-as", "512", "-aa", ".1", };
28   int  rtargc = 14;
29                                  /* overriding rtrace options */
30   char  *myrtopts[] = { "-I-", "-i-", "-ld-", "-ov", "-h-",
# Line 137 | Line 136 | int  status;
136   {
137          int     rtstat;
138  
139 <        rtstat = close_process(rt.pd);
140 <        if (status == 0)
139 >        rtstat = close_process(&(rt.pd));
140 >        if (status == 0) {
141                  if (rtstat < 0)
142                          error(WARNING,
143                          "unknown return status from rtrace process");
144                  else
145                          status = rtstat;
146 +        }
147          exit(status);
148   }
149  
# Line 157 | Line 157 | init()                         /* start rtrace and set up buffers */
157          ofun[OBJ_SPHERE].funp = o_sphere;
158          ofun[OBJ_RING].funp = o_ring;
159                                          /* set up signal handling */
160 < #ifndef _WIN32 /* XXX what do we use instead? */
160 > #ifdef SIGPIPE /* not present on Windows */
161          signal(SIGPIPE, quit);
162   #endif
163                                          /* start rtrace process */
164          errno = 0;
165 <        maxbytes = open_process(rt.pd, rtargv);
165 >        maxbytes = open_process(&(rt.pd), rtargv);
166          if (maxbytes == 0) {
167                  eputs(rtargv[0]);
168                  eputs(": command not found\n");

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines