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

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 601c4f9..8cc45c7 100755
--- a/apps/bitmaps/native/default_icons.6x8x16.bmp
+++ b/apps/bitmaps/native/default_icons.6x8x16.bmp
diff --git a/apps/plugins/bitmaps/viewer_defaults/viewers.6x8x16.bmp b/apps/plugins/bitmaps/viewer_defaults/viewers.6x8x16.bmp
index 1760e66..9b039b1 100644
--- a/apps/plugins/bitmaps/viewer_defaults/viewers.6x8x16.bmp
+++ b/apps/plugins/bitmaps/viewer_defaults/viewers.6x8x16.bmp
diff --git a/firmware/drivers/lcd-16bit.c b/firmware/drivers/lcd-16bit.c
index f03cab3..73e901f 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 787eea0..d379dc3 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;