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 /src/gdisp/gdisp_pixmap.c | |
parent | cfb1b2a488d5b1a9e14c889b80e5324d16f63f1b (diff) | |
download | uGFX-f9c848e9851713d7a33962b9b4768c0a0d1751f1.tar.gz uGFX-f9c848e9851713d7a33962b9b4768c0a0d1751f1.tar.bz2 uGFX-f9c848e9851713d7a33962b9b4768c0a0d1751f1.zip |
Change color_t to gColor
Diffstat (limited to 'src/gdisp/gdisp_pixmap.c')
-rw-r--r-- | src/gdisp/gdisp_pixmap.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/gdisp/gdisp_pixmap.c b/src/gdisp/gdisp_pixmap.c index 9f59ce40..8fbccad4 100644 --- a/src/gdisp/gdisp_pixmap.c +++ b/src/gdisp/gdisp_pixmap.c @@ -46,7 +46,7 @@ typedef struct pixmap { #if GDISP_NEED_PIXMAP_IMAGE uint8_t imghdr[8]; // This field must come just before the data member. #endif - color_t pixels[1]; // We really want pixels[0] but some compilers don't allow that even though it is C standard. + gColor pixels[1]; // We really want pixels[0] but some compilers don't allow that even though it is C standard. } pixmap; GDisplay *gdispPixmapCreate(gCoord width, gCoord height) { @@ -55,7 +55,7 @@ GDisplay *gdispPixmapCreate(gCoord width, gCoord height) { unsigned i; // Calculate the size of the display surface in bytes - i = width*height*sizeof(color_t); + i = width*height*sizeof(gColor); if (i < 2*sizeof(gCoord)) i = 2*sizeof(gCoord); @@ -159,7 +159,7 @@ LLDSPEC void gdisp_lld_draw_pixel(GDisplay *g) { ((pixmap *)(g)->priv)->pixels[pos] = g->p.color; } -LLDSPEC color_t gdisp_lld_get_pixel_color(GDisplay *g) { +LLDSPEC gColor gdisp_lld_get_pixel_color(GDisplay *g) { unsigned pos; #if GDISP_NEED_CONTROL |