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.20 by greg, Sun Dec 13 19:39:51 2009 UTC vs.
Revision 2.22 by greg, Wed Aug 7 05:10:09 2013 UTC

# Line 77 | Line 77 | main(int  argc, char  *argv[])
77                                  default: goto badopt; }
78          int  persist = 0;
79          char  *octnm = NULL;
80 <        char  **tralp;
81 <        int  duped1;
80 >        char  **tralp = NULL;
81 >        int  duped1 = -1;
82          int  rval;
83          int  i;
84                                          /* global program name */
# Line 252 | Line 252 | main(int  argc, char  *argv[])
252          if (nproc > 1) {
253                  if (persist)
254                          error(USER, "multiprocessing incompatible with persist file");
255 <                if (hresolu > 0 && hresolu < nproc)
255 >                if (!vresolu && hresolu > 0 && hresolu < nproc)
256                          error(WARNING, "number of cores should not exceed horizontal resolution");
257                  if (trace != NULL)
258                          error(WARNING, "multiprocessing does not work properly with trace mode");
# Line 459 | Line 459 | printdefaults(void)                    /* print default values to stdou
459          if (imm_irrad)
460                  printf("-I+\t\t\t\t# immediate irradiance on\n");
461          printf("-n %-2d\t\t\t\t# number of rendering processes\n", nproc);
462 <        printf("-x %-9d\t\t\t# x resolution (flush interval)\n", hresolu);
462 >        printf("-x %-9d\t\t\t# %s\n", hresolu,
463 >                        vresolu && hresolu ? "x resolution" : "flush interval");
464          printf("-y %-9d\t\t\t# y resolution\n", vresolu);
465          printf(lim_dist ? "-ld+\t\t\t\t# limit distance on\n" :
466                          "-ld-\t\t\t\t# limit distance off\n");

Diff Legend

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