mirrors
/
netsurf
mirror of https://github.com/netsurf-browser/netsurf
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[project @ 2006-02-28 01:02:37 by rjw] 

Render alpha-channel BMPs correctly.

svn path=/import/netsurf/; revision=2100
This commit is contained in:
Richard Wilson 2006-02-28 01:02:37 +00:00
parent 6f654c6f1e
commit 464964cfb6
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
image/bmpread.c
View File

@ -282,7 +282,7 @@ bmp_result bmp_analyse_header(struct bmp_image *bmp, char *data) {
/* create our bitmap */ /* create our bitmap */
flags = BITMAP_NEW | BITMAP_CLEAR_MEMORY; flags = BITMAP_NEW | BITMAP_CLEAR_MEMORY;
if ((!bmp->ico) || (bmp->mask[3] == 0)) if ((!bmp->ico) && (bmp->mask[3] == 0))
flags |= BITMAP_OPAQUE; flags |= BITMAP_OPAQUE;
bmp->bitmap = bitmap_create(bmp->width, bmp->height, flags); bmp->bitmap = bitmap_create(bmp->width, bmp->height, flags);
if (!bmp->bitmap) { if (!bmp->bitmap) {
@ -431,13 +431,13 @@ bmp_result bmp_decode_rgb24(struct bmp_image *bmp, char **start, int bytes) {
for (x = 0; x < bmp->width; x++) { for (x = 0; x < bmp->width; x++) {
word = data[0] | (data[1] << 8) | (data[2] << 16) | word = data[0] | (data[1] << 8) | (data[2] << 16) |
(data[3] << 24); (data[3] << 24);
scanline[x] = 0; scanline[x] = (0xff << 24);
for (i = 0; i < 4; i++) for (i = 0; i < 4; i++)
if (bmp->shift[i] > 0) if (bmp->shift[i] > 0)
scanline[x] |= ((word & bmp->mask[i]) << scanline[x] ^= ((word & bmp->mask[i]) <<
bmp->shift[i]); bmp->shift[i]);
else else
scanline[x] |= ((word & bmp->mask[i]) >> scanline[x] ^= ((word & bmp->mask[i]) >>
(-bmp->shift[i])); (-bmp->shift[i]));
data += 4; data += 4;
} }
@ -489,13 +489,13 @@ bmp_result bmp_decode_rgb16(struct bmp_image *bmp, char **start, int bytes) {
if (bmp->encoding == BMP_ENCODING_BITFIELDS) { if (bmp->encoding == BMP_ENCODING_BITFIELDS) {
for (x = 0; x < bmp->width; x++) { for (x = 0; x < bmp->width; x++) {
word = data[0] | (data[1] << 8); word = data[0] | (data[1] << 8);
scanline[x] = 0; scanline[x] = (0xff << 24);
for (i = 0; i < 4; i++) for (i = 0; i < 4; i++)
if (bmp->shift[i] > 0) if (bmp->shift[i] > 0)
scanline[x] |= ((word & bmp->mask[i]) << scanline[x] ^= ((word & bmp->mask[i]) <<
bmp->shift[i]); bmp->shift[i]);
else else
scanline[x] |= ((word & bmp->mask[i]) >> scanline[x] ^= ((word & bmp->mask[i]) >>
(-bmp->shift[i])); (-bmp->shift[i]));
data += 2; data += 2;
} }