nethack-gwaa-kiwi/nethack
1
0
Fork 0
Code Pull Requests Activity

Fix bugs affecting full-color BMP files

Browse Source
This commit is contained in:
Ray Chason
2020-01-27 09:54:58 +02:00
committed by Pasi Kallinen
parent 9460796a2b
commit 1870e5a41b
1 changed files with 2 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
win/share/bmptiles.c
+2 -11
View File
@@ -107,15 +107,6 @@ struct TileSetImage *image;
if (!read_info_header(fp, &header2)) goto error; if (!read_info_header(fp, &header2)) goto error;
if (!check_info_header(&header2)) goto error; if (!check_info_header(&header2)) goto error;
#if 0 /* TODO */
if (header2.Compression == BI_PNG) {
/* Image data is an embedded PNG bit stream */
boolean ok = do_read_png_tiles(fp, image));
fclose(fp);
return ok;
}
#endif
/* header2.Height < 0 means the Y coordinate is reversed; the origin is /* header2.Height < 0 means the Y coordinate is reversed; the origin is
* top left rather than bottom left */ * top left rather than bottom left */
image->width = header2.Width; image->width = header2.Width;
@@ -300,7 +291,7 @@ struct TileSetImage *image;
break; break;
case 32: case 32:
for (x = 0; x < image->width; ++x) { for (x = 0; x < image->width; ++x) {
uint32 color = read_u32(row_bytes + x * 2); uint32 color = read_u32(row_bytes + x * 4);
row[x] = build_pixel(&header2, color); row[x] = build_pixel(&header2, color);
} }
break; break;
@@ -609,7 +600,7 @@ uint32 color;
if (mask == 0) return 0; if (mask == 0) return 0;
bits = 0xFFFF; /* 0xFF, 0xF, 0x3, 0x1 */ bits = 0xFFFF; /* 0xFF, 0xF, 0x3, 0x1 */
shift = 16; /* 8, 4, 2, 1 */ shift = 16; /* 8, 4, 2, 1 */
while (bits != 0) { while (shift != 0) {
if ((mask & bits) == 0) { if ((mask & bits) == 0) {
mask >>= shift; mask >>= shift;
color >>= shift; color >>= shift;