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

Comparing ray/src/common/tonemap.c (file contents):
Revision 3.20 by greg, Sat Jan 14 20:25:51 2006 UTC vs.
Revision 3.22 by greg, Thu Mar 23 22:01:43 2006 UTC

# Line 182 | Line 182 | int    len
182                  returnErr(TM_E_TMINVAL);
183          if ((ls == NULL) | (scan == NULL) | (len < 0))
184                  returnErr(TM_E_ILLEGAL);
185 <        if (cs != TM_NOCHROM && fabs(curgam - tms->mongam) < .02) {
185 >        if (cs != TM_NOCHROM && fabs(tms->mongam - curgam) > .02) {
186                  curgam = tms->mongam;                   /* (re)build table */
187                  for (i = 1024; i--; )
188                          gamtab[i] = (int)(256.*pow((i+.5)/1024., 1./curgam));
# Line 195 | Line 195 | int    len
195                          cmon[GRN] = tms->inpsf*scan[i][GRN];
196                          cmon[BLU] = tms->inpsf*scan[i][BLU];
197                  }
198 + #ifdef isnan
199 +                if (isnan(cmon[RED]) || isinf(cmon[RED])) cmon[RED] = .0f;
200 +                if (isnan(cmon[GRN]) || isinf(cmon[GRN])) cmon[GRN] = .0f;
201 +                if (isnan(cmon[BLU]) || isinf(cmon[BLU])) cmon[BLU] = .0f;
202 + #endif
203                                                          /* world luminance */
204                  lum =   tms->clf[RED]*cmon[RED] +
205                          tms->clf[GRN]*cmon[GRN] +

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines