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.10 by greg, Fri Apr 30 17:00:29 2004 UTC vs.
Revision 2.12 by greg, Tue Sep 14 02:53:50 2004 UTC

# Line 11 | Line 11 | static const char RCSid[] = "$Id$";
11   #include "bmpfile.h"
12  
13   #ifdef getc_unlocked            /* avoid horrendous overhead of flockfile */
14 + #undef getc
15 + #undef putc
16   #define getc    getc_unlocked
17   #define putc    putc_unlocked
18   #endif
# Line 143 | Line 145 | BMPopenReader(int (*cget)(void *), int (*seek)(uint32,
145          BMPReader       *br;
146          uint32          bmPos, hdrSiz;
147          int             palLen;
148 +        int     magic[2];               /* check magic number */
149  
150          if (cget == NULL)
151                  return NULL;
149        int     magic[2];               /* check magic number */
152          magic[0] = (*cget)(c_data);
153          if (magic[0] != 'B')
154                  return NULL;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines