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); |
787 |
|
} |
788 |
|
po = addarg(po, "-pt .08"); |
789 |
|
if (vbool(PENUMBRAS)) |
790 |
< |
op = addarg(op, "-ds .2 -dj .5"); |
790 |
> |
op = addarg(op, "-ds .2 -dj .9"); |
791 |
|
else |
792 |
|
op = addarg(op, "-ds .3"); |
793 |
|
op = addarg(op, "-dt .1 -dc .5 -dr 1 -sj .7 -st .1"); |
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)) |
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 |
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); |
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; |
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 |
|
} |