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

Comparing ray/src/rt/rvmain.c (file contents):
Revision 2.12 by greg, Tue Feb 24 19:39:27 2015 UTC vs.
Revision 2.14 by schorsch, Sun Mar 6 01:13:18 2016 UTC

# Line 198 | Line 198 | main(int argc, char *argv[])
198                                                  /* set up signal handling */
199          sigdie(SIGINT, "Interrupt");
200          sigdie(SIGTERM, "Terminate");
201 < #ifndef _WIN32
201 > #if !defined(_WIN32) && !defined(_WIN64)
202          sigdie(SIGHUP, "Hangup");
203          sigdie(SIGPIPE, "Broken pipe");
204          sigdie(SIGALRM, "Alarm clock");
# Line 228 | Line 228 | main(int argc, char *argv[])
228                                          /* set up output & start process(es) */
229          SET_FILE_BINARY(stdout);
230          
231 <        ray_init(octnm);
231 >        ray_init(octnm);                /* also calls ray_init_pmap() */
232          
233 –        /* PMAP: set up & load photon maps */
234 –        ray_init_pmap();
235 –
233          rview();                        /* run interactive viewer */
234  
235          devclose();                     /* close output device */
# Line 294 | Line 291 | onsig(                         /* fatal signal */
291          if (gotsig++)                   /* two signals and we're gone! */
292                  _exit(signo);
293  
294 < #ifndef _WIN32
294 > #if !defined(_WIN32) && !defined(_WIN64)
295          alarm(15);                      /* allow 15 seconds to clean up */
296          signal(SIGALRM, SIG_DFL);       /* make certain we do die */
297   #endif

Diff Legend

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