aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJoel Bodenmann <joel.bodenmann@simulton.com>2019-05-01 16:54:39 +0200
committerJoel Bodenmann <joel.bodenmann@simulton.com>2019-05-01 16:54:39 +0200
commitac4b7fc8b4ebfe080b6f3f6d90a1fe15221144cc (patch)
tree79d5248c804acca383f01038e9322802d80ccbc2
parent785047b0aa1d43d5f33ae69d7e0ed708df6db0bd (diff)
downloaduGFX-ac4b7fc8b4ebfe080b6f3f6d90a1fe15221144cc.tar.gz
uGFX-ac4b7fc8b4ebfe080b6f3f6d90a1fe15221144cc.tar.bz2
uGFX-ac4b7fc8b4ebfe080b6f3f6d90a1fe15221144cc.zip
Typedef gImage compatibility only when GDISP_NEED_IMAGE is GFXON
-rw-r--r--src/gdisp/gdisp.h4
1 files changed, 3 insertions, 1 deletions
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 */