diff options
| author | inmarket <andrewh@inmarket.com.au> | 2015-07-08 22:30:39 +1000 |
|---|---|---|
| committer | inmarket <andrewh@inmarket.com.au> | 2015-07-08 22:30:39 +1000 |
| commit | 732bccb57a0ea4e40eab157d9cf6fd88d2ff0d4c (patch) | |
| tree | 4095dc75a099f7f4e9eb825c47b83250d1d80442 /src/gdisp/gdisp.c | |
| parent | ac231c558c7c9758c487f5407017d406299c49cb (diff) | |
| parent | ed75f5e8c34051942531bfe96c9827978796320e (diff) | |
| download | uGFX-732bccb57a0ea4e40eab157d9cf6fd88d2ff0d4c.tar.gz uGFX-732bccb57a0ea4e40eab157d9cf6fd88d2ff0d4c.tar.bz2 uGFX-732bccb57a0ea4e40eab157d9cf6fd88d2ff0d4c.zip | |
Merge branch 'master' into STM32F7_Discovery
Diffstat (limited to 'src/gdisp/gdisp.c')
| -rw-r--r-- | src/gdisp/gdisp.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gdisp/gdisp.c b/src/gdisp/gdisp.c index 86931952..377ccddb 100644 --- a/src/gdisp/gdisp.c +++ b/src/gdisp/gdisp.c @@ -1259,7 +1259,7 @@ void gdispGBlitArea(GDisplay *g, coord_t x, coord_t y, coord_t cx, coord_t cy, c { if (x < 0) { cx += x; x = 0; } if (y < 0) { cy += y; y = 0; } - if (cx <= 0 || cy <= 0 || x >= g->g.Width || y >= g->g.Height) { MUTEX_EXIT(g); return; } + if (cx <= 0 || cy <= 0 || x >= g->g.Width || y >= g->g.Height) { x = y = cx = cy = 0; } g->clipx0 = x; g->clipy0 = y; g->clipx1 = x+cx; if (g->clipx1 > g->g.Width) g->clipx1 = g->g.Width; |