Slighly less confusing handling of inverted monochrome images

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@8513 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Linus Nielsen Feltzing 2006-01-31 23:02:05 +00:00
parent d563ac6caa
commit 62b22ba45f

View file

@ -222,8 +222,8 @@ int read_bmp_file(char* filename,
}
/* Use the darker palette color as foreground on mono bitmaps */
if(readshort(&fh.BitCount) == 1) {
if(brightness(palette[0]) > brightness(palette[1]))
if(depth == 1) {
if(brightness(palette[0]) < brightness(palette[1]))
invert_pixel = 1;
}
@ -260,12 +260,12 @@ int read_bmp_file(char* filename,
/* Mono -> Mono */
for (col = 0; col < width; col++) {
ret = getpix(col, bmpbuf) ^ invert_pixel;
if (ret == 1) {
bitmap[width * ((height - row - 1) / 8) + col]
&= ~ 1 << ((height - row - 1) % 8);
} else {
if (ret) {
bitmap[width * ((height - row - 1) / 8) + col]
|= 1 << ((height - row - 1) % 8);
} else {
bitmap[width * ((height - row - 1) / 8) + col]
&= ~ 1 << ((height - row - 1) % 8);
}
}
#if LCD_DEPTH == 2