From dcc52f581cdd503e37f78fe917532b759077845f Mon Sep 17 00:00:00 2001 From: Karl Kurbjun Date: Sat, 7 Nov 2009 18:48:35 +0000 Subject: Fix two width calculations git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23552 a1c6a512-1295-4272-9138-f99709370657 --- firmware/drivers/lcd-1bit-vert.c | 3 +-- firmware/drivers/lcd-2bit-vi.c | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) (limited to 'firmware') diff --git a/firmware/drivers/lcd-1bit-vert.c b/firmware/drivers/lcd-1bit-vert.c index ae7cddb19a..051861616f 100644 --- a/firmware/drivers/lcd-1bit-vert.c +++ b/firmware/drivers/lcd-1bit-vert.c @@ -404,11 +404,10 @@ void LCDFN(hline)(int x1, int x2, int y) /* adjust to viewport */ x1 += current_vp->x; + x2 += current_vp->x; y += current_vp->y; #if defined(HAVE_VIEWPORT_CLIP) - x2 += current_vp->x; - /********************* Viewport on screen clipping ********************/ /* nothing to draw? */ if (((unsigned)y >= (unsigned) LCDM(HEIGHT)) || (x1 >= LCDM(WIDTH)) diff --git a/firmware/drivers/lcd-2bit-vi.c b/firmware/drivers/lcd-2bit-vi.c index 5edb588ce0..853cd88f54 100644 --- a/firmware/drivers/lcd-2bit-vi.c +++ b/firmware/drivers/lcd-2bit-vi.c @@ -594,11 +594,10 @@ void LCDFN(hline)(int x1, int x2, int y) /* adjust x1 and y to viewport */ x1 += current_vp->x; + x2 += current_vp->x; y += current_vp->y; #if defined(HAVE_VIEWPORT_CLIP) - x2 += current_vp->x; - /********************* Viewport on screen clipping ********************/ /* nothing to draw? */ if (((unsigned)y >= (unsigned) LCDM(HEIGHT)) || (x1 >= LCDM(WIDTH)) -- cgit v1.2.3