From 60e7472f72567e6d7417931dc4cd8bf969868043 Mon Sep 17 00:00:00 2001
From: Jonathan Gordon <rockbox@jdgordon.info>
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
 .../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(-)

diff --git a/apps/bitmaps/native/default_icons.6x8x16.bmp b/apps/bitmaps/native/default_icons.6x8x16.bmp
index 601c4f95a617434386b6c0fee4868e116f34ea30..8cc45c78550aa15cc93dea3b03b069063b5b32e9 100755
GIT binary patch
literal 5174
zcmc(dO?KNb5QE)KmtA$yBlHA0K=-|M@0Egp0D%%^=g03Q&!L7NF$0*^pT93ZZ~S|~
z`Wye>$L`zs{2JBmhVy?v^e=F`z206AA2C56g0+gf*5R<2#BOMh&*&T>zOjKh{XKnT
zof)?Lw62)T@x(uSSIoz)+a~Y#lkb}eh&P6&O9faIJ`}?aCo3lCd{%5!TdpqSYcS^S
zqc@LduzeJ>JH_x@+^N*%yUKTBD~~V~oX6)zAFxfeWzD^ud<%?;!)X8M>>-gxvW8B(
zTE+T+?*?b=vU_Y-jVTwIB`TZFV%*FD4vhG~*xu|k&tP=(t_n0mO@lD+gyqq_buZ~H
z7O7d!Ba<S%@6CtyRqu%j80W6a{esCLx(E3xPVO0|9&+~JJjZ&Zs}%V?#8$pJsm$f1
zd;-SFSNI()DQccl7~m=23KupC|D5%1lr)*2ryG|3@Ohmtrn64%W*O$<;{K?A+q)~N
z*Sq;Ff_ZdvJ}8{5-=P(Ylv6Wr<?$J|%BOia@%Lakl*P33$y4$T2fl^&RS>W7Sn0&r
z4xPsg$`dh`0$4S#*#ln(K})iPd0v5dh}r4TOMGBxIL+gbvyNFbx@@2eD_@s6j4tY$
z7j-cvQ+s-6Upw#JXy0C)W~gVZd14aUw;Asxy(=Bm{9v9M4MrDP0Wmeynk<ppw?y#y
z!g)#N0$~^@D?xS%UKq@~Yh6w#&6pH5VJ@R6n+rBKVyBi~&2(5J1IVx(KK_m5p+ht8
z<kvgYYN*vLx{NFlN}v0=0k(_vI`?|l3f1!kSQooA@MPXe9CmNsL4>WpPoI?gTvDG4
zn9q9mCS5zKzL&*{wwY_0f~D}hlkPN3V8+dSvSON!lS5IiJd6SdnlnW`FsZGpS);5`
zDOpJ0>!EYownDXa*tyKJ)i%HAiu6(!g(n;UwlqFqhiPnvXRuiS3bF=d2XM(W-E;L^
z^?sqQ!|{74i&9pu#Qrdo6FqFycOQckYN#J5ZGJ<XMF%-%5thPT04HXzk;uB4{RdVj
B8HNA=

literal 5174
zcmc&yNpciH5Nlt2<m3ZS@C*C^?);j6nJj6fQElBb4hImXN~P42wE6Y><L$tok2>G$
z?`wO#w4a|19Y@Xo{NP^_$MJc54nN>H_C)HWLsvAVy6Y8|jQO%ILYS_kR;^t&T)zvq
z4bITPW+FIX=-8O2zCmOZq#{AgJp@;;Nk@(rVY>_zNdh`UgK3x0x%XL4&G&z2d@iP1
zA`l&3?u?T!JIob;mpAh+xXGJaC}G2Gyrkt#QQ(Xe{U|5B?=<$kIk8;7{2B&Vu=jd)
zt#ge$Cg9B%ao-hOZUL_eiCCeTf8iUQY1+2EO!s-F^8(m`mWfkcyP@k9!?;(_LJnsg
z!;ki(NF5aEwd}P)304;vxm6xH#{if!h@?oh3thP%iD%DM9#?PyB;@kMekH=#wW%PM
z;`?+iV>^O3y)NZ^{Y^9P3@f8)gmupxCz|K$n&TFsBVk(K)O1PjJ2f`Egg!MhQQ%q5
zi^v;|tr~eN4zuPiARVDk%}iYATADn%SKgJ59PPk1da?jm=+0m4=g5_=FO6Wk?mf3}
z#))X_f*!bfuD=U2!l=;JWITasxJoEj=mI*fckz{{0(#E5rV&`L44ya*_qxcV$ONAG
zB39&dr*s;MNYTH{+w>M)oAHbl$@Tm7FS|&u5|HPyfoi7PiU`|qD{pZ$%C5W7#&D7V
zXJ~*J%$k<8ZoSx)FB?$6L!5OzZKdYAZ>6x4%hR?Fq=HzVqhv*dc#vXZ?o8(xgZ{fP
zWX(lxLMF+WlO8{$V@#fByF6N2i?AIVtz2%5oy|?&ev&U@h1h7IN!{RbQ22tQTDr(;
zkVBA$0MzF>IB(BX5KC7tLEouX`Nn1GR%eA02BMxQ9%wC-w79xWi!)IGToT|0V#_gI
zxx822|ESC5@bBO*+%op^+F$0_gbo$uw|9X74e<-IP5(o*3kMzpm@|;8h>25I+eo^e
F`wQaT25$fW

diff --git a/apps/plugins/bitmaps/viewer_defaults/viewers.6x8x16.bmp b/apps/plugins/bitmaps/viewer_defaults/viewers.6x8x16.bmp
index 1760e66d43ab60b2954a9d35eccf6e564a24dd13..9b039b12174d40abc83ea28de1d36257bf8609ec 100644
GIT binary patch
literal 2134
zcmd5)F;c`Z5Hk(K3>_6EB`@Fs^t8Nz|9>E-tSm*G<1m3MU=n++)k<=X_m9tqR)23;
zU-91K{la_Kp0T#}g8tJZ-vY2KZMk}YT_MZL1IC65&g#Uz^#Y#EcD2pSvl|5Cfp!vO
z5UqdIlgt{b>eOQsfh)7A!9(e%cs{AXtV$QwbLYr|0-#or`6O)*0V`QG_C9%h5Aw_A
zr+k!*%ruBunRn-&z0+#Tdvv`2@9MP1);+9u7GqROmPq<aHSZf3r-oU>gC06J#UcyK
zy)5Vm_T2<v2gXyZ#N4QkzrjRLY<mcx2TyCQG+W6Zk~}iVDyn@4OiCOdeQ~w$5PO1A
zJy!c-5OA%)g2DO(7D|VDgNw7+9f8E+ULEs{-H7+ySI!$c{m!PKP!^06u7dX%Fax6U
dZh+%Cf#q1$liB~o+sm?t@r$riweR*T>;mrs-H`wQ

literal 2134
zcmc&xK~BU#3>z*8i5n-59C-l`;Lepd@c$3&X5!lQWLnxvNL15I;y8}G`}y_#)bja=
z_#W?Lyg%_iwAYBOy+!}!8E*m+ZtYeMJJSuGW^&f5E=4_uQ)ik@w1i^B^t{6zr!W{%
zyfo_z(u-tJWfTcbVxls^NK|-ANqGA%<llBg4{Rp5J#xnmX8wW^6(SR1N{q2Jd&~=l
zpYcC}q+tYTXsxknq+Y^E?vilC8<k<$DtI+fX4SA+rt^+qv+2^OFdHC$_7WX9%4CZt
z!(#%f#?xmo1Y`mdVCJ|zuHU$PY&3~wy1;1wfFy0>h-m>}(?f@1;t?)Dlu4Ze8XhOg
zCBT(-mxf~W${BwHP`DaYtEBLEJgRqVyZ+94PK~ap#8P6sm(5v5DCfKveSsxKEO%I2
V>3{KL;2?oNkeKuCD0ALN*d276(|-T}

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;