From cfb1b2a488d5b1a9e14c889b80e5324d16f63f1b Mon Sep 17 00:00:00 2001 From: inmarket Date: Sun, 8 Jul 2018 11:08:55 +1000 Subject: Change pixel_t to gPixel --- src/gdisp/gdisp.c | 4 ++-- src/gdisp/gdisp.h | 5 +++-- src/gdisp/gdisp_driver.h | 2 +- src/gdisp/gdisp_image_bmp.c | 12 ++++++------ src/gdisp/gdisp_image_gif.c | 4 ++-- src/gdisp/gdisp_image_jpg.c | 8 ++++---- src/gdisp/gdisp_image_native.c | 18 +++++++++--------- src/gdisp/gdisp_image_png.c | 2 +- src/gdisp/gdisp_pixmap.c | 2 +- src/gdisp/gdisp_pixmap.h | 2 +- src/gwin/gwin.c | 2 +- src/gwin/gwin.h | 2 +- src/gwin/gwin_gl3d.c | 2 +- 13 files changed, 33 insertions(+), 32 deletions(-) (limited to 'src') diff --git a/src/gdisp/gdisp.c b/src/gdisp/gdisp.c index 96e425fd..60c54b4f 100644 --- a/src/gdisp/gdisp.c +++ b/src/gdisp/gdisp.c @@ -1097,7 +1097,7 @@ void gdispGFillArea(GDisplay *g, gCoord x, gCoord y, gCoord cx, gCoord cy, color MUTEX_EXIT(g); } -void gdispGBlitArea(GDisplay *g, gCoord x, gCoord y, gCoord cx, gCoord cy, gCoord srcx, gCoord srcy, gCoord srccx, const pixel_t *buffer) { +void gdispGBlitArea(GDisplay *g, gCoord x, gCoord y, gCoord cx, gCoord cy, gCoord srcx, gCoord srcy, gCoord srccx, const gPixel *buffer) { MUTEX_ENTER(g); #if NEED_CLIPPING @@ -3732,7 +3732,7 @@ color_t gdispContrastColor(color_t color) { } #if (!defined(gdispPackPixels) && !defined(GDISP_PIXELFORMAT_CUSTOM)) - void gdispPackPixels(pixel_t *buf, gCoord cx, gCoord x, gCoord y, color_t color) { + void gdispPackPixels(gPixel *buf, gCoord cx, gCoord x, gCoord y, color_t color) { /* No mutex required as we only read static data */ #if defined(GDISP_PIXELFORMAT_RGB888) #error "GDISP: Packed pixels not supported yet" diff --git a/src/gdisp/gdisp.h b/src/gdisp/gdisp.h index 3a92d784..1af38afe 100644 --- a/src/gdisp/gdisp.h +++ b/src/gdisp/gdisp.h @@ -223,7 +223,7 @@ extern GDisplay *GDISP; /** * @brief The type of a pixel. */ -typedef color_t pixel_t; +typedef color_t gPixel; /* Color Utility Functions */ @@ -452,7 +452,7 @@ void gdispGFillArea(GDisplay *g, gCoord x, gCoord y, gCoord cx, gCoord cy, color * * @api */ -void gdispGBlitArea(GDisplay *g, gCoord x, gCoord y, gCoord cx, gCoord cy, gCoord srcx, gCoord srcy, gCoord srccx, const pixel_t *buffer); +void gdispGBlitArea(GDisplay *g, gCoord x, gCoord y, gCoord cx, gCoord cy, gCoord srcx, gCoord srcy, gCoord srccx, const gPixel *buffer); #define gdispBlitAreaEx(x,y,cx,cy,sx,sy,rx,b) gdispGBlitArea(GDISP,x,y,cx,cy,sx,sy,rx,b) /** @@ -1230,6 +1230,7 @@ void gdispGDrawBox(GDisplay *g, gCoord x, gCoord y, gCoord cx, gCoord cy, color_ /* V2 compatibility */ #if GFX_COMPAT_V2 + typedef gPixel pixel_t; typedef gCoord coord_t; typedef gPoint point, point_t; #endif diff --git a/src/gdisp/gdisp_driver.h b/src/gdisp/gdisp_driver.h index 1b6b89d6..863d4c0c 100644 --- a/src/gdisp/gdisp_driver.h +++ b/src/gdisp/gdisp_driver.h @@ -308,7 +308,7 @@ * * @api */ - void gdispPackPixels(const pixel_t *buf, gCoord cx, gCoord x, gCoord y, color_t color); + void gdispPackPixels(const gPixel *buf, gCoord cx, gCoord x, gCoord y, color_t color); #endif //------------------------------------------------------------------------------------------------------------ diff --git a/src/gdisp/gdisp_image_bmp.c b/src/gdisp/gdisp_image_bmp.c index 54e66abb..7c26cc22 100644 --- a/src/gdisp/gdisp_image_bmp.c +++ b/src/gdisp/gdisp_image_bmp.c @@ -24,7 +24,7 @@ typedef struct gdispImagePrivate_BMP { uint8_t bitsperpixel; #if GDISP_NEED_IMAGE_BMP_1 || GDISP_NEED_IMAGE_BMP_4 || GDISP_NEED_IMAGE_BMP_4_RLE || GDISP_NEED_IMAGE_BMP_8 || GDISP_NEED_IMAGE_BMP_8_RLE uint16_t palsize; - pixel_t *palette; + gPixel *palette; #endif #if GDISP_NEED_IMAGE_BMP_4_RLE || GDISP_NEED_IMAGE_BMP_8_RLE uint16_t rlerun; @@ -41,8 +41,8 @@ typedef struct gdispImagePrivate_BMP { uint32_t maskalpha; #endif size_t frame0pos; - pixel_t *frame0cache; - pixel_t buf[GDISP_IMAGE_BMP_BLIT_BUFFER_SIZE]; + gPixel *frame0cache; + gPixel buf[GDISP_IMAGE_BMP_BLIT_BUFFER_SIZE]; } gdispImagePrivate_BMP; void gdispImageClose_BMP(gdispImage *img) { @@ -55,7 +55,7 @@ void gdispImageClose_BMP(gdispImage *img) { gdispImageFree(img, (void *)priv->palette, priv->palsize*sizeof(color_t)); #endif if (priv->frame0cache) - gdispImageFree(img, (void *)priv->frame0cache, img->width*img->height*sizeof(pixel_t)); + gdispImageFree(img, (void *)priv->frame0cache, img->width*img->height*sizeof(gPixel)); gdispImageFree(img, (void *)priv, sizeof(gdispImagePrivate_BMP)); img->priv = 0; } @@ -704,8 +704,8 @@ gdispImageError gdispImageCache_BMP(gdispImage *img) { return GDISP_IMAGE_ERR_OK; /* We need to allocate the cache */ - len = img->width * img->height * sizeof(pixel_t); - priv->frame0cache = (pixel_t *)gdispImageAlloc(img, len); + len = img->width * img->height * sizeof(gPixel); + priv->frame0cache = (gPixel *)gdispImageAlloc(img, len); if (!priv->frame0cache) return GDISP_IMAGE_ERR_NOMEMORY; diff --git a/src/gdisp/gdisp_image_gif.c b/src/gdisp/gdisp_image_gif.c index 5aaeaeb1..57af7fd9 100644 --- a/src/gdisp/gdisp_image_gif.c +++ b/src/gdisp/gdisp_image_gif.c @@ -91,14 +91,14 @@ typedef struct gdispImagePrivate_GIF { uint8_t bgcolor; // Background Color (global) uint16_t loops; // Remaining frame loops (if animated) uint16_t palsize; // Global palette size (global) - pixel_t *palette; // Global palette (global) + gPixel *palette; // Global palette (global) size_t frame0pos; // The position of the first frame gifimgcache * cache; // The list of cached frames gifimgcache * curcache; // The cache of the current frame (if created) gifimgdecode * decode; // The decode data for the decode in progress gifimgframe frame; gifimgdispose dispose; - pixel_t buf[GDISP_IMAGE_GIF_BLIT_BUFFER_SIZE]; // Buffer for reading and blitting + gPixel buf[GDISP_IMAGE_GIF_BLIT_BUFFER_SIZE]; // Buffer for reading and blitting } gdispImagePrivate_GIF; /** diff --git a/src/gdisp/gdisp_image_jpg.c b/src/gdisp/gdisp_image_jpg.c index b188f0f0..8056ac42 100644 --- a/src/gdisp/gdisp_image_jpg.c +++ b/src/gdisp/gdisp_image_jpg.c @@ -59,7 +59,7 @@ gdispImageError jd_decomp(JDEC*, unsigned(*)(gdispImage*,void*,JRECT*), uint8_t) /*---------------------------------------------------------------------------*/ typedef struct gdispImagePrivate_JPG { - pixel_t *frame0cache; + gPixel *frame0cache; } gdispImagePrivate_JPG; gdispImageError gdispImageOpen_JPG(gdispImage *img){ @@ -123,7 +123,7 @@ void gdispImageClose_JPG(gdispImage *img){ gdispImagePrivate_JPG *priv = (gdispImagePrivate_JPG *)img->priv; if(priv){ if (priv->frame0cache){ - gdispImageFree(img, (void *)priv->frame0cache, img->width * img->height * sizeof(pixel_t)); + gdispImageFree(img, (void *)priv->frame0cache, img->width * img->height * sizeof(gPixel)); } gdispImageFree(img, (void*) priv, sizeof(gdispImagePrivate_JPG)); } @@ -133,7 +133,7 @@ static unsigned gdispImage_JPG_WriteToCache(gdispImage *img, void *bitmap, JRECT { gdispImagePrivate_JPG *priv; uint8_t *in; - pixel_t *out; + gPixel *out; gCoord x, y; priv = (gdispImagePrivate_JPG *)img->priv; @@ -158,7 +158,7 @@ gdispImageError gdispImageCache_JPG(gdispImage *img) { return GDISP_IMAGE_ERR_OK; /* Otherwise start a new decode */ - priv->frame0cache = (pixel_t *)gdispImageAlloc(img, img->width * img->height * sizeof(pixel_t)); + priv->frame0cache = (gPixel *)gdispImageAlloc(img, img->width * img->height * sizeof(gPixel)); if (!priv->frame0cache) return GDISP_IMAGE_ERR_NOMEMORY; diff --git a/src/gdisp/gdisp_image_native.c b/src/gdisp/gdisp_image_native.c index 2043401c..f97b7539 100644 --- a/src/gdisp/gdisp_image_native.c +++ b/src/gdisp/gdisp_image_native.c @@ -27,8 +27,8 @@ void *gdispImageAlloc(gdispImage *img, size_t sz); void gdispImageFree(gdispImage *img, void *ptr, size_t sz); typedef struct gdispImagePrivate_NATIVE { - pixel_t *frame0cache; - pixel_t buf[BLIT_BUFFER_SIZE_NATIVE]; + gPixel *frame0cache; + gPixel buf[BLIT_BUFFER_SIZE_NATIVE]; } gdispImagePrivate_NATIVE; void gdispImageClose_NATIVE(gdispImage *img) { @@ -37,7 +37,7 @@ void gdispImageClose_NATIVE(gdispImage *img) { priv = (gdispImagePrivate_NATIVE *)img->priv; if (priv) { if (priv->frame0cache) - gdispImageFree(img, (void *)priv->frame0cache, img->width * img->height * sizeof(pixel_t)); + gdispImageFree(img, (void *)priv->frame0cache, img->width * img->height * sizeof(gPixel)); gdispImageFree(img, (void *)priv, sizeof(gdispImagePrivate_NATIVE)); img->priv = 0; } @@ -80,8 +80,8 @@ gdispImageError gdispImageCache_NATIVE(gdispImage *img) { return GDISP_IMAGE_ERR_OK; /* We need to allocate the cache */ - len = img->width * img->height * sizeof(pixel_t); - priv->frame0cache = (pixel_t *)gdispImageAlloc(img, len); + len = img->width * img->height * sizeof(gPixel); + priv->frame0cache = (gPixel *)gdispImageAlloc(img, len); if (!priv->frame0cache) return GDISP_IMAGE_ERR_NOMEMORY; @@ -112,7 +112,7 @@ gdispImageError gdispGImageDraw_NATIVE(GDisplay *g, gdispImage *img, gCoord x, g } /* For this image decoder we cheat and just seek straight to the region we want to display */ - pos = FRAME0POS_NATIVE + (img->width * sy + sx) * sizeof(pixel_t); + pos = FRAME0POS_NATIVE + (img->width * sy + sx) * sizeof(gPixel); /* Cycle through the lines */ for(;cy;cy--, y++) { @@ -124,8 +124,8 @@ gdispImageError gdispGImageDraw_NATIVE(GDisplay *g, gdispImage *img, gCoord x, g // Read the data len = gfileRead(img->f, priv->buf, - mcx > BLIT_BUFFER_SIZE_NATIVE ? (BLIT_BUFFER_SIZE_NATIVE*sizeof(pixel_t)) : (mcx * sizeof(pixel_t))) - / sizeof(pixel_t); + mcx > BLIT_BUFFER_SIZE_NATIVE ? (BLIT_BUFFER_SIZE_NATIVE*sizeof(gPixel)) : (mcx * sizeof(gPixel))) + / sizeof(gPixel); if (!len) return GDISP_IMAGE_ERR_BADDATA; @@ -134,7 +134,7 @@ gdispImageError gdispGImageDraw_NATIVE(GDisplay *g, gdispImage *img, gCoord x, g } /* Get the position for the start of the next line */ - pos += img->width*sizeof(pixel_t); + pos += img->width*sizeof(gPixel); } return GDISP_IMAGE_ERR_OK; diff --git a/src/gdisp/gdisp_image_png.c b/src/gdisp/gdisp_image_png.c index 9cb34cd5..cd7e3234 100644 --- a/src/gdisp/gdisp_image_png.c +++ b/src/gdisp/gdisp_image_png.c @@ -70,7 +70,7 @@ typedef struct PNG_output { gCoord sx, sy; gCoord ix, iy; unsigned cnt; - pixel_t buf[GDISP_IMAGE_PNG_BLIT_BUFFER_SIZE]; + gPixel buf[GDISP_IMAGE_PNG_BLIT_BUFFER_SIZE]; } PNG_output; // Handle the PNG scan line filter diff --git a/src/gdisp/gdisp_pixmap.c b/src/gdisp/gdisp_pixmap.c index 081db8d3..9f59ce40 100644 --- a/src/gdisp/gdisp_pixmap.c +++ b/src/gdisp/gdisp_pixmap.c @@ -92,7 +92,7 @@ void gdispPixmapDelete(GDisplay *g) { gdriverUnRegister(&g->d); } -pixel_t *gdispPixmapGetBits(GDisplay *g) { +gPixel *gdispPixmapGetBits(GDisplay *g) { if (gvmt(g) != GDISPVMT_pixmap) return 0; return ((pixmap *)g->priv)->pixels; diff --git a/src/gdisp/gdisp_pixmap.h b/src/gdisp/gdisp_pixmap.h index 5e139796..3e7aea4b 100644 --- a/src/gdisp/gdisp_pixmap.h +++ b/src/gdisp/gdisp_pixmap.h @@ -59,7 +59,7 @@ void gdispPixmapDelete(GDisplay *g); * (although different pixmaps will have different pixel pointers). Once a pixmap is deleted, the pixel pointer * should not be used by the application. */ -pixel_t *gdispPixmapGetBits(GDisplay *g); +gPixel *gdispPixmapGetBits(GDisplay *g); #if GDISP_NEED_PIXMAP_IMAGE || defined(__DOXYGEN__) /** diff --git a/src/gwin/gwin.c b/src/gwin/gwin.c index 8b093851..00b2557d 100644 --- a/src/gwin/gwin.c +++ b/src/gwin/gwin.c @@ -261,7 +261,7 @@ void gwinFillArea(GHandle gh, gCoord x, gCoord y, gCoord cx, gCoord cy) { _gwinDrawEnd(gh); } -void gwinBlitArea(GHandle gh, gCoord x, gCoord y, gCoord cx, gCoord cy, gCoord srcx, gCoord srcy, gCoord srccx, const pixel_t *buffer) { +void gwinBlitArea(GHandle gh, gCoord x, gCoord y, gCoord cx, gCoord cy, gCoord srcx, gCoord srcy, gCoord srccx, const gPixel *buffer) { if (!_gwinDrawStart(gh)) return; gdispGBlitArea(gh->display, gh->x+x, gh->y+y, cx, cy, srcx, srcy, srccx, buffer); _gwinDrawEnd(gh); diff --git a/src/gwin/gwin.h b/src/gwin/gwin.h index c27aadc3..2ab50fd9 100644 --- a/src/gwin/gwin.h +++ b/src/gwin/gwin.h @@ -680,7 +680,7 @@ void gwinFillArea(GHandle gh, gCoord x, gCoord y, gCoord cx, gCoord cy); * * @api */ -void gwinBlitArea(GHandle gh, gCoord x, gCoord y, gCoord cx, gCoord cy, gCoord srcx, gCoord srcy, gCoord srccx, const pixel_t *buffer); +void gwinBlitArea(GHandle gh, gCoord x, gCoord y, gCoord cx, gCoord cy, gCoord srcx, gCoord srcy, gCoord srccx, const gPixel *buffer); /*------------------------------------------------- * Circle, ellipse, arc and arc-sectors functions diff --git a/src/gwin/gwin_gl3d.c b/src/gwin/gwin_gl3d.c index 4c3f0f7f..2c2861e2 100644 --- a/src/gwin/gwin_gl3d.c +++ b/src/gwin/gwin_gl3d.c @@ -86,7 +86,7 @@ static void gl3dRedraw(GWindowObject *gh) { ZBuffer * zb; zb = ((GGL3DObject *)gh)->glcxt->zb; - gdispGBlitArea(gh->display, gh->x, gh->y, zb->xsize, zb->ysize, 0, 0, zb->linesize/sizeof(color_t), (const pixel_t *)zb->pbuf); + gdispGBlitArea(gh->display, gh->x, gh->y, zb->xsize, zb->ysize, 0, 0, zb->linesize/sizeof(color_t), (const gPixel *)zb->pbuf); } static int gl3dResizeGLViewport(GLContext *c, int *xsize_ptr, int *ysize_ptr) { -- cgit v1.2.3