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

Comparing ray/src/px/macbethcal.c (file contents):
Revision 2.11 by greg, Thu Jan 30 17:07:42 1997 UTC vs.
Revision 2.12 by greg, Thu Jan 30 19:14:11 1997 UTC

# Line 1 | Line 1
1 < /* Copyright (c) 1995 Regents of the University of California */
1 > /* Copyright (c) 1997 Regents of the University of California */
2  
3   #ifndef lint
4   static char SCCSid[] = "$SunId$ LBL";
# Line 326 | Line 326 | getcolors()                    /* get xyY colors from standard input */
326                                  fgetval(stdin, 'f', &xyYin[0]) != 1 ||
327                                  fgetval(stdin, 'f', &xyYin[1]) != 1 ||
328                                  fgetval(stdin, 'f', &xyYin[2]) != 1 ||
329 <                                xyYin[0] < 0. | xyYin[0] > 1. |
330 <                                xyYin[1] < 0. | xyYin[1] > 1.) {
329 >                                xyYin[0] < 0. | xyYin[1] < 0. ||
330 >                                xyYin[0] + xyYin[1] > 1.) {
331                          fprintf(stderr, "%s: bad color input data\n",
332                                          progname);
333                          exit(1);
# Line 583 | Line 583 | register float xyYin[3];
583          ctmp[1] = xyYin[2];
584          ctmp[2] = (1. - xyYin[0] - xyYin[1]) * d;
585          cie_rgb(rgbout, ctmp);
586 +                                /* allow negative values */
587 +        colortrans(rgbout, xyz2rgbmat, ctmp, 0);
588   }
589  
590  

Diff Legend

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