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

Comparing ray/src/common/color.c (file contents):
Revision 2.12 by greg, Wed Apr 23 00:52:33 2003 UTC vs.
Revision 2.13 by schorsch, Sun Jul 27 22:12:01 2003 UTC

# Line 49 | Line 49 | register FILE  *fp;
49          register int  i, j, beg, cnt = 1;
50          int  c2;
51          
52 <        if (len < MINELEN | len > MAXELEN)      /* OOBs, write out flat */
52 >        if ((len < MINELEN) | (len > MAXELEN))  /* OOBs, write out flat */
53                  return(fwrite((char *)scanline,sizeof(COLR),len,fp) - len);
54                                          /* put magic header */
55          putc(2, fp);
# Line 139 | Line 139 | register FILE  *fp;
139          register int  i, j;
140          int  code, val;
141                                          /* determine scanline type */
142 <        if (len < MINELEN | len > MAXELEN)
142 >        if ((len < MINELEN) | (len > MAXELEN))
143                  return(oldreadcolrs(scanline, len, fp));
144          if ((i = getc(fp)) == EOF)
145                  return(-1);

Diff Legend

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