From 17d7f023b724d1ddb8f5e3388318ea6a1c98d707 Mon Sep 17 00:00:00 2001 From: Jens Arnold Date: Mon, 26 Oct 2009 01:55:19 +0000 Subject: [PATCH] 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 --- firmware/drivers/lcd-16bit.c | 5 ++--- 1 file 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);