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 |
71 |
|
if (hdr->compr == BI_BITFIELDS && (BMPbitField(hdr)[0] & |
72 |
|
BMPbitField(hdr)[1] & BMPbitField(hdr)[2])) |
73 |
|
return 0; |
74 |
< |
if ((hdr->nColors < 0) | (hdr->impColors < 0)) |
75 |
< |
return 0; |
76 |
< |
if (hdr->impColors > hdr->nColors) |
77 |
< |
return 0; |
78 |
< |
if (hdr->nColors > BMPpalLen(hdr)) |
79 |
< |
return 0; |
74 |
> |
if (hdr->bpp > 8) { |
75 |
> |
if (hdr->nColors != 0) |
76 |
> |
return 0; |
77 |
> |
} else { |
78 |
> |
if ((hdr->nColors < 0) | (hdr->nColors > 1<<hdr->bpp)) |
79 |
> |
return 0; |
80 |
> |
if ((hdr->impColors < 0) | (hdr->impColors > hdr->nColors)) |
81 |
> |
return 0; |
82 |
> |
} |
83 |
|
return 1; |
84 |
|
} |
85 |
|
|
146 |
|
BMPopenReader(int (*cget)(void *), int (*seek)(uint32, void *), void *c_data) |
147 |
|
{ |
148 |
|
BMPReader *br; |
149 |
< |
uint32 bmPos, hdrSiz; |
150 |
< |
int palLen; |
149 |
> |
uint32 bmPos, hdrSiz, palSiz; |
150 |
> |
int magic[2]; /* check magic number */ |
151 |
|
|
152 |
|
if (cget == NULL) |
153 |
|
return NULL; |
149 |
– |
int magic[2]; /* check magic number */ |
154 |
|
magic[0] = (*cget)(c_data); |
155 |
|
if (magic[0] != 'B') |
156 |
|
return NULL; |
188 |
|
br->hdr->hRes = rdint32(br); /* horizontal resolution */ |
189 |
|
br->hdr->vRes = rdint32(br); /* vertical resolution */ |
190 |
|
br->hdr->nColors = rdint32(br); /* # colors used */ |
191 |
+ |
if (!br->hdr->nColors && br->hdr->bpp <= 8) |
192 |
+ |
br->hdr->nColors = 1<<br->hdr->bpp; |
193 |
|
br->hdr->impColors = rdint32(br); /* # important colors */ |
194 |
|
if (br->hdr->impColors < 0) |
195 |
|
goto err; /* catch premature EOF */ |
196 |
|
if (!BMPheaderOK(br->hdr)) |
197 |
|
goto err; |
198 |
< |
palLen = BMPpalLen(br->hdr); |
199 |
< |
if (br->hdr->bpp <= 8) { /* normalize color counts */ |
200 |
< |
if (br->hdr->nColors <= 0) |
195 |
< |
br->hdr->nColors = palLen; |
196 |
< |
if (br->hdr->impColors <= 0) |
197 |
< |
br->hdr->impColors = br->hdr->nColors; |
198 |
< |
} |
198 |
> |
palSiz = sizeof(RGBquad)*br->hdr->nColors; |
199 |
> |
if (br->hdr->impColors <= 0) |
200 |
> |
br->hdr->impColors = br->hdr->nColors; |
201 |
|
/* extend header */ |
202 |
< |
if (bmPos < hdrSiz + sizeof(RGBquad)*palLen) |
202 |
> |
if (bmPos < hdrSiz + palSiz) |
203 |
|
goto err; |
204 |
< |
br->hdr->infoSiz = bmPos - (hdrSiz + sizeof(RGBquad)*palLen); |
205 |
< |
if (palLen > 0 || br->hdr->infoSiz > 0) { |
204 |
> |
br->hdr->infoSiz = bmPos - (hdrSiz + palSiz); |
205 |
> |
if (br->hdr->nColors > 0 || br->hdr->infoSiz > 0) { |
206 |
|
br->hdr = (BMPHeader *)realloc((void *)br->hdr, |
207 |
|
sizeof(BMPHeader) + |
208 |
< |
sizeof(RGBquad)*palLen + |
207 |
< |
br->hdr->infoSiz); |
208 |
> |
palSiz + br->hdr->infoSiz); |
209 |
|
if (br->hdr == NULL) |
210 |
|
goto err; |
211 |
|
} |
214 |
|
BMPbitField(br->hdr)[0] = (uint32)rdint32(br); |
215 |
|
BMPbitField(br->hdr)[1] = (uint32)rdint32(br); |
216 |
|
BMPbitField(br->hdr)[2] = (uint32)rdint32(br); |
217 |
< |
} else if (rdbytes((char *)br->hdr->palette, |
217 |
< |
sizeof(RGBquad)*palLen, br) != BIR_OK) |
217 |
> |
} else if (rdbytes((char *)br->hdr->palette, palSiz, br) != BIR_OK) |
218 |
|
goto err; |
219 |
|
/* read add'l information */ |
220 |
|
if (rdbytes(BMPinfo(br->hdr), br->hdr->infoSiz, br) != BIR_OK) |
259 |
|
return -1; |
260 |
|
if (hdr->bpp > 8) /* assume they had a reason for it */ |
261 |
|
return 0; |
262 |
< |
for (rgbp = hdr->palette, n = hdr->nColors; n-- > 0; rgbp++) |
263 |
< |
if (((rgbp->r != rgbp->g) | (rgbp->g != rgbp->b))) |
262 |
> |
for (rgbp = hdr->palette, n = hdr->impColors; n-- > 0; rgbp++) |
263 |
> |
if ((rgbp->r != rgbp->g) | (rgbp->g != rgbp->b)) |
264 |
|
return 0; |
265 |
|
return 1; /* all colors neutral in map */ |
266 |
|
} |
640 |
|
hdrSiz = 2 + 6*4 + 2*2 + 6*4; |
641 |
|
if (hdr->compr == BI_BITFIELDS) |
642 |
|
hdrSiz += sizeof(uint32)*3; |
643 |
< |
palSiz = sizeof(RGBquad)*BMPpalLen(hdr); |
643 |
> |
palSiz = sizeof(RGBquad)*hdr->nColors; |
644 |
|
scanSiz = getScanSiz(hdr); |
645 |
|
bmSiz = hdr->height*scanSiz; /* wrong if compressed */ |
646 |
|
/* initialize writer */ |