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.20 by greg, Mon Jan 4 19:40:14 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] <= -.5) | (pr[i][CIEY] <= -.5))
248                          return(0);
249 <                if ((pr[i][CIEX] >= 1.-CEPS) | (pr[i][CIEY] >= 1.-CEPS))
249 >                if ((pr[i][CIEX] >= 1.5) | (pr[i][CIEY] >= 1.5))
250                          return(0);
251 +                if (pr[i][CIEX] + pr[i][CIEY] >= 1.5)
252 +                        return(0);
253          }
254 +        for (i = 0; i < 4; i++)
255 +                for (j = i+1; j < 4; j++)
256 +                        if (CEQ(pr[i][CIEX],pr[j][CIEX]) &&
257 +                                        CEQ(pr[i][CIEY],pr[j][CIEY]))
258 +                                return(0);
259          return(1);
260   }
261  

Diff Legend

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