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

Comparing ray/src/util/dctimestep.c (file contents):
Revision 2.43 by greg, Wed Oct 23 17:00:14 2019 UTC vs.
Revision 2.45 by greg, Wed Mar 25 01:51:09 2020 UTC

# Line 48 | Line 48 | sum_images(const char *fspec, const CMATRIX *cv, FILE
48                          error(SYSTEM, errmsg);
49                  }
50                  dt = DTfromHeader;
51 <                if ((err = cm_getheader(&dt, NULL, NULL, NULL, fp)) != NULL)
51 >                if ((err = cm_getheader(&dt, NULL, NULL, NULL, NULL, fp)) != NULL)
52                          error(USER, err);
53                  if ((dt != DTrgbe) & (dt != DTxyze) ||
54                                  !fscnresolu(&xr, &yr, fp)) {
# Line 240 | Line 240 | main(int argc, char *argv[])
240                  ofspec = NULL;                  /* only need to open once */
241          }
242          if (hasNumberFormat(argv[a])) {         /* generating image(s) */
243 +                if (outfmt != DTrgbe) {
244 +                        error(WARNING, "changing output type to -oc");
245 +                        outfmt = DTrgbe;
246 +                }
247                  if (ofspec == NULL) {
248                          SET_FILE_BINARY(ofp);
249                          newheader("RADIANCE", ofp);
# Line 346 | Line 350 | main(int argc, char *argv[])
350          cm_free(cmtx);
351          return(0);
352   userr:
353 <        fprintf(stderr, "Usage: %s [-n nsteps][-o ospec][-i{f|d|h}][-o{f|d}] DCspec [skyf]\n",
353 >        fprintf(stderr, "Usage: %s [-n nsteps][-o ospec][-i{f|d|h}][-o{f|d|c}] DCspec [skyf]\n",
354                                  progname);
355 <        fprintf(stderr, "   or: %s [-n nsteps][-o ospec][-i{f|d|h}][-o{f|d}] Vspec Tbsdf Dmat.dat [skyf]\n",
355 >        fprintf(stderr, "   or: %s [-n nsteps][-o ospec][-i{f|d|h}][-o{f|d|c}] Vspec Tbsdf Dmat.dat [skyf]\n",
356                                  progname);
357          return(1);
358   }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines