summaryrefslogtreecommitdiffstats
path: root/firmware/drivers/lcd-16bit.c
diff options
context:
space:
mode:
authorJens Arnold <amiconn@rockbox.org>2009-10-26 01:55:19 +0000
committerJens Arnold <amiconn@rockbox.org>2009-10-26 01:55:19 +0000
commit17d7f023b724d1ddb8f5e3388318ea6a1c98d707 (patch)
tree753c007fccc10598fa7bc6f2a21eee7d3a417307 /firmware/drivers/lcd-16bit.c
parent78c956d73b0318e68245bacfda0d3b6561cbac42 (diff)
downloadrockbox-17d7f023b724d1ddb8f5e3388318ea6a1c98d707.tar.gz
rockbox-17d7f023b724d1ddb8f5e3388318ea6a1c98d707.zip
Save one branch for archs without conditional execution (e.g. coldfire).
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23355 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'firmware/drivers/lcd-16bit.c')
-rw-r--r--firmware/drivers/lcd-16bit.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/firmware/drivers/lcd-16bit.c b/firmware/drivers/lcd-16bit.c
index 9dd5beb860..6d6a3b2104 100644
--- a/firmware/drivers/lcd-16bit.c
+++ b/firmware/drivers/lcd-16bit.c
@@ -907,9 +907,8 @@ void ICODE_ATTR lcd_bitmap_transparent_part(const fb_data *src, int src_x,
if (data != TRANSPARENT_COLOR)
{
if (data == REPLACEWITHFG_COLOR)
- *dst_row = fg;
- else
- *dst_row = data;
+ data = fg;
+ *dst_row = data;
}
}
while (++dst_row < row_end);