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.7 by greg, Sun Jun 21 21:42:12 2009 UTC vs.
Revision 2.10 by greg, Thu Jul 2 02:13:08 2009 UTC

# Line 38 | Line 38 | cm_alloc(int nrows, int ncols)
38          CMATRIX *cm;
39  
40          if ((nrows <= 0) | (ncols <= 0))
41 <                return(NULL);
41 >                error(USER, "attempt to create empty matrix");
42          cm = (CMATRIX *)malloc(sizeof(CMATRIX) +
43                                  3*sizeof(COLORV)*(nrows*ncols - 1));
44          if (cm == NULL)
# Line 294 | Line 294 | static CMATRIX *
294   cm_bsdf(const struct BSDF_data *bsdf)
295   {
296          CMATRIX *cm = cm_alloc(bsdf->nout, bsdf->ninc);
297 –        COLORV  *mp = cm->cmem;
297          int     nbadohm = 0;
298          int     nneg = 0;
299          int     r, c;
300          
301 <        for (c = 0; c < cm->ncols; c++, mp += 3) {
301 >        for (c = 0; c < cm->ncols; c++) {
302                  float   dom = getBSDF_incohm(bsdf,c);
303                  FVECT   v;
304                  
# Line 313 | Line 312 | cm_bsdf(const struct BSDF_data *bsdf)
312  
313                  for (r = 0; r < cm->nrows; r++) {
314                          float   f = BSDF_value(bsdf,c,r);
315 +                        COLORV  *mp = cm_lval(cm,r,c);
316  
317                          if (f <= .0) {
318                                  nneg += (f < -FTINY);
319 <                                continue;
319 >                                f = .0f;
320                          }
321                          mp[0] = mp[1] = mp[2] = f * dom;
322                  }

Diff Legend

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