uGFX
/
ugfx
2
0
Fork 0
Code Issues 2 Pull Requests Projects Releases Wiki Activity

Adding ability to modify the color palette of BMP images (untested)

spinbox_widget
Joel Bodenmann 2016-11-10 23:00:31 +01:00
parent 2cf23ca69b
commit 386e49480d
3 changed files with 91 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/gdisp/gdisp_image.c
View File

@ -33,6 +33,9 @@
extern gdispImageError gdispImageCache_BMP(gdispImage *img);
extern gdispImageError gdispGImageDraw_BMP(GDisplay *g, gdispImage *img, coord_t x, coord_t y, coord_t cx, coord_t cy, coord_t sx, coord_t sy);
extern delaytime_t gdispImageNext_BMP(gdispImage *img);
extern int gdispImageGetPaletteSize_BMP(gdispImage *img);
extern color_t gdispImageGetPalette_BMP(gdispImage *img, int index);
extern bool_t gdispImageAdjustPalette_BMP(gdispImage *img, int index, color_t newColor);
#endif
#if GDISP_NEED_IMAGE_JPG
@ -53,41 +56,49 @@
/* The structure defining the routines for image drawing */
typedef struct gdispImageHandlers {
gdispImageError (*open)(gdispImage *img); /* The open function */
void (*close)(gdispImage *img); /* The close function */
gdispImageError (*cache)(gdispImage *img); /* The cache function */
gdispImageError (*open)(gdispImage *img); /* The open function */
void (*close)(gdispImage *img); /* The close function */
gdispImageError (*cache)(gdispImage *img); /* The cache function */
gdispImageError (*draw)(GDisplay *g,
gdispImage *img,
coord_t x, coord_t y,
coord_t cx, coord_t cy,
coord_t sx, coord_t sy); /* The draw function */
delaytime_t (*next)(gdispImage *img); /* The next frame function */
coord_t sx, coord_t sy); /* The draw function */
delaytime_t (*next)(gdispImage *img); /* The next frame function */
int (*getPaletteSize)(gdispImage *img); /* Retrieve the size of the palette (number of entries) */
color_t (*getPalette)(gdispImage *img, int index); /* Retrieve a specific color value of the palette */
bool_t (*adjustPalette)(gdispImage *img, int index, color_t newColor); /* Replace a color value in the palette */
} gdispImageHandlers;
static gdispImageHandlers ImageHandlers[] = {
#if GDISP_NEED_IMAGE_NATIVE
{ gdispImageOpen_NATIVE, gdispImageClose_NATIVE,
gdispImageCache_NATIVE, gdispGImageDraw_NATIVE, gdispImageNext_NATIVE,
0, 0, 0
},
#endif
#if GDISP_NEED_IMAGE_GIF
{ gdispImageOpen_GIF, gdispImageClose_GIF,
gdispImageCache_GIF, gdispGImageDraw_GIF, gdispImageNext_GIF,
0, 0, 0
},
#endif
#if GDISP_NEED_IMAGE_BMP
{ gdispImageOpen_BMP, gdispImageClose_BMP,
gdispImageCache_BMP, gdispGImageDraw_BMP, gdispImageNext_BMP,
{ gdispImageOpen_BMP, gdispImageClose_BMP,
gdispImageCache_BMP, gdispGImageDraw_BMP, gdispImageNext_BMP,
gdispImageGetPaletteSize_BMP, gdispImageGetPalette_BMP, gdispImageAdjustPalette_BMP
},
#endif
#if GDISP_NEED_IMAGE_JPG
{ gdispImageOpen_JPG, gdispImageClose_JPG,
gdispImageCache_JPG, gdispGImageDraw_JPG, gdispImageNext_JPG,
0, 0, 0
},
#endif
#if GDISP_NEED_IMAGE_PNG
{ gdispImageOpen_PNG, gdispImageClose_PNG,
gdispImageCache_PNG, gdispGImageDraw_PNG, gdispImageNext_PNG,
0, 0, 0
},
#endif
};

4
src/gdisp/gdisp_image.h
View File

@ -248,6 +248,10 @@ extern "C" {
*/
delaytime_t gdispImageNext(gdispImage *img);
int gdispImageGetPaletteSize(gdispImage *img);
color_t gdispImageGetPalette(gdispImage *img, int index);
bool_t gdispImageAdjustPalette(gdispImage *img, int index, color_t newColor);
#ifdef __cplusplus
}
#endif

69
src/gdisp/gdisp_image_bmp.c
View File

@ -829,4 +829,73 @@ delaytime_t gdispImageNext_BMP(gdispImage *img) {
return TIME_INFINITE;
}
int gdispImageGetPaletteSize_BMP(gdispImage *img) {
#if GDISP_NEED_IMAGE_BMP_1 || GDISP_NEED_IMAGE_BMP_4 || GDISP_NEED_IMAGE_BMP_8
gdispImagePrivate_BMP *priv;
priv = (gdispImagePrivate_BMP *)img->priv;
if (!priv) {
return 0;
}
if (!(priv->bmpflags & BMP_PALETTE)) {
return 0;
}
return priv->palsize;
#else
return 0;
#endif
}
color_t gdispImageGetPalette_BMP(gdispImage *img, int index) {
#if GDISP_NEED_IMAGE_BMP_1 || GDISP_NEED_IMAGE_BMP_4 || GDISP_NEED_IMAGE_BMP_8
gdispImagePrivate_BMP *priv;
priv = (gdispImagePrivate_BMP *)img->priv;
if (!priv) {
return 0;
}
if (!(priv->bmpflags & BMP_PALETTE)) {
return 0;
}
if (index < 0 || index >= priv->palsize) {
return 0;
}
return priv->palette[index];
#else
return 0;
#endif
}
bool_t gdispImageAdjustPalette_BMP(gdispImage *img, int index, color_t newColor) {
#if GDISP_NEED_IMAGE_BMP_1 || GDISP_NEED_IMAGE_BMP_4 || GDISP_NEED_IMAGE_BMP_8
gdispImagePrivate_BMP *priv;
priv = (gdispImagePrivate_BMP *)img->priv;
if (!priv) {
return FALSE;
}
if (!(priv->bmpflags & BMP_PALETTE)) {
return FALSE;
}
if (index < 0 || index >= priv->palsize) {
return FALSE;
}
priv->palette[index] = newColor;
return TRUE;
#else
return 0;
#endif
}
#endif /* GFX_USE_GDISP && GDISP_NEED_IMAGE && GDISP_NEED_IMAGE_BMP */