diff options
author | inmarket <andrewh@inmarket.com.au> | 2018-07-08 11:19:43 +1000 |
---|---|---|
committer | inmarket <andrewh@inmarket.com.au> | 2018-07-08 11:19:43 +1000 |
commit | f9c848e9851713d7a33962b9b4768c0a0d1751f1 (patch) | |
tree | 2b2caf1949078428ca3fd3cd47547d0485efa407 /drivers/gdisp/QImage | |
parent | cfb1b2a488d5b1a9e14c889b80e5324d16f63f1b (diff) | |
download | uGFX-f9c848e9851713d7a33962b9b4768c0a0d1751f1.tar.gz uGFX-f9c848e9851713d7a33962b9b4768c0a0d1751f1.tar.bz2 uGFX-f9c848e9851713d7a33962b9b4768c0a0d1751f1.zip |
Change color_t to gColor
Diffstat (limited to 'drivers/gdisp/QImage')
-rw-r--r-- | drivers/gdisp/QImage/gdisp_lld_driver.c | 2 | ||||
-rw-r--r-- | drivers/gdisp/QImage/gdisp_lld_qimage.cpp | 4 | ||||
-rw-r--r-- | drivers/gdisp/QImage/gdisp_lld_qimage.h | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/drivers/gdisp/QImage/gdisp_lld_driver.c b/drivers/gdisp/QImage/gdisp_lld_driver.c index a93d1761..02128bd4 100644 --- a/drivers/gdisp/QImage/gdisp_lld_driver.c +++ b/drivers/gdisp/QImage/gdisp_lld_driver.c @@ -55,7 +55,7 @@ LLDSPEC gBool gdisp_lld_init(GDisplay *g) #endif #if GDISP_HARDWARE_PIXELREAD - color_t gdisp_lld_get_pixel_color(GDisplay *g) + gColor gdisp_lld_get_pixel_color(GDisplay *g) { return qimage_getPixel(g); } diff --git a/drivers/gdisp/QImage/gdisp_lld_qimage.cpp b/drivers/gdisp/QImage/gdisp_lld_qimage.cpp index 2d2876f0..f43ba850 100644 --- a/drivers/gdisp/QImage/gdisp_lld_qimage.cpp +++ b/drivers/gdisp/QImage/gdisp_lld_qimage.cpp @@ -27,12 +27,12 @@ void qimage_setPixel(GDisplay* g) qimage->setPixel(g->p.x, g->p.y, rgbVal); } -color_t qimage_getPixel(GDisplay* g) +gColor qimage_getPixel(GDisplay* g) { const QImage* qimage = static_cast<const QImage*>(g->priv); if (!qimage) { return 0; } - return static_cast<color_t>(qimage->pixel(g->p.x, g->p.y)); + return static_cast<gColor>(qimage->pixel(g->p.x, g->p.y)); } diff --git a/drivers/gdisp/QImage/gdisp_lld_qimage.h b/drivers/gdisp/QImage/gdisp_lld_qimage.h index b8b0d9c9..5e6aea1f 100644 --- a/drivers/gdisp/QImage/gdisp_lld_qimage.h +++ b/drivers/gdisp/QImage/gdisp_lld_qimage.h @@ -9,7 +9,7 @@ extern "C" { gBool qimage_init(GDisplay* g, gCoord width, gCoord height); void qimage_setPixel(GDisplay* g); -color_t qimage_getPixel(GDisplay* g); +gColor qimage_getPixel(GDisplay* g); #ifdef __cplusplus } |