From 37ecb14579d82695bb617a04e0c7e825140a5fde Mon Sep 17 00:00:00 2001
From: jdgordon <jdgordon@a1c6a512-1295-4272-9138-f99709370657>
Date: Sat, 14 Jul 2007 09:19:46 +0000
Subject: [PATCH] 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
---
 apps/bitmaps/native/default_icons.6x8x16.bmp          | Bin 5174 -> 5174 bytes
 .../bitmaps/viewer_defaults/viewers.6x8x16.bmp        | Bin 2134 -> 2134 bytes
 firmware/drivers/lcd-16bit.c                          |   4 +++-
 firmware/export/lcd.h                                 |   1 +
 4 files changed, 4 insertions(+), 1 deletion(-)
 rewrite apps/bitmaps/native/default_icons.6x8x16.bmp (62%)
 rewrite apps/plugins/bitmaps/viewer_defaults/viewers.6x8x16.bmp (94%)

diff --git a/apps/bitmaps/native/default_icons.6x8x16.bmp b/apps/bitmaps/native/default_icons.6x8x16.bmp
dissimilarity index 62%
index 601c4f95a617434386b6c0fee4868e116f34ea30..8cc45c78550aa15cc93dea3b03b069063b5b32e9 100755
GIT binary patch
literal 5174
zcwWtuK~}>s3`EU_B`X#jffMuq?721f5@{3LGtwxw``QP7PH?_QGm1&SzAx|PHZI%s
zxm~Z<hnMU8*f+NQpSS(0!-~1Nvt!*ENxY8PKI_V{yLHeDDE7sOaYkU>yVoj~WT^fi
zpyhJ8%K)Zy=vVt=%jh@m?{Ta@_FkIKde1lq{RO5nf}cV8fQ8z7dg0m%WCr{%+gxSA
zFVLn_46yT4%*0uZ{Wv!|>a!~1x5Z{={<lzuX9Y=lF3(fl6eBl(E_U>ySP^FcUYNnr
zg{rdLC8qrHT-6`Ao}LTL1*ZIxT%LH&?DupXJ@#7VSM+-@3&r_aP5FiDWfuHMb;6#|
zi((<eVCRgf+J)SyUKVs+b$kb{@b)MF4k%&0XNYkOG5}2I62Bz3zOT_qAcI_AX~l!c
zSf~6rH&)jwX67-nY8+Y3&2@uZcxo&__YD<mEa?8qPv~~s?sYT<x(3F&LViiE8cLKf
zRqO7cQ~gz@`a`|aRd0OCn+n@O8gd8ysiAaD%vH)yxlj2exhg{qgZE8Ev%0ljW<znI
ztJG`ei3|O?1>5rm_$92}Q$M#H^cM_9?~$l=XV}F+7jlzc^8Nzj+(b8(t5^|-^3QZm
Z!qSH_$iSz%nfI5l;FmDi%vl>L`vq1f8HNA=

literal 5174
zcwWs>Nm2wc3=0>IoH+0VUN8^f&ae4bGfO2UTT-0NOi{SHQ;94~O83|I>AhX+bbde2
z@9X98a(O;(jdTC!?e_LM+L4|smYOXT@ghbeh~3Sjd`K;@=t0=DS$n8_WPnq?*-r+G
zdoM{@Oupw~$r^Iv8VmIBv6%88y$0h2Mzi;1iL(Px9>B*qTNstfHyt;U#-`>KzA7K`
z0YmlPkAq_*ZHmjP(;fL%G4SVzEfnQLtjLGf^yQTA7N+#PugVuy!D!4rQcBPGs(hsI
z7d)&Y-{8-%)mqi_SynO9OEDh)Zx3QB-{{ORHM`-fuvI<9i{G!oc$-ve7rs-h3y`l0
zGUXXP<4X!H6amwwQiwd$_V?(SQwPKp*22EXlz4@&%4ceuv_V}W&8UWV^eaay4n&2T
z*Mi<^zC<lBHJeu8seBz%`H-)8T^mn66t#&;zC}J&iZ{q{O6e)}B|YP-JX9TUUrSo$
z?PXat#f_d)*Yu7X`O+rJ#|G#bY^+u<ZHs&)P~F3@buvs*@W|I>@%adgzJ|BttFR_M
c%0J^JN~As&0}nj)rq5?E(lZz|JvPc>zvA5nZvX%Q

diff --git a/apps/plugins/bitmaps/viewer_defaults/viewers.6x8x16.bmp b/apps/plugins/bitmaps/viewer_defaults/viewers.6x8x16.bmp
dissimilarity index 94%
index 1760e66d43ab60b2954a9d35eccf6e564a24dd13..9b039b12174d40abc83ea28de1d36257bf8609ec 100644
GIT binary patch
literal 2134
zcwW_#F%H5o3`Na?kl2_Q894z5U}xnF-2Vb5N^0jjc4(q@p^9nx^8M{tJYVk<<>!&&
zp5mC|lj1<v%x~%ZaxNhc6E}+-VJfVA$fo34Os%M&8`X$<*~r-Z&gD90%^DroyP*hl
z#_h+P9gA{1HKJbZ(i$DMUPE&&t8SAz*B^rXYVHQi`LUHwG4zXi0R|%Vi*oyZdo$=o
zMOMeA^N!9L`dPv3JASSgSZg}LT2~6FuBHVwm^{mP;J*fS?P~5TevxjJjruv-%z&5s
o%2p4thHQ4xaXp-vX_U)=sm{Q$jddM!@DFsOtn3!6#cu=q0`CIdkpKVy

literal 2134
zcwWs=F%H5&3=0cFVq;=t<OMu{os~E6{|~^aD3Oym+@0D1tEsMz6Z?99JP)$q*6P}7
z-|E$BC+CH~wEpS%EyY{j;gJf~)`R~N<pRxTYXhHUB`5wpHJdmgE3wUdK^Lwn!(g+8
z2g}0lA-<EGI`=@EPQJb_<@=d7F36uKo#JpG%K{vVLJT)s@7tP#rioG(q`9sDS}P&t
zzLcfN$8-Yy^s77n)W(yqzXbF3(gav7rDy`9`-;p#;?=%k+(tTsW?}h8GaJopk_hMt
Q-^4NeyKWS?L(glt4|JQ;e*gdg

diff --git a/firmware/drivers/lcd-16bit.c b/firmware/drivers/lcd-16bit.c
index f03cab387..73e901f58 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 787eea01f..d379dc361 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;
-- 
2.11.4.GIT