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

Comparing ray/src/common/bmpfile.c (file contents):
Revision 2.1 by greg, Fri Mar 26 03:11:50 2004 UTC vs.
Revision 2.2 by schorsch, Fri Mar 26 21:29:19 2004 UTC

# Line 135 | Line 135 | BMPopenReader(int (*cget)(void *), int (*seek)(uint32,
135                  goto err;
136          br->hdr->width = rdint32(br);           /* bitmap width */
137          br->hdr->height = rdint32(br);          /* bitmap height */
138 <        if ((br->hdr->width <= 0 | br->hdr->height == 0))
138 >        if (((br->hdr->width <= 0) | (br->hdr->height == 0)))
139                  goto err;
140          if ((br->hdr->yIsDown = br->hdr->height < 0))
141                  br->hdr->height = -br->hdr->height;
# Line 230 | Line 230 | BMPisGrayscale(const BMPHeader *hdr)
230          if (hdr->bpp > 8)               /* assume they had a reason for it */
231                  return 0;
232          for (rgbp = hdr->palette, n = hdr->impColors; n-- > 0; rgbp++)
233 <                if ((rgbp->r != rgbp->g | rgbp->g != rgbp->b))
233 >                if (((rgbp->r != rgbp->g) | (rgbp->g != rgbp->b)))
234                          return 0;
235          return 1;                       /* all colors neutral in map */
236   }
# Line 299 | Line 299 | BMPdecodePixel(int i, BMPReader *br)
299   {
300          static const RGBquad    black = {0, 0, 0, 0};
301          
302 <        if ((br == NULL | i < 0) || i >= br->hdr->width)
302 >        if (((br == NULL) | (i < 0)) || i >= br->hdr->width)
303                  return black;
304  
305          switch (br->hdr->bpp) {

Diff Legend

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