Adding ability to modify the color palette of BMP images (untested)
This commit is contained in:
parent
2cf23ca69b
commit
386e49480d
3 changed files with 91 additions and 7 deletions
|
@ -33,6 +33,9 @@
|
||||||
extern gdispImageError gdispImageCache_BMP(gdispImage *img);
|
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 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 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
|
#endif
|
||||||
|
|
||||||
#if GDISP_NEED_IMAGE_JPG
|
#if GDISP_NEED_IMAGE_JPG
|
||||||
|
@ -62,32 +65,40 @@ typedef struct gdispImageHandlers {
|
||||||
coord_t cx, coord_t cy,
|
coord_t cx, coord_t cy,
|
||||||
coord_t sx, coord_t sy); /* The draw function */
|
coord_t sx, coord_t sy); /* The draw function */
|
||||||
delaytime_t (*next)(gdispImage *img); /* The next frame 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;
|
} gdispImageHandlers;
|
||||||
|
|
||||||
static gdispImageHandlers ImageHandlers[] = {
|
static gdispImageHandlers ImageHandlers[] = {
|
||||||
#if GDISP_NEED_IMAGE_NATIVE
|
#if GDISP_NEED_IMAGE_NATIVE
|
||||||
{ gdispImageOpen_NATIVE, gdispImageClose_NATIVE,
|
{ gdispImageOpen_NATIVE, gdispImageClose_NATIVE,
|
||||||
gdispImageCache_NATIVE, gdispGImageDraw_NATIVE, gdispImageNext_NATIVE,
|
gdispImageCache_NATIVE, gdispGImageDraw_NATIVE, gdispImageNext_NATIVE,
|
||||||
|
0, 0, 0
|
||||||
},
|
},
|
||||||
#endif
|
#endif
|
||||||
#if GDISP_NEED_IMAGE_GIF
|
#if GDISP_NEED_IMAGE_GIF
|
||||||
{ gdispImageOpen_GIF, gdispImageClose_GIF,
|
{ gdispImageOpen_GIF, gdispImageClose_GIF,
|
||||||
gdispImageCache_GIF, gdispGImageDraw_GIF, gdispImageNext_GIF,
|
gdispImageCache_GIF, gdispGImageDraw_GIF, gdispImageNext_GIF,
|
||||||
|
0, 0, 0
|
||||||
},
|
},
|
||||||
#endif
|
#endif
|
||||||
#if GDISP_NEED_IMAGE_BMP
|
#if GDISP_NEED_IMAGE_BMP
|
||||||
{ gdispImageOpen_BMP, gdispImageClose_BMP,
|
{ gdispImageOpen_BMP, gdispImageClose_BMP,
|
||||||
gdispImageCache_BMP, gdispGImageDraw_BMP, gdispImageNext_BMP,
|
gdispImageCache_BMP, gdispGImageDraw_BMP, gdispImageNext_BMP,
|
||||||
|
gdispImageGetPaletteSize_BMP, gdispImageGetPalette_BMP, gdispImageAdjustPalette_BMP
|
||||||
},
|
},
|
||||||
#endif
|
#endif
|
||||||
#if GDISP_NEED_IMAGE_JPG
|
#if GDISP_NEED_IMAGE_JPG
|
||||||
{ gdispImageOpen_JPG, gdispImageClose_JPG,
|
{ gdispImageOpen_JPG, gdispImageClose_JPG,
|
||||||
gdispImageCache_JPG, gdispGImageDraw_JPG, gdispImageNext_JPG,
|
gdispImageCache_JPG, gdispGImageDraw_JPG, gdispImageNext_JPG,
|
||||||
|
0, 0, 0
|
||||||
},
|
},
|
||||||
#endif
|
#endif
|
||||||
#if GDISP_NEED_IMAGE_PNG
|
#if GDISP_NEED_IMAGE_PNG
|
||||||
{ gdispImageOpen_PNG, gdispImageClose_PNG,
|
{ gdispImageOpen_PNG, gdispImageClose_PNG,
|
||||||
gdispImageCache_PNG, gdispGImageDraw_PNG, gdispImageNext_PNG,
|
gdispImageCache_PNG, gdispGImageDraw_PNG, gdispImageNext_PNG,
|
||||||
|
0, 0, 0
|
||||||
},
|
},
|
||||||
#endif
|
#endif
|
||||||
};
|
};
|
||||||
|
|
|
@ -248,6 +248,10 @@ extern "C" {
|
||||||
*/
|
*/
|
||||||
delaytime_t gdispImageNext(gdispImage *img);
|
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
|
#ifdef __cplusplus
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -829,4 +829,73 @@ delaytime_t gdispImageNext_BMP(gdispImage *img) {
|
||||||
return TIME_INFINITE;
|
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 */
|
#endif /* GFX_USE_GDISP && GDISP_NEED_IMAGE && GDISP_NEED_IMAGE_BMP */
|
||||||
|
|
Loading…
Add table
Reference in a new issue