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.19 by schorsch, Mon Jul 21 22:30:18 2003 UTC vs.
Revision 2.20 by schorsch, Sun Jul 27 22:12:03 2003 UTC

# Line 366 | Line 366 | getcolors()                    /* get xyY colors from standard input */
366          float   xyYin[3];
367  
368          while (fgetval(stdin, 'i', &n) == 1) {          /* read colors */
369 <                if (n < 0 | n > 24 ||
369 >                if ((n < 0) | (n > 24) ||
370                                  fgetval(stdin, 'f', &xyYin[0]) != 1 ||
371                                  fgetval(stdin, 'f', &xyYin[1]) != 1 ||
372                                  fgetval(stdin, 'f', &xyYin[2]) != 1 ||
373 <                                xyYin[0] < 0. | xyYin[1] < 0. ||
373 >                                (xyYin[0] < 0.) | (xyYin[1] < 0.) ||
374                                  xyYin[0] + xyYin[1] > 1.) {
375                          fprintf(stderr, "%s: bad color input data\n",
376                                          progname);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines