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

Comparing ray/src/common/spec_rgb.c (file contents):
Revision 2.16 by greg, Mon Oct 8 18:07:55 2007 UTC vs.
Revision 2.21 by greg, Mon Apr 12 21:24:07 2010 UTC

# Line 241 | Line 241 | colorprimsOK(                  /* are color primaries reasonable? */
241   RGBPRIMS  pr
242   )
243   {
244 <        int     i;
244 >        int     i, j;
245          
246          for (i = 0; i < 4; i++) {
247 <                if ((pr[i][CIEX] <= CEPS) | (pr[i][CIEY] <= CEPS))
247 >                if ((pr[i][CIEX] <= -1.) | (pr[i][CIEY] <= -1.))
248                          return(0);
249 <                if ((pr[i][CIEX] >= 1.-CEPS) | (pr[i][CIEY] >= 1.-CEPS))
249 >                if ((pr[i][CIEX] >= 2.) | (pr[i][CIEY] >= 2.))
250                          return(0);
251 +                if (pr[i][CIEX] + pr[i][CIEY] <= -1.)
252 +                        return(0);
253 +                if (pr[i][CIEX] + pr[i][CIEY] >= 2.)
254 +                        return(0);
255          }
256 +        for (i = 0; i < 4; i++)
257 +                for (j = i+1; j < 4; j++)
258 +                        if (CEQ(pr[i][CIEX],pr[j][CIEX]) &&
259 +                                        CEQ(pr[i][CIEY],pr[j][CIEY]))
260 +                                return(0);
261          return(1);
262   }
263  

Diff Legend

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