--- ray/src/common/spec_rgb.c 2010/01/04 19:40:14 2.20 +++ ray/src/common/spec_rgb.c 2010/04/13 01:48:52 2.22 @@ -1,5 +1,5 @@ #ifndef lint -static const char RCSid[] = "$Id: spec_rgb.c,v 2.20 2010/01/04 19:40:14 greg Exp $"; +static const char RCSid[] = "$Id: spec_rgb.c,v 2.22 2010/04/13 01:48:52 greg Exp $"; #endif /* * Convert colors and spectral ranges. @@ -243,14 +243,19 @@ RGBPRIMS pr { int i, j; - for (i = 0; i < 4; i++) { - if ((pr[i][CIEX] <= -.5) | (pr[i][CIEY] <= -.5)) + for (i = 0; i < 3; i++) { + if ((pr[i][CIEX] <= -1.) | (pr[i][CIEY] <= -1.)) return(0); - if ((pr[i][CIEX] >= 1.5) | (pr[i][CIEY] >= 1.5)) + if ((pr[i][CIEX] >= 2.) | (pr[i][CIEY] >= 2.)) return(0); - if (pr[i][CIEX] + pr[i][CIEY] >= 1.5) + if (pr[i][CIEX] + pr[i][CIEY] <= -1.) return(0); + if (pr[i][CIEX] + pr[i][CIEY] >= 2.) + return(0); } + if ((pr[3][CIEX] <= 0.) | (pr[3][CIEX] >= 1.) | + (pr[3][CIEY] <= 0.) | (pr[3][CIEY] >= 1.)) + return(0); for (i = 0; i < 4; i++) for (j = i+1; j < 4; j++) if (CEQ(pr[i][CIEX],pr[j][CIEX]) &&