summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJonathan Gordon <rockbox@jdgordon.info>2007-07-14 09:19:46 +0000
committerJonathan Gordon <rockbox@jdgordon.info>2007-07-14 09:19:46 +0000
commit60e7472f72567e6d7417931dc4cd8bf969868043 (patch)
treebc327974081b9a385b0f697ef61c55b35e4e239d
parent5890f60137f13fce0d6e77a4820a54b56dc282ba (diff)
downloadrockbox-60e7472f72567e6d7417931dc4cd8bf969868043.tar.gz
rockbox-60e7472f72567e6d7417931dc4cd8bf969868043.tar.bz2
rockbox-60e7472f72567e6d7417931dc4cd8bf969868043.zip
Fix FS#7044 - if the color RGB(0,255,255) is in a bmp it will be replaced with the current foreground colour
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@13878 a1c6a512-1295-4272-9138-f99709370657
-rwxr-xr-xapps/bitmaps/native/default_icons.6x8x16.bmpbin5174 -> 5174 bytes
-rw-r--r--apps/plugins/bitmaps/viewer_defaults/viewers.6x8x16.bmpbin2134 -> 2134 bytes
-rw-r--r--firmware/drivers/lcd-16bit.c4
-rw-r--r--firmware/export/lcd.h1
4 files changed, 4 insertions, 1 deletions
diff --git a/apps/bitmaps/native/default_icons.6x8x16.bmp b/apps/bitmaps/native/default_icons.6x8x16.bmp
index 601c4f95a6..8cc45c7855 100755
--- a/apps/bitmaps/native/default_icons.6x8x16.bmp
+++ b/apps/bitmaps/native/default_icons.6x8x16.bmp
Binary files differ
diff --git a/apps/plugins/bitmaps/viewer_defaults/viewers.6x8x16.bmp b/apps/plugins/bitmaps/viewer_defaults/viewers.6x8x16.bmp
index 1760e66d43..9b039b1217 100644
--- a/apps/plugins/bitmaps/viewer_defaults/viewers.6x8x16.bmp
+++ b/apps/plugins/bitmaps/viewer_defaults/viewers.6x8x16.bmp
Binary files differ
diff --git a/firmware/drivers/lcd-16bit.c b/firmware/drivers/lcd-16bit.c
index f03cab3877..73e901f583 100644
--- a/firmware/drivers/lcd-16bit.c
+++ b/firmware/drivers/lcd-16bit.c
@@ -727,7 +727,9 @@ void lcd_bitmap_transparent_part(const fb_data *src, int src_x, int src_y,
int i;
for(i = 0;i < width;i++)
{
- if(src[i] != TRANSPARENT_COLOR)
+ if (src[i] == REPLACEWITHFG_COLOR)
+ dst[i] = fg_pattern;
+ else if(src[i] != TRANSPARENT_COLOR)
dst[i] = src[i];
}
src += stride;
diff --git a/firmware/export/lcd.h b/firmware/export/lcd.h
index 787eea01f5..d379dc3613 100644
--- a/firmware/export/lcd.h
+++ b/firmware/export/lcd.h
@@ -291,6 +291,7 @@ enum
#define FORMAT_REMOTE 0x10000000
#define TRANSPARENT_COLOR LCD_RGBPACK(255,0,255)
+#define REPLACEWITHFG_COLOR LCD_RGBPACK(0,255,255)
struct bitmap {
int width;