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.21 by schorsch, Mon Oct 27 10:24:51 2003 UTC

# Line 15 | Line 15 | static const char      RCSid[] = "$Id$";
15   #include <time.h>
16  
17   #include "platform.h"
18 + #include "rtprocess.h"
19   #include "color.h"
20   #include "resolu.h"
21   #include "pmap.h"
# Line 366 | Line 367 | getcolors()                    /* get xyY colors from standard input */
367          float   xyYin[3];
368  
369          while (fgetval(stdin, 'i', &n) == 1) {          /* read colors */
370 <                if (n < 0 | n > 24 ||
370 >                if ((n < 0) | (n > 24) ||
371                                  fgetval(stdin, 'f', &xyYin[0]) != 1 ||
372                                  fgetval(stdin, 'f', &xyYin[1]) != 1 ||
373                                  fgetval(stdin, 'f', &xyYin[2]) != 1 ||
374 <                                xyYin[0] < 0. | xyYin[1] < 0. ||
374 >                                (xyYin[0] < 0.) | (xyYin[1] < 0.) ||
375                                  xyYin[0] + xyYin[1] > 1.) {
376                          fprintf(stderr, "%s: bad color input data\n",
377                                          progname);

Diff Legend

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