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

Comparing ray/src/rt/rtmain.c (file contents):
Revision 2.52 by greg, Fri Apr 5 16:43:33 2024 UTC vs.
Revision 2.57 by greg, Wed Mar 5 18:56:28 2025 UTC

# Line 21 | Line 21 | static const char      RCSid[] = "$Id$";
21  
22   extern char     *progname;              /* global argv[0] */
23  
24 – extern char     *shm_boundary;          /* boundary of shared memory */
25 –
24                                          /* persistent processes define */
25   #ifdef  F_SETLKW
26   #define  PERSIST        1               /* normal persist */
# Line 59 | Line 57 | extern void  tranotify(OBJECT obj);
57   char  *tralist[MAXMODLIST];             /* list of modifers to trace (or no) */
58   int  traincl = -1;                      /* include == 1, exclude == 0 */
59  
60 < double  (*sens_curve)(SCOLOR scol) = NULL;      /* spectral conversion for 1-channel */
60 > double  (*sens_curve)(const SCOLOR scol) = NULL;        /* spectral conversion for 1-channel */
61   double  out_scalefactor = 1;            /* output calibration scale factor */
62   RGBPRIMP  out_prims = stdprims;         /* output color primitives (NULL if spectral) */
63   static RGBPRIMS  our_prims;             /* private output color primitives */
# Line 350 | Line 348 | main(int  argc, char  *argv[])
348          rval = setspectrsamp(CNDX, WLPART);
349          if (rval < 0)
350                  error(USER, "unsupported spectral sampling");
351 <        if (out_prims != NULL) {
351 >        if (sens_curve != NULL)
352 >                out_prims = NULL;
353 >        else if (out_prims != NULL) {
354                  if (!rval)
355                          error(WARNING, "spectral range incompatible with color output");
356          } else if (NCSAMP == 3)
# Line 453 | Line 453 | main(int  argc, char  *argv[])
453                  dup2(duped1, fileno(stdout));
454                  close(duped1);
455                  if (persist == PARALLEL) {      /* multiprocessing */
456 <                        preload_objs();         /* preload scene */
457 <                        shm_boundary = (char *)malloc(16);
458 <                        strcpy(shm_boundary, "SHM_BOUNDARY");
456 >                        cow_memshare();         /* preloads scene */
457                          while ((rval=fork()) == 0) {    /* keep on forkin' */
458                                  pflock(1);
459                                  pfhold();
# Line 512 | Line 510 | wputs(                         /* warning output function */
510   )
511   {
512          int  lasterrno = errno;
513 +        if (erract[WARNING].pf == NULL)
514 +                return;         /* called by calcomp or someone */
515          eputs(s);
516          errno = lasterrno;
517   }
# Line 632 | Line 632 | printdefaults(void)                    /* print default values to stdou
632                                  out_prims[GRN][0], out_prims[GRN][1],
633                                  out_prims[BLU][0], out_prims[BLU][1],
634                                  out_prims[WHT][0], out_prims[WHT][1]);
635 <        if (NCSAMP > 3)
635 >        if ((sens_curve == NULL) & (NCSAMP > 3))
636                  printf(out_prims != NULL ? "-co-\t\t\t\t# output tristimulus colors\n" :
637                                  "-co+\t\t\t\t# output spectral values\n");
638          print_rdefaults();

Diff Legend

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