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

Comparing ray/src/util/rad.c (file contents):
Revision 2.84 by greg, Tue Mar 11 12:42:07 2008 UTC vs.
Revision 2.88 by greg, Fri Dec 5 00:51:59 2008 UTC

# Line 208 | Line 208 | main(
208                  goto userr;
209          rifname = argv[i];
210                                  /* check command-line options */
211 <        if ((nprocs > 1) & (viewselect != NULL))
211 >        if ((nprocs > 1) & (viewselect != NULL) & (rvdevice == NULL))
212                  nprocs = 1;
213                                  /* assign Radiance root file name */
214          rootname(radname, rifname);
# Line 1197 | Line 1197 | rvu(                           /* run rvu with first view */
1197          if (sayview)
1198                  myprintview(vw, stdout);
1199          sprintf(combuf, "rvu %s%s%s -R %s ", vw, po, opts, rifname);
1200 +        if (nprocs > 1)
1201 +                sprintf(combuf+strlen(combuf), "-n %d ", nprocs);
1202          if (rvdevice != NULL)
1203                  sprintf(combuf+strlen(combuf), "-o %s ", rvdevice);
1204          if (vdef(EXPOSURE))
# Line 1277 | Line 1279 | rpict(                         /* run rpict and pfilt for each view */
1279                          myprintview(vw, stdout);
1280                  if (!vs[0])
1281                          sprintf(vs, "%d", vn);
1282 <                sprintf(picfile, "%s_%s.pic", vval(PICTURE), vs);
1282 >                sprintf(picfile, "%s_%s.hdr", vval(PICTURE), vs);
1283                  if (vdef(ZFILE))
1284                          sprintf(zopt, " -z %s_%s.zbf", vval(ZFILE), vs);
1285                  else
# Line 1366 | Line 1368 | rpict(                         /* run rpict and pfilt for each view */
1368                  }
1369                                                  /* remove/rename raw file */
1370                  if (vdef(RAWFILE)) {
1371 <                        sprintf(combuf, "%s_%s.pic", vval(RAWFILE), vs);
1371 >                        sprintf(combuf, "%s_%s.hdr", vval(RAWFILE), vs);
1372                          mvfile(rawfile, combuf);
1373                  } else
1374                          rmfile(rawfile);
# Line 1483 | Line 1485 | wait_process(                  /* wait for process(es) to finish */
1485          int     all
1486   )
1487   {
1488 <        int     ourstatus = 0;
1489 <        RT_PID  pid, status;
1488 >        int     ourstatus = 0, status;
1489 >        RT_PID  pid;
1490  
1491          if (all)
1492                  all = children_running;
# Line 1521 | Line 1523 | int    all;
1523   }
1524   int
1525   kill(pid, sig) /* win|unix_process.c should also wait and kill */
1526 < RT_PID pid, sig;
1526 > RT_PID pid;
1527 > int sig;
1528   {
1529          return 0;
1530   }

Diff Legend

– Removed lines
+ Added lines
< Changed lines (old)
> Changed lines (new)