diff options
| author | Joel Bodenmann <joel@unormal.org> | 2015-02-16 19:10:35 +0100 |
|---|---|---|
| committer | Joel Bodenmann <joel@unormal.org> | 2015-02-16 19:10:35 +0100 |
| commit | 6132b7f349fa69df02a999d00dcd260c04511aef (patch) | |
| tree | 7b08db7fdd931e4df9b92076a0474b1456b1cdfe /src/gdisp | |
| parent | 7e773a2a4c5e4bd54b8a9a486c2afd6e9f10dae0 (diff) | |
| parent | 50cbdbc288b5429423fe198958dc495aa4fbe844 (diff) | |
| download | uGFX-6132b7f349fa69df02a999d00dcd260c04511aef.tar.gz uGFX-6132b7f349fa69df02a999d00dcd260c04511aef.tar.bz2 uGFX-6132b7f349fa69df02a999d00dcd260c04511aef.zip | |
Merge branch 'master' of https://bitbucket.org/Tectu/ugfx
Diffstat (limited to 'src/gdisp')
| -rw-r--r-- | src/gdisp/gdisp.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/src/gdisp/gdisp.c b/src/gdisp/gdisp.c index 639581b0..f245633a 100644 --- a/src/gdisp/gdisp.c +++ b/src/gdisp/gdisp.c @@ -2829,6 +2829,11 @@ void gdispGDrawBox(GDisplay *g, coord_t x, coord_t y, coord_t cx, coord_t cy, co lk = (FIXED(lpnt->x) - lx) / (lpnt->y - y); rk = (FIXED(rpnt->x) - rx) / (rpnt->y - y); + // Add error correction for rounding + lx += FIXED0_5; + rx += FIXED0_5; + + // Do all the line segments MUTEX_ENTER(g); g->p.color = color; while(1) { @@ -2873,6 +2878,7 @@ void gdispGDrawBox(GDisplay *g, coord_t x, coord_t y, coord_t cx, coord_t cy, co lpnt = lpnt <= pntarray ? epnts : lpnt-1; } lk = (FIXED(lpnt->x) - lx) / (lpnt->y - y); + lx += FIXED0_5; } else { for (rpnt = rpnt >= epnts ? pntarray : rpnt+1; rpnt->y == y; cnt--) { if (!cnt) { @@ -2884,6 +2890,7 @@ void gdispGDrawBox(GDisplay *g, coord_t x, coord_t y, coord_t cx, coord_t cy, co rpnt = rpnt >= epnts ? pntarray : rpnt+1; } rk = (FIXED(rpnt->x) - rx) / (rpnt->y - y); + rx += FIXED0_5; } } } |