aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/gdisp/QImage
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/gdisp/QImage')
-rw-r--r--drivers/gdisp/QImage/gdisp_lld_driver.c2
-rw-r--r--drivers/gdisp/QImage/gdisp_lld_qimage.cpp4
-rw-r--r--drivers/gdisp/QImage/gdisp_lld_qimage.h2
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
}