diff options
| author | inmarket <andrewh@inmarket.com.au> | 2018-07-08 11:08:55 +1000 |
|---|---|---|
| committer | inmarket <andrewh@inmarket.com.au> | 2018-07-08 11:08:55 +1000 |
| commit | cfb1b2a488d5b1a9e14c889b80e5324d16f63f1b (patch) | |
| tree | 08ffe293a154f08325bca487ba73de1843e94ba5 /src/gwin | |
| parent | 2ab2d77fcba42467b62f2be732cb8dc00510fe19 (diff) | |
| download | uGFX-cfb1b2a488d5b1a9e14c889b80e5324d16f63f1b.tar.gz uGFX-cfb1b2a488d5b1a9e14c889b80e5324d16f63f1b.tar.bz2 uGFX-cfb1b2a488d5b1a9e14c889b80e5324d16f63f1b.zip | |
Change pixel_t to gPixel
Diffstat (limited to 'src/gwin')
| -rw-r--r-- | src/gwin/gwin.c | 2 | ||||
| -rw-r--r-- | src/gwin/gwin.h | 2 | ||||
| -rw-r--r-- | src/gwin/gwin_gl3d.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/gwin/gwin.c b/src/gwin/gwin.c index 8b093851..00b2557d 100644 --- a/src/gwin/gwin.c +++ b/src/gwin/gwin.c @@ -261,7 +261,7 @@ void gwinFillArea(GHandle gh, gCoord x, gCoord y, gCoord cx, gCoord cy) { _gwinDrawEnd(gh); } -void gwinBlitArea(GHandle gh, gCoord x, gCoord y, gCoord cx, gCoord cy, gCoord srcx, gCoord srcy, gCoord srccx, const pixel_t *buffer) { +void gwinBlitArea(GHandle gh, gCoord x, gCoord y, gCoord cx, gCoord cy, gCoord srcx, gCoord srcy, gCoord srccx, const gPixel *buffer) { if (!_gwinDrawStart(gh)) return; gdispGBlitArea(gh->display, gh->x+x, gh->y+y, cx, cy, srcx, srcy, srccx, buffer); _gwinDrawEnd(gh); diff --git a/src/gwin/gwin.h b/src/gwin/gwin.h index c27aadc3..2ab50fd9 100644 --- a/src/gwin/gwin.h +++ b/src/gwin/gwin.h @@ -680,7 +680,7 @@ void gwinFillArea(GHandle gh, gCoord x, gCoord y, gCoord cx, gCoord cy); * * @api */ -void gwinBlitArea(GHandle gh, gCoord x, gCoord y, gCoord cx, gCoord cy, gCoord srcx, gCoord srcy, gCoord srccx, const pixel_t *buffer); +void gwinBlitArea(GHandle gh, gCoord x, gCoord y, gCoord cx, gCoord cy, gCoord srcx, gCoord srcy, gCoord srccx, const gPixel *buffer); /*------------------------------------------------- * Circle, ellipse, arc and arc-sectors functions diff --git a/src/gwin/gwin_gl3d.c b/src/gwin/gwin_gl3d.c index 4c3f0f7f..2c2861e2 100644 --- a/src/gwin/gwin_gl3d.c +++ b/src/gwin/gwin_gl3d.c @@ -86,7 +86,7 @@ static void gl3dRedraw(GWindowObject *gh) { ZBuffer * zb; zb = ((GGL3DObject *)gh)->glcxt->zb; - gdispGBlitArea(gh->display, gh->x, gh->y, zb->xsize, zb->ysize, 0, 0, zb->linesize/sizeof(color_t), (const pixel_t *)zb->pbuf); + gdispGBlitArea(gh->display, gh->x, gh->y, zb->xsize, zb->ysize, 0, 0, zb->linesize/sizeof(color_t), (const gPixel *)zb->pbuf); } static int gl3dResizeGLViewport(GLContext *c, int *xsize_ptr, int *ysize_ptr) { |