From 785047b0aa1d43d5f33ae69d7e0ed708df6db0bd Mon Sep 17 00:00:00 2001 From: Joel Bodenmann Date: Wed, 10 Apr 2019 17:33:15 +0200 Subject: Introduce type gImage to replace v2.x gdispImage --- src/gdisp/gdisp.h | 1 + 1 file changed, 1 insertion(+) (limited to 'src/gdisp/gdisp.h') diff --git a/src/gdisp/gdisp.h b/src/gdisp/gdisp.h index dffde4aa..d0dcbb19 100644 --- a/src/gdisp/gdisp.h +++ b/src/gdisp/gdisp.h @@ -1235,6 +1235,7 @@ void gdispGDrawBox(GDisplay *g, gCoord x, gCoord y, gCoord cx, gCoord cy, gColor typedef gPixel pixel_t; typedef gCoord coord_t; typedef gPoint point, point_t; + typedef gImage gdispImage; typedef gFont font_t; typedef gPowermode powermode_t; #define powerOff gPowerOff -- cgit v1.2.3 From ac4b7fc8b4ebfe080b6f3f6d90a1fe15221144cc Mon Sep 17 00:00:00 2001 From: Joel Bodenmann Date: Wed, 1 May 2019 16:54:39 +0200 Subject: Typedef gImage compatibility only when GDISP_NEED_IMAGE is GFXON --- src/gdisp/gdisp.h | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'src/gdisp/gdisp.h') diff --git a/src/gdisp/gdisp.h b/src/gdisp/gdisp.h index d0dcbb19..87635bf8 100644 --- a/src/gdisp/gdisp.h +++ b/src/gdisp/gdisp.h @@ -1235,7 +1235,6 @@ void gdispGDrawBox(GDisplay *g, gCoord x, gCoord y, gCoord cx, gCoord cy, gColor typedef gPixel pixel_t; typedef gCoord coord_t; typedef gPoint point, point_t; - typedef gImage gdispImage; typedef gFont font_t; typedef gPowermode powermode_t; #define powerOff gPowerOff @@ -1271,6 +1270,9 @@ void gdispGDrawBox(GDisplay *g, gCoord x, gCoord y, gCoord cx, gCoord cy, gColor #define fontMaxWidth gFontMaxWidth #define fontBaselineX gFontBaselineX #define fontBaselineY gFontBaselineY + #if GDISP_NEED_IMAGE || defined(__DOXYGEN__) + typedef gImage gdispImage; + #endif #endif #endif /* GFX_USE_GDISP */ -- cgit v1.2.3