summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDave Chapman <dave@dchapman.com>2006-08-12 09:07:07 +0000
committerDave Chapman <dave@dchapman.com>2006-08-12 09:07:07 +0000
commit95b2781aff0a8991256ea1ce580d0ec83cccbb63 (patch)
tree65cfccbfaf8352e27832e19f4e0eff5071bf321f
parentc0b99f2e8b149469a5d9e510ec38fa1e719ee8ce (diff)
downloadrockbox-95b2781aff0a8991256ea1ce580d0ec83cccbb63.tar.gz
rockbox-95b2781aff0a8991256ea1ce580d0ec83cccbb63.zip
Remove unneeded and unwanted parameter checking from lcd_yuv_blit() - bring the ipod Color/Nano implementation in line with other targets
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@10538 a1c6a512-1295-4272-9138-f99709370657
-rw-r--r--firmware/drivers/lcd-ipod.c25
1 files changed, 2 insertions, 23 deletions
diff --git a/firmware/drivers/lcd-ipod.c b/firmware/drivers/lcd-ipod.c
index 7f881c529d..9be61f3134 100644
--- a/firmware/drivers/lcd-ipod.c
+++ b/firmware/drivers/lcd-ipod.c
@@ -418,31 +418,10 @@ void lcd_yuv_blit(unsigned char * const src[3],
int src_x, int src_y, int stride,
int x, int y, int width, int height)
{
- int y0, x0, y1, x1;
int h;
+ int y0, x0, y1, x1;
- /* nothing to draw? */
- if ((width <= 0) || (height <= 0) || (x >= LCD_WIDTH) || (y >= LCD_HEIGHT)
- || (x + width <= 0) || (y + height <= 0))
- return;
-
- /* clipping */
- if (x < 0)
- {
- width += x;
- src_x -= x;
- x = 0;
- }
- if (y < 0)
- {
- height += y;
- src_y -= y;
- y = 0;
- }
- if (x + width > LCD_WIDTH)
- width = LCD_WIDTH - x;
- if (y + height > LCD_HEIGHT)
- height = LCD_HEIGHT - y;
+ width = (width + 1) & ~1;
/* calculate the drawing region */
#if CONFIG_LCD == LCD_IPODNANO