diff options
| author | Joel Bodenmann <joel@unormal.org> | 2014-10-26 14:58:05 +0100 |
|---|---|---|
| committer | Joel Bodenmann <joel@unormal.org> | 2014-10-26 14:58:05 +0100 |
| commit | eb84c817a25d05f33bf78ed1b291ee4fdf3a7bb1 (patch) | |
| tree | 4e23474f9949d041b3a2634a1e2138dca5b07d11 /src | |
| parent | 4e2894cbd89475d26d589c74eada070ef18cf5c4 (diff) | |
| parent | e5ce8486cde13cf9d2c5e07d0969bf8757d680bd (diff) | |
| download | uGFX-eb84c817a25d05f33bf78ed1b291ee4fdf3a7bb1.tar.gz uGFX-eb84c817a25d05f33bf78ed1b291ee4fdf3a7bb1.tar.bz2 uGFX-eb84c817a25d05f33bf78ed1b291ee4fdf3a7bb1.zip | |
Merge branch 'master' into newmouse
Diffstat (limited to 'src')
| -rw-r--r-- | src/gwin/gwin_gwin.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gwin/gwin_gwin.c b/src/gwin/gwin_gwin.c index a4cef125..26e23f32 100644 --- a/src/gwin/gwin_gwin.c +++ b/src/gwin/gwin_gwin.c @@ -301,7 +301,7 @@ void gwinBlitArea(GHandle gh, coord_t x, coord_t y, coord_t cx, coord_t cy, coor #if GDISP_NEED_PIXELREAD color_t gwinGetPixelColor(GHandle gh, coord_t x, coord_t y) { - if (!_gwinDrawStart(gh)) return; + if (!_gwinDrawStart(gh)) return (color_t)0; return gdispGGetPixelColor(gh->display, gh->x+x, gh->y+y); _gwinDrawEnd(gh); } |