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

Comparing ray/src/util/dctimestep.c (file contents):
Revision 2.4 by greg, Fri Jun 19 14:24:06 2009 UTC vs.
Revision 2.5 by greg, Sat Jun 20 04:27:18 2009 UTC

# Line 429 | Line 429 | main(int argc, char *argv[])
429                                  progname);
430                  return(1);
431          }
432 +                                                /* load Tregenza vector */
433          tvec = cm_load(argv[4], 0, 1, DTascii); /* argv[4]==NULL iff argc==4 */
434 <        Dmat = cm_load(argv[3], 0, tvec->nrows, DTfromHeader);
434 >                                                /* load BTDF */
435          btdf = load_BSDF(argv[2]);
436          if (btdf == NULL)
437                  return(1);
438 <        if (btdf->ninc != Dmat->nrows) {
439 <                sprintf(errmsg, "Incoming BTDF dir (%d) mismatch to D (%d)",
439 <                                btdf->ninc, Dmat->nrows);
440 <                error(USER, errmsg);
441 <        }
438 >                                                /* load Daylight matrix */
439 >        Dmat = cm_load(argv[3], btdf->ninc, tvec->nrows, DTfromHeader);
440                                                  /* multiply vector through */
441          ivec = cm_multiply(Dmat, tvec);
442          cm_free(Dmat); cm_free(tvec);

Diff Legend

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