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

Comparing ray/src/util/rad.c (file contents):
Revision 2.86 by greg, Thu Aug 21 07:05:59 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 1279 | 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 1368 | 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);

Diff Legend

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