From 62b22ba45f8a43cb95a0330c494b421c863f07d6 Mon Sep 17 00:00:00 2001 From: Linus Nielsen Feltzing Date: Tue, 31 Jan 2006 23:02:05 +0000 Subject: Slighly less confusing handling of inverted monochrome images git-svn-id: svn://svn.rockbox.org/rockbox/trunk@8513 a1c6a512-1295-4272-9138-f99709370657 --- apps/recorder/bmp.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'apps/recorder') diff --git a/apps/recorder/bmp.c b/apps/recorder/bmp.c index 1d4d8147b1..5f596efdda 100644 --- a/apps/recorder/bmp.c +++ b/apps/recorder/bmp.c @@ -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) { + if (ret) { bitmap[width * ((height - row - 1) / 8) + col] - &= ~ 1 << ((height - row - 1) % 8); + |= 1 << ((height - row - 1) % 8); } else { bitmap[width * ((height - row - 1) / 8) + col] - |= 1 << ((height - row - 1) % 8); + &= ~ 1 << ((height - row - 1) % 8); } } #if LCD_DEPTH == 2 -- cgit v1.2.3