forked from len0rd/rockbox
Fix two width calculations
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23552 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
parent
765ff0130a
commit
dcc52f581c
2 changed files with 2 additions and 4 deletions
|
@ -404,11 +404,10 @@ void LCDFN(hline)(int x1, int x2, int y)
|
||||||
|
|
||||||
/* adjust to viewport */
|
/* adjust to viewport */
|
||||||
x1 += current_vp->x;
|
x1 += current_vp->x;
|
||||||
|
x2 += current_vp->x;
|
||||||
y += current_vp->y;
|
y += current_vp->y;
|
||||||
|
|
||||||
#if defined(HAVE_VIEWPORT_CLIP)
|
#if defined(HAVE_VIEWPORT_CLIP)
|
||||||
x2 += current_vp->x;
|
|
||||||
|
|
||||||
/********************* Viewport on screen clipping ********************/
|
/********************* Viewport on screen clipping ********************/
|
||||||
/* nothing to draw? */
|
/* nothing to draw? */
|
||||||
if (((unsigned)y >= (unsigned) LCDM(HEIGHT)) || (x1 >= LCDM(WIDTH))
|
if (((unsigned)y >= (unsigned) LCDM(HEIGHT)) || (x1 >= LCDM(WIDTH))
|
||||||
|
|
|
@ -594,11 +594,10 @@ void LCDFN(hline)(int x1, int x2, int y)
|
||||||
|
|
||||||
/* adjust x1 and y to viewport */
|
/* adjust x1 and y to viewport */
|
||||||
x1 += current_vp->x;
|
x1 += current_vp->x;
|
||||||
|
x2 += current_vp->x;
|
||||||
y += current_vp->y;
|
y += current_vp->y;
|
||||||
|
|
||||||
#if defined(HAVE_VIEWPORT_CLIP)
|
#if defined(HAVE_VIEWPORT_CLIP)
|
||||||
x2 += current_vp->x;
|
|
||||||
|
|
||||||
/********************* Viewport on screen clipping ********************/
|
/********************* Viewport on screen clipping ********************/
|
||||||
/* nothing to draw? */
|
/* nothing to draw? */
|
||||||
if (((unsigned)y >= (unsigned) LCDM(HEIGHT)) || (x1 >= LCDM(WIDTH))
|
if (((unsigned)y >= (unsigned) LCDM(HEIGHT)) || (x1 >= LCDM(WIDTH))
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue