Skip to content

Added palette callback function #10

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
welshcoder wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Added palette callback function #10

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6ff1951
Added palette callback function
welshcoder Aug 10, 2022
d8b50b7
Global Palette flag changed to uint8_t type
welshcoder Aug 11, 2022
a67a33e
Small correction for c++17
welshcoder May 14, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
34 changes: 21 additions & 13 deletions src/GifDecoder.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,26 +23,31 @@
#define ERROR_GIF_DECODE_ERROR -10
#define ERROR_MISSING_CALLBACK_FUNCTION -11

typedef void (*callback)(void);

typedef struct rgb_24 {
uint8_t red;
uint8_t green;
uint8_t blue;
} rgb_24;

typedef void (*gd_callback)(void);
typedef void (*pixel_callback)(int16_t x, int16_t y, uint8_t red, uint8_t green,
uint8_t blue);
typedef void (*line_callback)(int16_t x, int16_t y, uint8_t *buf, int16_t wid,
uint16_t *palette565, int16_t skip);
typedef void *(*get_buffer_callback)(void);

typedef void (*palette_callback)(rgb_24 *palette888, bool isGlobalPalette);

typedef bool (*file_seek_callback)(unsigned long position);
typedef unsigned long (*file_position_callback)(void);
typedef int (*file_read_callback)(void);
typedef int (*file_read_block_callback)(void *buffer, int numberOfBytes);
typedef int (*file_size_callback)(void);

typedef struct rgb_24 {
uint8_t red;
uint8_t green;
uint8_t blue;
} rgb_24;

template <int maxGifWidth, int maxGifHeight, int lzwMaxBits, bool useMalloc=false> class GifDecoder {
template <int maxGifWidth, int maxGifHeight, int lzwMaxBits, bool useMalloc=false >
class GifDecoder {
public:
GifDecoder(void);
int startDecoding(void);
Expand All @@ -58,11 +63,13 @@ template <int maxGifWidth, int maxGifHeight, int lzwMaxBits, bool useMalloc=fals
*h = gif->getCanvasHeight();
}

void setScreenClearCallback(callback f);
void setUpdateScreenCallback(callback f);
void setScreenClearCallback(gd_callback f);
void setUpdateScreenCallback(gd_callback f);
void setDrawPixelCallback(pixel_callback f);
void setDrawLineCallback(line_callback f); // note this callback is not currently used, but may be used in the future
void setStartDrawingCallback(callback f); // note this callback is not currently used
void setStartDrawingCallback(gd_callback f); // note this callback is not currently used

void setPaletteCallback(palette_callback);

void setFileSeekCallback(file_seek_callback f);
void setFilePositionCallback(file_position_callback f);
Expand All @@ -88,16 +95,17 @@ template <int maxGifWidth, int maxGifHeight, int lzwMaxBits, bool useMalloc=fals

uint32_t frameStartTime;

static callback screenClearCallback;
static callback updateScreenCallback;
static gd_callback screenClearCallback;
static gd_callback updateScreenCallback;
static pixel_callback drawPixelCallback;
static line_callback drawLineCallback;
static callback startDrawingCallback;
static gd_callback startDrawingCallback;
static file_seek_callback fileSeekCallback;
static file_position_callback filePositionCallback;
static file_read_callback fileReadCallback;
static file_read_block_callback fileReadBlockCallback;
static file_size_callback fileSizeCallback;
static palette_callback paletteCallback;

static void GIFDraw(GIFDRAW *pDraw);
static void * GIFOpenFile(const char *fname, int32_t *pSize);
Expand Down
31 changes: 23 additions & 8 deletions src/GifDecoder_Impl.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,19 +30,20 @@
//#define GIFDEBUG 2

#include <Arduino.h>

#undef abs
#include "GifDecoder.h"


template <int maxGifWidth, int maxGifHeight, int lzwMaxBits, bool useMalloc>
callback GifDecoder<maxGifWidth, maxGifHeight, lzwMaxBits, useMalloc>::screenClearCallback;
gd_callback GifDecoder<maxGifWidth, maxGifHeight, lzwMaxBits, useMalloc>::screenClearCallback;
template <int maxGifWidth, int maxGifHeight, int lzwMaxBits, bool useMalloc>
callback GifDecoder<maxGifWidth, maxGifHeight, lzwMaxBits, useMalloc>::updateScreenCallback;
gd_callback GifDecoder<maxGifWidth, maxGifHeight, lzwMaxBits, useMalloc>::updateScreenCallback;
template <int maxGifWidth, int maxGifHeight, int lzwMaxBits, bool useMalloc>
pixel_callback GifDecoder<maxGifWidth, maxGifHeight, lzwMaxBits, useMalloc>::drawPixelCallback;
template <int maxGifWidth, int maxGifHeight, int lzwMaxBits, bool useMalloc>
line_callback GifDecoder<maxGifWidth, maxGifHeight, lzwMaxBits, useMalloc>::drawLineCallback;
template <int maxGifWidth, int maxGifHeight, int lzwMaxBits, bool useMalloc>
callback GifDecoder<maxGifWidth, maxGifHeight, lzwMaxBits, useMalloc>::startDrawingCallback;
gd_callback GifDecoder<maxGifWidth, maxGifHeight, lzwMaxBits, useMalloc>::startDrawingCallback;
template <int maxGifWidth, int maxGifHeight, int lzwMaxBits, bool useMalloc>
file_seek_callback GifDecoder<maxGifWidth, maxGifHeight, lzwMaxBits, useMalloc>::fileSeekCallback;
template <int maxGifWidth, int maxGifHeight, int lzwMaxBits, bool useMalloc>
Expand All @@ -53,6 +54,8 @@ template <int maxGifWidth, int maxGifHeight, int lzwMaxBits, bool useMalloc>
file_read_block_callback GifDecoder<maxGifWidth, maxGifHeight, lzwMaxBits, useMalloc>::fileReadBlockCallback;
template <int maxGifWidth, int maxGifHeight, int lzwMaxBits, bool useMalloc>
file_size_callback GifDecoder<maxGifWidth, maxGifHeight, lzwMaxBits, useMalloc>::fileSizeCallback;
template <int maxGifWidth, int maxGifHeight, int lzwMaxBits, bool useMalloc>
palette_callback GifDecoder<maxGifWidth, maxGifHeight, lzwMaxBits, useMalloc>::paletteCallback;


template <int maxGifWidth, int maxGifHeight, int lzwMaxBits, bool useMalloc>
Expand All @@ -65,13 +68,13 @@ GifDecoder<maxGifWidth, maxGifHeight, lzwMaxBits, useMalloc>::GifDecoder(void) {

template <int maxGifWidth, int maxGifHeight, int lzwMaxBits, bool useMalloc>
void GifDecoder<maxGifWidth, maxGifHeight, lzwMaxBits, useMalloc>::setStartDrawingCallback(
callback f) {
gd_callback f) {
startDrawingCallback = f;
}

template <int maxGifWidth, int maxGifHeight, int lzwMaxBits, bool useMalloc>
void GifDecoder<maxGifWidth, maxGifHeight, lzwMaxBits, useMalloc>::setUpdateScreenCallback(
callback f) {
gd_callback f) {
updateScreenCallback = f;
}

Expand All @@ -89,7 +92,7 @@ void GifDecoder<maxGifWidth, maxGifHeight, lzwMaxBits, useMalloc>::setDrawLineCa

template <int maxGifWidth, int maxGifHeight, int lzwMaxBits, bool useMalloc>
void GifDecoder<maxGifWidth, maxGifHeight, lzwMaxBits, useMalloc>::setScreenClearCallback(
callback f) {
gd_callback f) {
screenClearCallback = f;
}

Expand Down Expand Up @@ -122,6 +125,12 @@ void GifDecoder<maxGifWidth, maxGifHeight, lzwMaxBits, useMalloc>::setFileReadBl
fileReadBlockCallback = f;
}

template <int maxGifWidth, int maxGifHeight, int lzwMaxBits, bool useMalloc>
void GifDecoder<maxGifWidth, maxGifHeight, lzwMaxBits, useMalloc>::setPaletteCallback(palette_callback f) {
paletteCallback = f;
}


template <int maxGifWidth, int maxGifHeight, int lzwMaxBits, bool useMalloc>
void GifDecoder<maxGifWidth, maxGifHeight, lzwMaxBits, useMalloc>::DrawPixelRow(int startX, int y, int numPixels, rgb_24 * data) {
for(int i=0; i<numPixels; i++)
Expand All @@ -147,6 +156,9 @@ void GifDecoder<maxGifWidth, maxGifHeight, lzwMaxBits, useMalloc>::GIFDraw(GIFDR
iWidth = DISPLAY_WIDTH;
usPalette = (rgb_24*)pDraw->pPalette;

if(paletteCallback)
paletteCallback(usPalette,pDraw->ucIsGlobalPalette==1);

y = pDraw->iY + pDraw->y; // current line

s = pDraw->pPixels;
Expand Down Expand Up @@ -212,8 +224,11 @@ void GifDecoder<maxGifWidth, maxGifHeight, lzwMaxBits, useMalloc>::GIFDraw(GIFDR
s = pDraw->pPixels;
// Translate the 8-bit pixels through the RGB565 palette (already byte reversed)
for (x=0; x<iWidth; x++)
{
usTemp[x] = usPalette[*s++];
DrawPixelRow(pDraw->iX+x_offset, y+y_offset, iWidth, (rgb_24 *)usTemp);
}

DrawPixelRow(pDraw->iX+x_offset, y+y_offset, iWidth, (rgb_24 *)usTemp);
}
}

Expand Down