diff --git a/lib/AnimatedGIF/AnimatedGIF.cpp b/lib/AnimatedGIF/AnimatedGIF.cpp new file mode 100644 index 0000000000..ad79b212b8 --- /dev/null +++ b/lib/AnimatedGIF/AnimatedGIF.cpp @@ -0,0 +1,236 @@ +// +// GIF Animator +// written by Larry Bank +// bitbank@pobox.com +// Arduino port started 7/5/2020 +// Original GIF code written 20+ years ago :) +// The goal of this code is to decode images up to 480x320 +// using no more than 22K of RAM (if sent directly to an LCD display) +// +// Copyright 2020 BitBank Software, Inc. All Rights Reserved. +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// http://www.apache.org/licenses/LICENSE-2.0 +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. +//=========================================================================== +#include "AnimatedGIF.h" + +// Here is all of the actual code... +#include "gif.inl" + +// +// Memory initialization +// +int AnimatedGIF::open(uint8_t *pData, int iDataSize, GIF_DRAW_CALLBACK *pfnDraw) +{ + _gif.iError = GIF_SUCCESS; + _gif.pfnRead = readMem; + _gif.pfnSeek = seekMem; + _gif.pfnDraw = pfnDraw; + _gif.pfnOpen = NULL; + _gif.pfnClose = NULL; + _gif.GIFFile.iSize = iDataSize; + _gif.GIFFile.pData = pData; + return GIFInit(&_gif); +} /* open() */ + +int AnimatedGIF::openFLASH(uint8_t *pData, int iDataSize, GIF_DRAW_CALLBACK *pfnDraw) +{ + _gif.iError = GIF_SUCCESS; + _gif.pfnRead = readFLASH; + _gif.pfnSeek = seekMem; + _gif.pfnDraw = pfnDraw; + _gif.pfnOpen = NULL; + _gif.pfnClose = NULL; + _gif.GIFFile.iSize = iDataSize; + _gif.GIFFile.pData = pData; + return GIFInit(&_gif); +} /* openFLASH() */ + +// +// Returns the first comment block found (if any) +// +int AnimatedGIF::getComment(char *pDest) +{ +int32_t iOldPos; + + iOldPos = _gif.GIFFile.iPos; // keep old position + (*_gif.pfnSeek)(&_gif.GIFFile, _gif.iCommentPos); + (*_gif.pfnRead)(&_gif.GIFFile, (uint8_t *)pDest, _gif.sCommentLen); + (*_gif.pfnSeek)(&_gif.GIFFile, iOldPos); + pDest[_gif.sCommentLen] = 0; // zero terminate the string + return (int)_gif.sCommentLen; +} /* getComment() */ + +// +// Allocate a block of memory to hold the entire canvas (as 8-bpp) +// +int AnimatedGIF::allocFrameBuf(GIF_ALLOC_CALLBACK *pfnAlloc) +{ + if (_gif.iCanvasWidth > 0 && _gif.iCanvasHeight > 0 && _gif.pFrameBuffer == NULL) + { + // Allocate a little extra space for the current line + // as RGB565 or RGB888 + int iCanvasSize = _gif.iCanvasWidth * (_gif.iCanvasHeight+3); + _gif.pFrameBuffer = (unsigned char *)(*pfnAlloc)(iCanvasSize); + if (_gif.pFrameBuffer == NULL) + return GIF_ERROR_MEMORY; + return GIF_SUCCESS; + } + return GIF_INVALID_PARAMETER; +} /* allocFrameBuf() */ +// +// Set the DRAW callback behavior to RAW (default) +// or COOKED (requires allocating a frame buffer) +// +int AnimatedGIF::setDrawType(int iType) +{ + if (iType != GIF_DRAW_RAW && iType != GIF_DRAW_COOKED) + return GIF_INVALID_PARAMETER; // invalid drawing mode + _gif.ucDrawType = (uint8_t)iType; + return GIF_SUCCESS; +} /* setDrawType() */ +// +// Release the memory used by the frame buffer +// +int AnimatedGIF::freeFrameBuf(GIF_FREE_CALLBACK *pfnFree) +{ + if (_gif.pFrameBuffer) + { + (*pfnFree)(_gif.pFrameBuffer); + _gif.pFrameBuffer = NULL; + return GIF_SUCCESS; + } + return GIF_INVALID_PARAMETER; +} /* freeFrameBuf() */ +// +// Return a pointer to the frame buffer (if it was allocated) +// +uint8_t * AnimatedGIF::getFrameBuf() +{ + return _gif.pFrameBuffer; +} /* getFrameBuf() */ + +int AnimatedGIF::getCanvasWidth() +{ + return _gif.iCanvasWidth; +} /* getCanvasWidth() */ + +int AnimatedGIF::getCanvasHeight() +{ + return _gif.iCanvasHeight; +} /* getCanvasHeight() */ + +int AnimatedGIF::getLoopCount() +{ + return _gif.iRepeatCount; +} /* getLoopCount() */ + +int AnimatedGIF::getInfo(GIFINFO *pInfo) +{ + return GIF_getInfo(&_gif, pInfo); +} /* getInfo() */ + +int AnimatedGIF::getLastError() +{ + return _gif.iError; +} /* getLastError() */ + +// +// File (SD/MMC) based initialization +// +int AnimatedGIF::open(const char *szFilename, GIF_OPEN_CALLBACK *pfnOpen, GIF_CLOSE_CALLBACK *pfnClose, GIF_READ_CALLBACK *pfnRead, GIF_SEEK_CALLBACK *pfnSeek, GIF_DRAW_CALLBACK *pfnDraw) +{ + _gif.iError = GIF_SUCCESS; + _gif.pfnRead = pfnRead; + _gif.pfnSeek = pfnSeek; + _gif.pfnDraw = pfnDraw; + _gif.pfnOpen = pfnOpen; + _gif.pfnClose = pfnClose; + _gif.GIFFile.fHandle = (*pfnOpen)(szFilename, &_gif.GIFFile.iSize); + if (_gif.GIFFile.fHandle == NULL) { + _gif.iError = GIF_FILE_NOT_OPEN; + return 0; + } + return GIFInit(&_gif); + +} /* open() */ + +void AnimatedGIF::close() +{ + if (_gif.pfnClose) + (*_gif.pfnClose)(_gif.GIFFile.fHandle); +} /* close() */ + +void AnimatedGIF::reset() +{ + (*_gif.pfnSeek)(&_gif.GIFFile, 0); +} /* reset() */ + +void AnimatedGIF::begin(unsigned char ucPaletteType) +{ + memset(&_gif, 0, sizeof(_gif)); + if (ucPaletteType != GIF_PALETTE_RGB565_LE && ucPaletteType != GIF_PALETTE_RGB565_BE && ucPaletteType != GIF_PALETTE_RGB888) + _gif.iError = GIF_INVALID_PARAMETER; + _gif.ucPaletteType = ucPaletteType; + _gif.ucDrawType = GIF_DRAW_RAW; // assume RAW pixel handling + _gif.pFrameBuffer = NULL; +} /* begin() */ +// +// Play a single frame +// returns: +// 1 = good result and more frames exist +// 0 = no more frames exist, a frame may or may not have been played: use getLastError() and look for GIF_SUCCESS to know if a frame was played +// -1 = error +int AnimatedGIF::playFrame(bool bSync, int *delayMilliseconds, void *pUser) +{ +int rc; +#if !defined( __MACH__ ) && !defined( __LINUX__ ) +long lTime = millis(); +#endif + + if (_gif.GIFFile.iPos >= _gif.GIFFile.iSize-1) // no more data exists + { + (*_gif.pfnSeek)(&_gif.GIFFile, 0); // seek to start + } + if (GIFParseInfo(&_gif, 0)) + { + _gif.pUser = pUser; + if (_gif.iError == GIF_EMPTY_FRAME) // don't try to decode it + return 0; + rc = DecodeLZW(&_gif, 0); + if (rc != 0) // problem + return -1; + } + else + { + // The file is "malformed" in that there is a bunch of non-image data after + // the last frame. Return as if all is well, though if needed getLastError() + // can be used to see if a frame was actually processed: + // GIF_SUCCESS -> frame processed, GIF_EMPTY_FRAME -> no frame processed + if (_gif.iError == GIF_EMPTY_FRAME) + { + if (delayMilliseconds) + *delayMilliseconds = 0; + return 0; + } + return -1; // error parsing the frame info, we may be at the end of the file + } + // Return 1 for more frames or 0 if this was the last frame + if (bSync) + { +#if !defined( __MACH__ ) && !defined( __LINUX__ ) + lTime = millis() - lTime; + if (lTime < _gif.iFrameDelay) // need to pause a bit + delay(_gif.iFrameDelay - lTime); +#endif // __LINUX__ + } + if (delayMilliseconds) // if not NULL, return the frame delay time + *delayMilliseconds = _gif.iFrameDelay; + return (_gif.GIFFile.iPos < _gif.GIFFile.iSize-10); +} /* playFrame() */ diff --git a/lib/AnimatedGIF/AnimatedGIF.h b/lib/AnimatedGIF/AnimatedGIF.h new file mode 100644 index 0000000000..e1868bb6cd --- /dev/null +++ b/lib/AnimatedGIF/AnimatedGIF.h @@ -0,0 +1,216 @@ +// Copyright 2020 BitBank Software, Inc. All Rights Reserved. +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// http://www.apache.org/licenses/LICENSE-2.0 +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. +//=========================================================================== + +#ifndef __ANIMATEDGIF__ +#define __ANIMATEDGIF__ +#if defined( PICO_BUILD ) || defined( __MACH__ ) || defined( __LINUX__ ) || defined( __MCUXPRESSO ) +#include +#include +#include +#include +#define memcpy_P memcpy +#define PROGMEM +#else +#include +#endif +// +// GIF Animator +// Written by Larry Bank +// Copyright (c) 2020 BitBank Software, Inc. +// bitbank@pobox.com +// +// Designed to decode images up to 480x320 +// using less than 22K of RAM +// + +/* GIF Defines and variables */ +#define MAX_CHUNK_SIZE 255 +#define LZW_BUF_SIZE (6*MAX_CHUNK_SIZE) +#define LZW_HIGHWATER (4*MAX_CHUNK_SIZE) +#ifdef __LINUX__ +#define MAX_WIDTH 2048 +#else +#define MAX_WIDTH 320 +#endif // __LINUX__ +#define FILE_BUF_SIZE 4096 + +#define PIXEL_FIRST 0 +#define PIXEL_LAST 4096 +#define LINK_UNUSED 5911 // 0x1717 to use memset +#define LINK_END 5912 +#define MAX_HASH 5003 +#define MAXMAXCODE 4096 + +enum { + GIF_PALETTE_RGB565_LE = 0, // little endian (default) + GIF_PALETTE_RGB565_BE, // big endian + GIF_PALETTE_RGB888 // original 24-bpp entries +}; +// for compatibility with older code +#define LITTLE_ENDIAN_PIXELS GIF_PALETTE_RGB565_LE +#define BIG_ENDIAN_PIXELS GIF_PALETTE_RGB565_BE +// +// Draw callback pixel type +// RAW = 8-bit palettized pixels requiring transparent pixel handling +// COOKED = 16 or 24-bpp fully rendered pixels ready for display +// +enum { + GIF_DRAW_RAW = 0, + GIF_DRAW_COOKED +}; + +enum { + GIF_SUCCESS = 0, + GIF_DECODE_ERROR, + GIF_TOO_WIDE, + GIF_INVALID_PARAMETER, + GIF_UNSUPPORTED_FEATURE, + GIF_FILE_NOT_OPEN, + GIF_EARLY_EOF, + GIF_EMPTY_FRAME, + GIF_BAD_FILE, + GIF_ERROR_MEMORY +}; + +typedef struct gif_file_tag +{ + int32_t iPos; // current file position + int32_t iSize; // file size + uint8_t *pData; // memory file pointer + void * fHandle; // class pointer to File/SdFat or whatever you want +} GIFFILE; + +typedef struct gif_info_tag +{ + int32_t iFrameCount; // total frames in file + int32_t iDuration; // duration of animation in milliseconds + int32_t iMaxDelay; // maximum frame delay + int32_t iMinDelay; // minimum frame delay +} GIFINFO; + +typedef struct gif_draw_tag +{ + int iX, iY; // Corner offset of this frame on the canvas + int y; // current line being drawn (0 = top line of image) + int iWidth, iHeight; // size of this frame + void *pUser; // user supplied pointer + uint8_t *pPixels; // 8-bit source pixels for this line + uint16_t *pPalette; // little or big-endian RGB565 palette entries (default) + uint8_t *pPalette24; // RGB888 palette (optional) + uint8_t ucTransparent; // transparent color + uint8_t ucHasTransparency; // flag indicating the transparent color is in use + uint8_t ucDisposalMethod; // frame disposal method + uint8_t ucBackground; // background color + uint8_t ucIsGlobalPalette; // Flag to indicate that a global palette, rather than a local palette is being used +} GIFDRAW; + +// Callback function prototypes +typedef int32_t (GIF_READ_CALLBACK)(GIFFILE *pFile, uint8_t *pBuf, int32_t iLen); +typedef int32_t (GIF_SEEK_CALLBACK)(GIFFILE *pFile, int32_t iPosition); +typedef void (GIF_DRAW_CALLBACK)(GIFDRAW *pDraw); +typedef void * (GIF_OPEN_CALLBACK)(const char *szFilename, int32_t *pFileSize); +typedef void (GIF_CLOSE_CALLBACK)(void *pHandle); +typedef void * (GIF_ALLOC_CALLBACK)(uint32_t iSize); +typedef void (GIF_FREE_CALLBACK)(void *buffer); +// +// our private structure to hold a GIF image decode state +// +typedef struct gif_image_tag +{ + int iWidth, iHeight, iCanvasWidth, iCanvasHeight; + int iX, iY; // GIF corner offset + int iBpp; + int iError; // last error + int iFrameDelay; // delay in milliseconds for this frame + int iRepeatCount; // NETSCAPE animation repeat count. 0=forever + int iXCount, iYCount; // decoding position in image (countdown values) + int iLZWOff; // current LZW data offset + int iLZWSize; // current quantity of data in the LZW buffer + int iCommentPos; // file offset of start of comment data + short sCommentLen; // length of comment + GIF_READ_CALLBACK *pfnRead; + GIF_SEEK_CALLBACK *pfnSeek; + GIF_DRAW_CALLBACK *pfnDraw; + GIF_OPEN_CALLBACK *pfnOpen; + GIF_CLOSE_CALLBACK *pfnClose; + GIFFILE GIFFile; + void *pUser; + unsigned char *pFrameBuffer; + unsigned char *pPixels, *pOldPixels; + unsigned char ucLineBuf[MAX_WIDTH]; // current line + unsigned char ucFileBuf[FILE_BUF_SIZE]; // holds temp data and pixel stack + unsigned short pPalette[384]; // can hold RGB565 or RGB888 - set in begin() + unsigned short pLocalPalette[384]; // color palettes for GIF images + unsigned char ucLZW[LZW_BUF_SIZE]; // holds 6 chunks (6x255) of GIF LZW data packed together + unsigned short usGIFTable[4096]; + unsigned char ucGIFPixels[8192]; + unsigned char bEndOfFrame; + unsigned char ucGIFBits, ucBackground, ucTransparent, ucCodeStart, ucMap, bUseLocalPalette; + unsigned char ucPaletteType; // RGB565 or RGB888 + unsigned char ucDrawType; // RAW or COOKED +} GIFIMAGE; + +#ifdef __cplusplus +// +// The GIF class wraps portable C code which does the actual work +// +class AnimatedGIF +{ + public: + int open(uint8_t *pData, int iDataSize, GIF_DRAW_CALLBACK *pfnDraw); + int openFLASH(uint8_t *pData, int iDataSize, GIF_DRAW_CALLBACK *pfnDraw); + int open(const char *szFilename, GIF_OPEN_CALLBACK *pfnOpen, GIF_CLOSE_CALLBACK *pfnClose, GIF_READ_CALLBACK *pfnRead, GIF_SEEK_CALLBACK *pfnSeek, GIF_DRAW_CALLBACK *pfnDraw); + void close(); + void reset(); + void begin(unsigned char ucPaletteType = GIF_PALETTE_RGB565_LE); + void begin(int iEndian, unsigned char ucPaletteType) { begin(ucPaletteType); }; + int playFrame(bool bSync, int *delayMilliseconds, void *pUser = NULL); + int getCanvasWidth(); + int allocFrameBuf(GIF_ALLOC_CALLBACK *pfnAlloc); + int setDrawType(int iType); + int freeFrameBuf(GIF_FREE_CALLBACK *pfnFree); + uint8_t *getFrameBuf(); + int getCanvasHeight(); + int getLoopCount(); + int getInfo(GIFINFO *pInfo); + int getLastError(); + int getComment(char *destBuffer); + + private: + GIFIMAGE _gif; +}; +#else +// C interface + int GIF_openRAM(GIFIMAGE *pGIF, uint8_t *pData, int iDataSize, GIF_DRAW_CALLBACK *pfnDraw); + int GIF_openFile(GIFIMAGE *pGIF, const char *szFilename, GIF_DRAW_CALLBACK *pfnDraw); + void GIF_close(GIFIMAGE *pGIF); + void GIF_begin(GIFIMAGE *pGIF, unsigned char ucPaletteType); + void GIF_reset(GIFIMAGE *pGIF); + int GIF_playFrame(GIFIMAGE *pGIF, int *delayMilliseconds, void *pUser); + int GIF_getCanvasWidth(GIFIMAGE *pGIF); + int GIF_getCanvasHeight(GIFIMAGE *pGIF); + int GIF_getComment(GIFIMAGE *pGIF, char *destBuffer); + int GIF_getInfo(GIFIMAGE *pGIF, GIFINFO *pInfo); + int GIF_getLastError(GIFIMAGE *pGIF); + int GIF_getLoopCount(GIFIMAGE *pGIF); +#endif // __cplusplus + +// Due to unaligned memory causing an exception, we have to do these macros the slow way +#define INTELSHORT(p) ((*p) + (*(p+1)<<8)) +#define INTELLONG(p) ((*p) + (*(p+1)<<8) + (*(p+2)<<16) + (*(p+3)<<24)) +#define MOTOSHORT(p) (((*(p))<<8) + (*(p+1))) +#define MOTOLONG(p) (((*p)<<24) + ((*(p+1))<<16) + ((*(p+2))<<8) + (*(p+3))) + +// Must be a 32-bit target processor +#define REGISTER_WIDTH 32 + +#endif // __ANIMATEDGIF__ diff --git a/shared-module/displayio/AnimatedGIF_circuitpy.h b/lib/AnimatedGIF/AnimatedGIF_circuitpy.h similarity index 99% rename from shared-module/displayio/AnimatedGIF_circuitpy.h rename to lib/AnimatedGIF/AnimatedGIF_circuitpy.h index f81108695c..e401935a95 100644 --- a/shared-module/displayio/AnimatedGIF_circuitpy.h +++ b/lib/AnimatedGIF/AnimatedGIF_circuitpy.h @@ -9,6 +9,9 @@ // See the License for the specific language governing permissions and // limitations under the License. // =========================================================================== +// +// Modified 2023 by Mark Komus to work for CircuitPython +// #ifndef __ANIMATEDGIF__ #define __ANIMATEDGIF__ diff --git a/lib/AnimatedGIF/README.md b/lib/AnimatedGIF/README.md new file mode 100644 index 0000000000..25b8cd59b7 --- /dev/null +++ b/lib/AnimatedGIF/README.md @@ -0,0 +1,5 @@ +This library is from the AnimatedGIF Arduino GIF decoder by Larry Bank. +Released under the Apache License 2.0 +[AnimatedGIF](https://github.com/bitbank2/AnimatedGIF) + +It has been modified for use in CircuitPython by Mark Komus. diff --git a/shared-module/displayio/gif.c b/lib/AnimatedGIF/gif.c similarity index 60% rename from shared-module/displayio/gif.c rename to lib/AnimatedGIF/gif.c index a4ad31608d..00a0137562 100644 --- a/shared-module/displayio/gif.c +++ b/lib/AnimatedGIF/gif.c @@ -17,14 +17,12 @@ // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. // See the License for the specific language governing permissions and // limitations under the License. -// =========================================================================== -#define __LINUX__ +//=========================================================================== +// +// Modified 2023 by Mark Komus to work for CircuitPython +// #include "AnimatedGIF_circuitpy.h" -#include "py/mperrno.h" -#include "py/runtime.h" - - #ifdef HAL_ESP32_HAL_H_ #define memcpy_P memcpy #endif @@ -40,13 +38,16 @@ static int DecodeLZW(GIFIMAGE *pImage, int iOptions); static int32_t readMem(GIFFILE *pFile, uint8_t *pBuf, int32_t iLen); static int32_t seekMem(GIFFILE *pFile, int32_t iPosition); int GIF_getInfo(GIFIMAGE *pPage, GIFINFO *pInfo); -#if defined(PICO_BUILD) || defined(__LINUX__) || defined(__MCUXPRESSO) + +#if defined ( __LINUX__ ) || defined( __MCUXPRESSO ) static int32_t readFile(GIFFILE *pFile, uint8_t *pBuf, int32_t iLen); static int32_t seekFile(GIFFILE *pFile, int32_t iPosition); static void closeFile(void *handle); +#endif // C API -int GIF_openRAM(GIFIMAGE *pGIF, uint8_t *pData, int iDataSize, GIF_DRAW_CALLBACK *pfnDraw) { +int GIF_openRAM(GIFIMAGE *pGIF, uint8_t *pData, int iDataSize, GIF_DRAW_CALLBACK *pfnDraw) +{ pGIF->iError = GIF_SUCCESS; pGIF->pfnRead = readMem; pGIF->pfnSeek = seekMem; @@ -59,7 +60,8 @@ int GIF_openRAM(GIFIMAGE *pGIF, uint8_t *pData, int iDataSize, GIF_DRAW_CALLBACK } /* GIF_openRAM() */ #ifdef __LINUX__ -int GIF_openFile(GIFIMAGE *pGIF, const char *szFilename, GIF_DRAW_CALLBACK *pfnDraw) { +int GIF_openFile(GIFIMAGE *pGIF, const char *szFilename, GIF_DRAW_CALLBACK *pfnDraw) +{ pGIF->iError = GIF_SUCCESS; pGIF->pfnRead = readFile; pGIF->pfnSeek = seekFile; @@ -67,9 +69,8 @@ int GIF_openFile(GIFIMAGE *pGIF, const char *szFilename, GIF_DRAW_CALLBACK *pfnD pGIF->pfnOpen = NULL; pGIF->pfnClose = closeFile; pGIF->GIFFile.fHandle = fopen(szFilename, "r+b"); - if (pGIF->GIFFile.fHandle == NULL) { - return 0; - } + if (pGIF->GIFFile.fHandle == NULL) + return 0; fseek((FILE *)pGIF->GIFFile.fHandle, 0, SEEK_END); pGIF->GIFFile.iSize = (int)ftell((FILE *)pGIF->GIFFile.fHandle); fseek((FILE *)pGIF->GIFFile.fHandle, 0, SEEK_SET); @@ -77,18 +78,20 @@ int GIF_openFile(GIFIMAGE *pGIF, const char *szFilename, GIF_DRAW_CALLBACK *pfnD } /* GIF_openFile() */ #endif -void GIF_close(GIFIMAGE *pGIF) { - if (pGIF->pfnClose) { +void GIF_close(GIFIMAGE *pGIF) +{ + if (pGIF->pfnClose) (*pGIF->pfnClose)(pGIF->GIFFile.fHandle); - } } /* GIF_close() */ -void GIF_begin(GIFIMAGE *pGIF, unsigned char ucPaletteType) { +void GIF_begin(GIFIMAGE *pGIF, unsigned char ucPaletteType) +{ memset(pGIF, 0, sizeof(GIFIMAGE)); pGIF->ucPaletteType = ucPaletteType; } /* GIF_begin() */ -void GIF_reset(GIFIMAGE *pGIF) { +void GIF_reset(GIFIMAGE *pGIF) +{ (*pGIF->pfnSeek)(&pGIF->GIFFile, 0); } /* GIF_reset() */ @@ -98,48 +101,53 @@ void GIF_reset(GIFIMAGE *pGIF) { // 0 = good decode, no more frames // -1 = error // -int GIF_playFrame(GIFIMAGE *pGIF, int *delayMilliseconds, void *pUser) { - int rc; +int GIF_playFrame(GIFIMAGE *pGIF, int *delayMilliseconds, void *pUser) +{ +int rc; - if (delayMilliseconds) { - *delayMilliseconds = 0; // clear any old valid - } - if (pGIF->GIFFile.iPos >= pGIF->GIFFile.iSize - 1) { // no more data exists + if (delayMilliseconds) + *delayMilliseconds = 0; // clear any old valid + if (pGIF->GIFFile.iPos >= pGIF->GIFFile.iSize-1) // no more data exists + { (*pGIF->pfnSeek)(&pGIF->GIFFile, 0); // seek to start } - if (GIFParseInfo(pGIF, 0)) { + if (GIFParseInfo(pGIF, 0)) + { pGIF->pUser = pUser; - if (pGIF->iError == GIF_EMPTY_FRAME) { // don't try to decode it + if (pGIF->iError == GIF_EMPTY_FRAME) // don't try to decode it return 0; - } rc = DecodeLZW(pGIF, 0); - if (rc != 0) { // problem + if (rc != 0) // problem return 0; - } - } else { + } + else + { return 0; // error parsing the frame info, we may be at the end of the file } // Return 1 for more frames or 0 if this was the last frame - if (delayMilliseconds) { // if not NULL, return the frame delay time + if (delayMilliseconds) // if not NULL, return the frame delay time *delayMilliseconds = pGIF->iFrameDelay; - } - return pGIF->GIFFile.iPos < pGIF->GIFFile.iSize - 1; + return (pGIF->GIFFile.iPos < pGIF->GIFFile.iSize-1); } /* GIF_playFrame() */ -int GIF_getCanvasWidth(GIFIMAGE *pGIF) { +int GIF_getCanvasWidth(GIFIMAGE *pGIF) +{ return pGIF->iCanvasWidth; } /* GIF_getCanvasWidth() */ -int GIF_getCanvasHeight(GIFIMAGE *pGIF) { +int GIF_getCanvasHeight(GIFIMAGE *pGIF) +{ return pGIF->iCanvasHeight; } /* GIF_getCanvasHeight() */ -int GIF_getLoopCount(GIFIMAGE *pGIF) { +int GIF_getLoopCount(GIFIMAGE *pGIF) +{ return pGIF->iRepeatCount; } /* GIF_getLoopCount() */ -int GIF_getComment(GIFIMAGE *pGIF, char *pDest) { - int32_t iOldPos; +int GIF_getComment(GIFIMAGE *pGIF, char *pDest) +{ +int32_t iOldPos; iOldPos = pGIF->GIFFile.iPos; // keep old position (*pGIF->pfnSeek)(&pGIF->GIFFile, pGIF->iCommentPos); @@ -150,7 +158,8 @@ int GIF_getComment(GIFIMAGE *pGIF, char *pDest) { } /* GIF_getComment() */ -int GIF_getLastError(GIFIMAGE *pGIF) { +int GIF_getLastError(GIFIMAGE *pGIF) +{ return pGIF->iError; } /* GIF_getLastError() */ @@ -158,26 +167,24 @@ int GIF_init(GIFIMAGE *pGIF) { return GIFInit(pGIF); } -#endif // !__cplusplus // // Helper functions for memory based images // -static int32_t readMem(GIFFILE *pFile, uint8_t *pBuf, int32_t iLen) { +static int32_t readMem(GIFFILE *pFile, uint8_t *pBuf, int32_t iLen) +{ int32_t iBytesRead; iBytesRead = iLen; - if ((pFile->iSize - pFile->iPos) < iLen) { - iBytesRead = pFile->iSize - pFile->iPos; - } - if (iBytesRead <= 0) { - return 0; - } + if ((pFile->iSize - pFile->iPos) < iLen) + iBytesRead = pFile->iSize - pFile->iPos; + if (iBytesRead <= 0) + return 0; memmove(pBuf, &pFile->pData[pFile->iPos], iBytesRead); pFile->iPos += iBytesRead; return iBytesRead; } /* readMem() */ -/* +#ifndef CIRCUITPY static int32_t readFLASH(GIFFILE *pFile, uint8_t *pBuf, int32_t iLen) { int32_t iBytesRead; @@ -190,44 +197,41 @@ static int32_t readFLASH(GIFFILE *pFile, uint8_t *pBuf, int32_t iLen) memcpy_P(pBuf, &pFile->pData[pFile->iPos], iBytesRead); pFile->iPos += iBytesRead; return iBytesRead; -} *//* readFLASH() */ +} /* readFLASH() */ +#endif -static int32_t seekMem(GIFFILE *pFile, int32_t iPosition) { - if (iPosition < 0) { - iPosition = 0; - } else if (iPosition >= pFile->iSize) { - iPosition = pFile->iSize - 1; - } +static int32_t seekMem(GIFFILE *pFile, int32_t iPosition) +{ + if (iPosition < 0) iPosition = 0; + else if (iPosition >= pFile->iSize) iPosition = pFile->iSize-1; pFile->iPos = iPosition; return iPosition; } /* seekMem() */ -#if defined(__LINUX__) || defined(__MCUXPRESSO) -static void closeFile(void *handle) { +#if defined ( __LINUX__ ) || defined( __MCUXPRESSO ) +static void closeFile(void *handle) +{ fclose((FILE *)handle); } /* closeFile() */ -static int32_t seekFile(GIFFILE *pFile, int32_t iPosition) { - if (iPosition < 0) { - iPosition = 0; - } else if (iPosition >= pFile->iSize) { - iPosition = pFile->iSize - 1; - } +static int32_t seekFile(GIFFILE *pFile, int32_t iPosition) +{ + if (iPosition < 0) iPosition = 0; + else if (iPosition >= pFile->iSize) iPosition = pFile->iSize-1; pFile->iPos = iPosition; fseek((FILE *)pFile->fHandle, iPosition, SEEK_SET); return iPosition; } /* seekMem() */ -static int32_t readFile(GIFFILE *pFile, uint8_t *pBuf, int32_t iLen) { +static int32_t readFile(GIFFILE *pFile, uint8_t *pBuf, int32_t iLen) +{ int32_t iBytesRead; iBytesRead = iLen; - if ((pFile->iSize - pFile->iPos) < iLen) { - iBytesRead = pFile->iSize - pFile->iPos; - } - if (iBytesRead <= 0) { - return 0; - } + if ((pFile->iSize - pFile->iPos) < iLen) + iBytesRead = pFile->iSize - pFile->iPos; + if (iBytesRead <= 0) + return 0; iBytesRead = (int)fread(pBuf, 1, iBytesRead, (FILE *)pFile->fHandle); pFile->iPos += iBytesRead; return iBytesRead; @@ -243,17 +247,17 @@ static int32_t readFile(GIFFILE *pFile, uint8_t *pBuf, int32_t iLen) { // returns 1 for success, 0 for failure // Fills in the canvas size of the GIFIMAGE structure // -static int GIFInit(GIFIMAGE *pGIF) { +static int GIFInit(GIFIMAGE *pGIF) +{ pGIF->GIFFile.iPos = 0; // start at beginning of file - if (!GIFParseInfo(pGIF, 1)) { // gather info for the first frame - return 0; // something went wrong; not a GIF file? - } + if (!GIFParseInfo(pGIF, 1)) // gather info for the first frame + return 0; // something went wrong; not a GIF file? (*pGIF->pfnSeek)(&pGIF->GIFFile, 0); // seek back to start of the file if (pGIF->iCanvasWidth > MAX_WIDTH) { // need to allocate more space pGIF->iError = GIF_TOO_WIDE; return 0; } - return 1; + return 1; } /* GIFInit() */ // @@ -262,7 +266,8 @@ static int GIFInit(GIFIMAGE *pGIF) { // and return the canvas size only // Returns 1 for success, 0 for failure // -static int GIFParseInfo(GIFIMAGE *pPage, int bInfoOnly) { +static int GIFParseInfo(GIFIMAGE *pPage, int bInfoOnly) +{ int i, j, iColorTableBits; int iBytesRead; unsigned char c, *p; @@ -276,92 +281,97 @@ static int GIFParseInfo(GIFIMAGE *pPage, int bInfoOnly) { pPage->iRepeatCount = -1; // assume NETSCAPE loop count is not specified iReadSize = (bInfoOnly) ? 12 : MAX_CHUNK_SIZE; // If you try to read past the EOF, the SD lib will return garbage data - if (iStartPos + iReadSize > pPage->GIFFile.iSize) { - iReadSize = (pPage->GIFFile.iSize - iStartPos - 1); - } + if (iStartPos + iReadSize > pPage->GIFFile.iSize) + iReadSize = (pPage->GIFFile.iSize - iStartPos - 1); p = pPage->ucFileBuf; - iBytesRead = (*pPage->pfnRead)(&pPage->GIFFile, pPage->ucFileBuf, iReadSize); // 255 is plenty for now + iBytesRead = (*pPage->pfnRead)(&pPage->GIFFile, pPage->ucFileBuf, iReadSize); // 255 is plenty for now - if (iBytesRead != iReadSize) { // we're at the end of the file - pPage->iError = GIF_EARLY_EOF; - return 0; + if (iBytesRead != iReadSize) // we're at the end of the file + { + pPage->iError = GIF_EARLY_EOF; + return 0; } - if (iStartPos == 0) { // start of the file - // canvas size - if (memcmp(p, "GIF89", 5) != 0 && memcmp(p, "GIF87", 5) != 0) { // not a GIF file - pPage->iError = GIF_BAD_FILE; - return 0; + if (iStartPos == 0) // start of the file + { // canvas size + if (memcmp(p, "GIF89", 5) != 0 && memcmp(p, "GIF87", 5) != 0) // not a GIF file + { + pPage->iError = GIF_BAD_FILE; + return 0; } pPage->iCanvasWidth = pPage->iWidth = INTELSHORT(&p[6]); pPage->iCanvasHeight = pPage->iHeight = INTELSHORT(&p[8]); pPage->iBpp = ((p[10] & 0x70) >> 4) + 1; - if (bInfoOnly) { - return 1; // we've got the info we needed, leave - } + if (bInfoOnly) + return 1; // we've got the info we needed, leave iColorTableBits = (p[10] & 7) + 1; // Log2(size) of the color table pPage->ucBackground = p[11]; // background color pPage->ucGIFBits = 0; iOffset = 13; - if (p[10] & 0x80) { // global color table? - // by default, convert to byte-reversed RGB565 for immediate use + if (p[10] & 0x80) // global color table? + { // by default, convert to byte-reversed RGB565 for immediate use // Read enough additional data for the color table - iBytesRead += (*pPage->pfnRead)(&pPage->GIFFile, &pPage->ucFileBuf[iBytesRead], 3 * (1 << iColorTableBits)); - if (pPage->ucPaletteType == GIF_PALETTE_RGB565_LE || pPage->ucPaletteType == GIF_PALETTE_RGB565_BE) { - for (i = 0; i < (1 << iColorTableBits); i++) + iBytesRead += (*pPage->pfnRead)(&pPage->GIFFile, &pPage->ucFileBuf[iBytesRead], 3*(1<ucPaletteType == GIF_PALETTE_RGB565_LE || pPage->ucPaletteType == GIF_PALETTE_RGB565_BE) + { + for (i=0; i<(1<> 3) << 11); // R - usRGB565 |= ((p[iOffset + 1] >> 2) << 5); // G - usRGB565 |= (p[iOffset + 2] >> 3); // B - if (pPage->ucPaletteType == GIF_PALETTE_RGB565_LE) { + usRGB565 |= ((p[iOffset+1] >> 2) << 5); // G + usRGB565 |= (p[iOffset+2] >> 3); // B + if (pPage->ucPaletteType == GIF_PALETTE_RGB565_LE) pPage->pPalette[i] = usRGB565; - } else { + else pPage->pPalette[i] = __builtin_bswap16(usRGB565); // SPI wants MSB first - } iOffset += 3; } - } else { // just copy it as-is - memcpy(pPage->pPalette, &p[iOffset], (1 << iColorTableBits) * 3); + } + else // just copy it as-is + { + memcpy(pPage->pPalette, &p[iOffset], (1<ucGIFBits = p[iOffset + 1]; // packed fields - pPage->iFrameDelay = (INTELSHORT(&p[iOffset + 2])) * 10; // delay in ms - if (pPage->iFrameDelay <= 1) { // 0-1 is going to make it run at 60fps; use 100 (10fps) as a reasonable substitute - pPage->iFrameDelay = 100; - } - if (pPage->ucGIFBits & 1) { // transparent color is used - pPage->ucTransparent = p[iOffset + 4]; // transparent color index - } + if (p[iOffset] == 4) // correct length + { + pPage->ucGIFBits = p[iOffset+1]; // packed fields + pPage->iFrameDelay = (INTELSHORT(&p[iOffset+2]))*10; // delay in ms + if (pPage->iFrameDelay <= 1) // 0-1 is going to make it run at 60fps; use 100 (10fps) as a reasonable substitute + pPage->iFrameDelay = 100; + if (pPage->ucGIFBits & 1) // transparent color is used + pPage->ucTransparent = p[iOffset+4]; // transparent color index iOffset += 6; } // else // error break; case 0xff: /* App extension */ c = 1; - while (c) { /* Skip all data sub-blocks */ + while (c) /* Skip all data sub-blocks */ + { c = p[iOffset++]; /* Block length */ - if ((iBytesRead - iOffset) < (c + 32)) { // need to read more data first - memmove(pPage->ucFileBuf, &pPage->ucFileBuf[iOffset], (iBytesRead - iOffset)); // move existing data down + if ((iBytesRead - iOffset) < (c+32)) // need to read more data first + { + memmove(pPage->ucFileBuf, &pPage->ucFileBuf[iOffset], (iBytesRead-iOffset)); // move existing data down iBytesRead -= iOffset; iStartPos += iOffset; iOffset = 0; - iBytesRead += (*pPage->pfnRead)(&pPage->GIFFile, &pPage->ucFileBuf[iBytesRead], c + 32); + iBytesRead += (*pPage->pfnRead)(&pPage->GIFFile, &pPage->ucFileBuf[iBytesRead], c+32); } - if (c == 11) { // fixed block length - // Netscape app block contains the repeat count - if (memcmp(&p[iOffset], "NETSCAPE2.0", 11) == 0) { - if (p[iOffset + 11] == 3 && p[iOffset + 12] == 1) { // loop count - pPage->iRepeatCount = INTELSHORT(&p[iOffset + 13]); - } + if (c == 11) // fixed block length + { // Netscape app block contains the repeat count + if (memcmp(&p[iOffset], "NETSCAPE2.0", 11) == 0) + { + if (p[iOffset+11] == 3 && p[iOffset+12] == 1) // loop count + pPage->iRepeatCount = INTELSHORT(&p[iOffset+13]); } } iOffset += (int)c; /* Skip to next sub-block */ @@ -370,13 +380,14 @@ static int GIFParseInfo(GIFIMAGE *pPage, int bInfoOnly) { case 0x01: /* Text extension */ c = 1; j = 0; - while (c) { /* Skip all data sub-blocks */ + while (c) /* Skip all data sub-blocks */ + { c = p[iOffset++]; /* Block length */ - if (j == 0) { // use only first block + if (j == 0) // use only first block + { j = c; - if (j > 127) { // max comment length = 127 + if (j > 127) // max comment length = 127 j = 127; - } // memcpy(pPage->szInfo1, &p[iOffset], j); // pPage->szInfo1[j] = '\0'; j = 1; @@ -386,16 +397,19 @@ static int GIFParseInfo(GIFIMAGE *pPage, int bInfoOnly) { break; case 0xfe: /* Comment */ c = 1; - while (c) { /* Skip all data sub-blocks */ + while (c) /* Skip all data sub-blocks */ + { c = p[iOffset++]; /* Block length */ - if ((iBytesRead - iOffset) < (c + 32)) { // need to read more data first - memmove(pPage->ucFileBuf, &pPage->ucFileBuf[iOffset], (iBytesRead - iOffset)); // move existing data down + if ((iBytesRead - iOffset) < (c+32)) // need to read more data first + { + memmove(pPage->ucFileBuf, &pPage->ucFileBuf[iOffset], (iBytesRead-iOffset)); // move existing data down iBytesRead -= iOffset; iStartPos += iOffset; iOffset = 0; - iBytesRead += (*pPage->pfnRead)(&pPage->GIFFile, &pPage->ucFileBuf[iBytesRead], c + 32); + iBytesRead += (*pPage->pfnRead)(&pPage->GIFFile, &pPage->ucFileBuf[iBytesRead], c+32); } - if (pPage->iCommentPos == 0) { // Save first block info + if (pPage->iCommentPos == 0) // Save first block info + { pPage->iCommentPos = iStartPos + iOffset; pPage->sCommentLen = c; } @@ -407,13 +421,14 @@ static int GIFParseInfo(GIFIMAGE *pPage, int bInfoOnly) { pPage->iError = GIF_DECODE_ERROR; return 0; } /* switch */ - } else { // invalid byte, stop decoding - if (pPage->GIFFile.iSize - iStartPos < 32) { // non-image bytes at end of file? + } + else // invalid byte, stop decoding + { + if (pPage->GIFFile.iSize - iStartPos < 32) // non-image bytes at end of file? pPage->iError = GIF_EMPTY_FRAME; - } else { + else /* Bad header info */ pPage->iError = GIF_DECODE_ERROR; - } return 0; } } /* while */ @@ -422,14 +437,13 @@ static int GIFParseInfo(GIFIMAGE *pPage, int bInfoOnly) { return 1; } - if (p[iOffset] == ',') { + if (p[iOffset] == ',') iOffset++; - } // This particular frame's size and position on the main frame (if animated) pPage->iX = INTELSHORT(&p[iOffset]); - pPage->iY = INTELSHORT(&p[iOffset + 2]); - pPage->iWidth = INTELSHORT(&p[iOffset + 4]); - pPage->iHeight = INTELSHORT(&p[iOffset + 6]); + pPage->iY = INTELSHORT(&p[iOffset+2]); + pPage->iWidth = INTELSHORT(&p[iOffset+4]); + pPage->iHeight = INTELSHORT(&p[iOffset+6]); iOffset += 8; /* Image descriptor @@ -440,28 +454,30 @@ static int GIFParseInfo(GIFIMAGE *pPage, int bInfoOnly) { pixel+1 = # bits per pixel for this image */ pPage->ucMap = p[iOffset++]; - if (pPage->ucMap & 0x80) { // local color table? - // by default, convert to byte-reversed RGB565 for immediate use - j = (1 << ((pPage->ucMap & 7) + 1)); + if (pPage->ucMap & 0x80) // local color table? + {// by default, convert to byte-reversed RGB565 for immediate use + j = (1<<((pPage->ucMap & 7)+1)); // Read enough additional data for the color table - iBytesRead += (*pPage->pfnRead)(&pPage->GIFFile, &pPage->ucFileBuf[iBytesRead], j *3); - if (pPage->ucPaletteType == GIF_PALETTE_RGB565_LE || pPage->ucPaletteType == GIF_PALETTE_RGB565_BE) { - for (i = 0; i < j; i++) + iBytesRead += (*pPage->pfnRead)(&pPage->GIFFile, &pPage->ucFileBuf[iBytesRead], j*3); + if (pPage->ucPaletteType == GIF_PALETTE_RGB565_LE || pPage->ucPaletteType == GIF_PALETTE_RGB565_BE) + { + for (i=0; i> 3) << 11); // R - usRGB565 |= ((p[iOffset + 1] >> 2) << 5); // G - usRGB565 |= (p[iOffset + 2] >> 3); // B - if (pPage->ucPaletteType == GIF_PALETTE_RGB565_LE) { + usRGB565 |= ((p[iOffset+1] >> 2) << 5); // G + usRGB565 |= (p[iOffset+2] >> 3); // B + if (pPage->ucPaletteType == GIF_PALETTE_RGB565_LE) pPage->pLocalPalette[i] = usRGB565; - } else { + else pPage->pLocalPalette[i] = __builtin_bswap16(usRGB565); // SPI wants MSB first - } iOffset += 3; } - } else { // just copy it as-is + } + else // just copy it as-is + { memcpy(pPage->pLocalPalette, &p[iOffset], j * 3); - iOffset += j * 3; + iOffset += j*3; } pPage->bUseLocalPalette = 1; } @@ -470,40 +486,45 @@ static int GIFParseInfo(GIFIMAGE *pPage, int bInfoOnly) { pPage->iBpp = cGIFBits[pPage->ucCodeStart]; // we are re-using the same buffer turning GIF file data // into "pure" LZW - pPage->iLZWSize = 0; // we're starting with no LZW data yet - c = 1; // get chunk length - while (c && iOffset < iBytesRead) { + pPage->iLZWSize = 0; // we're starting with no LZW data yet + c = 1; // get chunk length + while (c && iOffset < iBytesRead) + { // Serial.printf("iOffset=%d, iBytesRead=%d\n", iOffset, iBytesRead); - c = p[iOffset++]; // get chunk length + c = p[iOffset++]; // get chunk length // Serial.printf("Chunk size = %d\n", c); - if (c <= (iBytesRead - iOffset)) { - memcpy(&pPage->ucLZW[pPage->iLZWSize], &p[iOffset], c); - pPage->iLZWSize += c; - iOffset += c; - } else { // partial chunk in our buffer - int iPartialLen = (iBytesRead - iOffset); - memcpy(&pPage->ucLZW[pPage->iLZWSize], &p[iOffset], iPartialLen); - pPage->iLZWSize += iPartialLen; - iOffset += iPartialLen; - (*pPage->pfnRead)(&pPage->GIFFile, &pPage->ucLZW[pPage->iLZWSize], c - iPartialLen); - pPage->iLZWSize += (c - iPartialLen); - } - if (c == 0) { - pPage->bEndOfFrame = 1; // signal not to read beyond the end of the frame - } - } + if (c <= (iBytesRead - iOffset)) + { + memcpy(&pPage->ucLZW[pPage->iLZWSize], &p[iOffset], c); + pPage->iLZWSize += c; + iOffset += c; + } + else // partial chunk in our buffer + { + int iPartialLen = (iBytesRead - iOffset); + memcpy(&pPage->ucLZW[pPage->iLZWSize], &p[iOffset], iPartialLen); + pPage->iLZWSize += iPartialLen; + iOffset += iPartialLen; + (*pPage->pfnRead)(&pPage->GIFFile, &pPage->ucLZW[pPage->iLZWSize], c - iPartialLen); + pPage->iLZWSize += (c - iPartialLen); + } + if (c == 0) + pPage->bEndOfFrame = 1; // signal not to read beyond the end of the frame + } // seeking on an SD card is VERY VERY SLOW, so use the data we've already read by de-chunking it // in this case, there's too much data, so we have to seek backwards a bit - if (iOffset < iBytesRead) { + if (iOffset < iBytesRead) + { // Serial.printf("Need to seek back %d bytes\n", iBytesRead - iOffset); - (*pPage->pfnSeek)(&pPage->GIFFile, iStartPos + iOffset); // position file to new spot - } + (*pPage->pfnSeek)(&pPage->GIFFile, iStartPos + iOffset); // position file to new spot + } return 1; // we are now at the start of the chunk data } /* GIFParseInfo() */ // // Gather info about an animated GIF file // -int GIF_getInfo(GIFIMAGE *pPage, GIFINFO *pInfo) { +int GIF_getInfo(GIFIMAGE *pPage, GIFINFO *pInfo) +{ int iOff, iNumFrames; int iDelay, iMaxDelay, iMinDelay, iTotalDelay; int iReadAmount; @@ -518,7 +539,7 @@ int GIF_getInfo(GIFIMAGE *pPage, GIFINFO *pInfo) { iMinDelay = 10000; iNumFrames = 1; iDataRemaining = pPage->GIFFile.iSize; - cBuf = (uint8_t *)pPage->ucFileBuf; + cBuf = (uint8_t *) pPage->ucFileBuf; (*pPage->pfnSeek)(&pPage->GIFFile, 0); iDataAvailable = (*pPage->pfnRead)(&pPage->GIFFile, cBuf, FILE_BUF_SIZE); iDataRemaining -= iDataAvailable; @@ -526,68 +547,72 @@ int GIF_getInfo(GIFIMAGE *pPage, GIFINFO *pInfo) { iOff = 10; c = cBuf[iOff]; // get info bits iOff += 3; /* Skip flags, background color & aspect ratio */ - if (c & 0x80) { /* Deal with global color table */ + if (c & 0x80) /* Deal with global color table */ + { c &= 7; /* Get the number of colors defined */ - iOff += (2 << c) * 3; /* skip color table */ + iOff += (2<pfnRead)(&pPage->GIFFile, &cBuf[iDataAvailable], FILE_BUF_SIZE - iDataAvailable); + iReadAmount = (*pPage->pfnRead)(&pPage->GIFFile, &cBuf[iDataAvailable], FILE_BUF_SIZE-iDataAvailable); iDataAvailable += iReadAmount; iDataRemaining -= iReadAmount; lFileOff += iReadAmount; } - switch (cBuf[iOff]) + switch(cBuf[iOff]) { case 0x3b: /* End of file */ /* we were fooled into thinking there were more pages */ iNumFrames--; goto gifpagesz; - // F9 = Graphic Control Extension (fixed length of 4 bytes) - // FE = Comment Extension - // FF = Application Extension - // 01 = Plain Text Extension + // F9 = Graphic Control Extension (fixed length of 4 bytes) + // FE = Comment Extension + // FF = Application Extension + // 01 = Plain Text Extension case 0x21: /* Extension block */ - if (cBuf[iOff + 1] == 0xf9 && cBuf[iOff + 2] == 4) { // Graphic Control Extension - // cBuf[iOff+3]; // page disposition flags - iDelay = cBuf[iOff + 4]; // delay low byte - iDelay |= ((uint16_t)(cBuf[iOff + 5]) << 8); // delay high byte - if (iDelay < 2) { // too fast, provide a default + if (cBuf[iOff+1] == 0xf9 && cBuf[iOff+2] == 4) // Graphic Control Extension + { + //cBuf[iOff+3]; // page disposition flags + iDelay = cBuf[iOff+4]; // delay low byte + iDelay |= ((uint16_t)(cBuf[iOff+5]) << 8); // delay high byte + if (iDelay < 2) // too fast, provide a default iDelay = 2; - } iDelay *= 10; // turn JIFFIES into milliseconds iTotalDelay += iDelay; - if (iDelay > iMaxDelay) { - iMaxDelay = iDelay; - } else if (iDelay < iMinDelay) { - iMinDelay = iDelay; - } - // (cBuf[iOff+6]; // transparent color index + if (iDelay > iMaxDelay) iMaxDelay = iDelay; + else if (iDelay < iMinDelay) iMinDelay = iDelay; + // (cBuf[iOff+6]; // transparent color index } iOff += 2; /* skip to length */ iOff += (int)cBuf[iOff]; /* Skip the data block */ iOff++; - // block terminator or optional sub blocks + // block terminator or optional sub blocks c = cBuf[iOff++]; /* Skip any sub-blocks */ - while (c) { - iOff += (int)c; - c = cBuf[iOff++]; - if ((iDataAvailable - iOff) < (c + 258)) { // need to read more data first - memmove(cBuf, &cBuf[iOff], (iDataAvailable - iOff)); // move existing data down + while (c) + { + iOff += (int)c; + c = cBuf[iOff++]; + if ((iDataAvailable - iOff) < (c+258)) // need to read more data first + { + memmove(cBuf, &cBuf[iOff], (iDataAvailable-iOff)); // move existing data down iDataAvailable -= iOff; iOff = 0; - iReadAmount = (*pPage->pfnRead)(&pPage->GIFFile, &cBuf[iDataAvailable], FILE_BUF_SIZE - iDataAvailable); + iReadAmount = (*pPage->pfnRead)(&pPage->GIFFile, &cBuf[iDataAvailable], FILE_BUF_SIZE-iDataAvailable); iDataAvailable += iReadAmount; iDataRemaining -= iReadAmount; lFileOff += iReadAmount; } } - if (c != 0) { // problem, we went past the end + if (c != 0) // problem, we went past the end + { iNumFrames--; // possible corrupt data; stop goto gifpagesz; } @@ -596,47 +621,51 @@ int GIF_getInfo(GIFIMAGE *pPage, GIFINFO *pInfo) { bExt = 0; /* Stop doing extension blocks */ break; default: - /* Corrupt data, stop here */ + /* Corrupt data, stop here */ iNumFrames--; goto gifpagesz; } // switch } // while - if (iOff >= iDataAvailable) { // problem - iNumFrames--; // possible corrupt data; stop - goto gifpagesz; + if (iOff >= iDataAvailable) // problem + { + iNumFrames--; // possible corrupt data; stop + goto gifpagesz; } - /* Start of image data */ - c = cBuf[iOff + 9]; /* Get the flags byte */ + /* Start of image data */ + c = cBuf[iOff+9]; /* Get the flags byte */ iOff += 10; /* Skip image position and size */ - if (c & 0x80) { /* Local color table */ + if (c & 0x80) /* Local color table */ + { c &= 7; - iOff += (2 << c) * 3; + iOff += (2<pfnRead)(&pPage->GIFFile, &cBuf[iDataAvailable], FILE_BUF_SIZE - iDataAvailable); - iDataAvailable += iReadAmount; - iDataRemaining -= iReadAmount; - lFileOff += iReadAmount; - } + if ((iDataAvailable - iOff) < (c+258)) // need to read more data first + { + if (iOff < iDataAvailable) { + memmove(cBuf, &cBuf[iOff], (iDataAvailable-iOff)); // move existing data down + iDataAvailable -= iOff; + iOff = 0; + } else { // already points beyond end + iOff -= iDataAvailable; + iDataAvailable = 0; + } + iReadAmount = (*pPage->pfnRead)(&pPage->GIFFile, &cBuf[iDataAvailable], FILE_BUF_SIZE-iDataAvailable); + iDataAvailable += iReadAmount; + iDataRemaining -= iReadAmount; + lFileOff += iReadAmount; + } c = cBuf[iOff++]; - while (c) { /* While there are more data blocks */ - if (iOff > (3 * FILE_BUF_SIZE / 4) && iDataRemaining > 0) { /* Near end of buffer, re-align */ - memmove(cBuf, &cBuf[iOff], (iDataAvailable - iOff)); // move existing data down + while (c) /* While there are more data blocks */ + { + if (iOff > (3*FILE_BUF_SIZE/4) && iDataRemaining > 0) /* Near end of buffer, re-align */ + { + memmove(cBuf, &cBuf[iOff], (iDataAvailable-iOff)); // move existing data down iDataAvailable -= iOff; iOff = 0; iReadAmount = (FILE_BUF_SIZE - iDataAvailable); - if (iReadAmount > iDataRemaining) { + if (iReadAmount > iDataRemaining) iReadAmount = iDataRemaining; - } iReadAmount = (*pPage->pfnRead)(&pPage->GIFFile, &cBuf[iDataAvailable], iReadAmount); iDataAvailable += iReadAmount; iDataRemaining -= iReadAmount; @@ -651,19 +680,22 @@ int GIF_getInfo(GIFIMAGE *pPage, GIFINFO *pInfo) { c = cBuf[iOff++]; /* Get length of next */ } /* End of image data, check for more pages... */ - if (cBuf[iOff] == 0x3b || (iDataRemaining == 0 && (iDataAvailable - iOff) < 32)) { + if (cBuf[iOff] == 0x3b || (iDataRemaining == 0 && (iDataAvailable - iOff) < 32)) + { bDone = 1; /* End of file has been reached */ - } else { /* More pages to scan */ + } + else /* More pages to scan */ + { iNumFrames++; - // read new page data starting at this offset - if (pPage->GIFFile.iSize > FILE_BUF_SIZE && iDataRemaining > 0) { // since we didn't read the whole file in one shot - memmove(cBuf, &cBuf[iOff], (iDataAvailable - iOff)); // move existing data down + // read new page data starting at this offset + if (pPage->GIFFile.iSize > FILE_BUF_SIZE && iDataRemaining > 0) // since we didn't read the whole file in one shot + { + memmove(cBuf, &cBuf[iOff], (iDataAvailable-iOff)); // move existing data down iDataAvailable -= iOff; iOff = 0; iReadAmount = (FILE_BUF_SIZE - iDataAvailable); - if (iReadAmount > iDataRemaining) { + if (iReadAmount > iDataRemaining) iReadAmount = iDataRemaining; - } iReadAmount = (*pPage->pfnRead)(&pPage->GIFFile, &cBuf[iDataAvailable], iReadAmount); iDataAvailable += iReadAmount; iDataRemaining -= iReadAmount; @@ -684,57 +716,62 @@ gifpagesz: // returns 1 to signify more data available for this image // 0 indicates there is no more data // -static int GIFGetMoreData(GIFIMAGE *pPage) { +static int GIFGetMoreData(GIFIMAGE *pPage) +{ int iDelta = (pPage->iLZWSize - pPage->iLZWOff); unsigned char c = 1; // move any existing data down - if (pPage->bEndOfFrame || iDelta >= (LZW_BUF_SIZE - MAX_CHUNK_SIZE) || iDelta <= 0) { + if (pPage->bEndOfFrame || iDelta >= (LZW_BUF_SIZE - MAX_CHUNK_SIZE) || iDelta <= 0) return 1; // frame is finished or buffer is already full; no need to read more data - } - if (pPage->iLZWOff != 0) { + if (pPage->iLZWOff != 0) + { // NB: memcpy() fails on some systems because the src and dest ptrs overlap // so copy the bytes in a simple loop to avoid problems - for (int i = 0; i < pPage->iLZWSize - pPage->iLZWOff; i++) { - pPage->ucLZW[i] = pPage->ucLZW[i + pPage->iLZWOff]; - } - pPage->iLZWSize -= pPage->iLZWOff; - pPage->iLZWOff = 0; + for (int i=0; iiLZWSize - pPage->iLZWOff; i++) { + pPage->ucLZW[i] = pPage->ucLZW[i + pPage->iLZWOff]; + } + pPage->iLZWSize -= pPage->iLZWOff; + pPage->iLZWOff = 0; } - while (c && pPage->GIFFile.iPos < pPage->GIFFile.iSize && pPage->iLZWSize < (LZW_BUF_SIZE - MAX_CHUNK_SIZE)) { + while (c && pPage->GIFFile.iPos < pPage->GIFFile.iSize && pPage->iLZWSize < (LZW_BUF_SIZE-MAX_CHUNK_SIZE)) + { (*pPage->pfnRead)(&pPage->GIFFile, &c, 1); // current length (*pPage->pfnRead)(&pPage->GIFFile, &pPage->ucLZW[pPage->iLZWSize], c); pPage->iLZWSize += c; } - if (c == 0) { // end of frame + if (c == 0) // end of frame pPage->bEndOfFrame = 1; - } - return c != 0 && pPage->GIFFile.iPos < pPage->GIFFile.iSize; // more data available? + return (c != 0 && pPage->GIFFile.iPos < pPage->GIFFile.iSize); // more data available? } /* GIFGetMoreData() */ // // Handle transparent pixels and disposal method // Used only when a frame buffer is allocated // -static void DrawNewPixels(GIFIMAGE *pPage, GIFDRAW *pDraw) { +static void DrawNewPixels(GIFIMAGE *pPage, GIFDRAW *pDraw) +{ uint8_t *d, *s; int x, iPitch = pPage->iCanvasWidth; s = pDraw->pPixels; - d = &pPage->pFrameBuffer[pDraw->iX + (pDraw->y + pDraw->iY) * iPitch]; // dest pointer in our complete canvas buffer - if (pDraw->ucDisposalMethod == 2) { // restore to background color + d = &pPage->pFrameBuffer[pDraw->iX + (pDraw->y + pDraw->iY) * iPitch]; // dest pointer in our complete canvas buffer + if (pDraw->ucDisposalMethod == 2) // restore to background color + { memset(d, pDraw->ucBackground, pDraw->iWidth); } // Apply the new pixels to the main image - if (pDraw->ucHasTransparency) { // if transparency used + if (pDraw->ucHasTransparency) // if transparency used + { uint8_t c, ucTransparent = pDraw->ucTransparent; - for (x = 0; x < pDraw->iWidth; x++) + for (x=0; xiWidth; x++) { c = *s++; - if (c != ucTransparent) { + if (c != ucTransparent) *d = c; - } d++; } - } else { + } + else + { memcpy(d, s, pDraw->iWidth); // just overwrite the old pixels } } /* DrawNewPixels() */ @@ -743,25 +780,29 @@ static void DrawNewPixels(GIFIMAGE *pPage, GIFDRAW *pDraw) { // to either RGB565 or RGB888 output // Used only when a frame buffer has been allocated // -static void ConvertNewPixels(GIFIMAGE *pPage, GIFDRAW *pDraw) { +static void ConvertNewPixels(GIFIMAGE *pPage, GIFDRAW *pDraw) +{ uint8_t *d, *s; int x; s = &pPage->pFrameBuffer[(pPage->iCanvasWidth * (pDraw->iY + pDraw->y)) + pDraw->iX]; d = &pPage->pFrameBuffer[pPage->iCanvasHeight * pPage->iCanvasWidth]; // point past bottom of frame buffer - if (pPage->ucPaletteType == GIF_PALETTE_RGB565_LE || pPage->ucPaletteType == GIF_PALETTE_RGB565_BE) { + if (pPage->ucPaletteType == GIF_PALETTE_RGB565_LE || pPage->ucPaletteType == GIF_PALETTE_RGB565_BE) + { uint16_t *pPal, *pu16; pPal = (uint16_t *)pDraw->pPalette; pu16 = (uint16_t *)d; - for (x = 0; x < pPage->iWidth; x++) + for (x=0; xiWidth; x++) { *pu16++ = pPal[*s++]; // convert to RGB565 pixels } - } else { + } + else + { uint8_t *pPal; int pixel; pPal = (uint8_t *)pDraw->pPalette; - for (x = 0; x < pPage->iWidth; x++) + for (x=0; xiWidth; x++) { pixel = *s++; *d++ = pPal[(pixel * 3) + 0]; // convert to RGB888 pixels @@ -774,7 +815,8 @@ static void ConvertNewPixels(GIFIMAGE *pPage, GIFDRAW *pDraw) { // // GIFMakePels // -static void GIFMakePels(GIFIMAGE *pPage, unsigned int code) { +static void GIFMakePels(GIFIMAGE *pPage, unsigned int code) +{ int iPixCount; unsigned short *giftabs; unsigned char *buf, *s, *pEnd, *gifpels; @@ -785,8 +827,10 @@ static void GIFMakePels(GIFIMAGE *pPage, unsigned int code) { buf = pPage->ucLineBuf + (pPage->iWidth - pPage->iXCount); giftabs = pPage->usGIFTable; gifpels = &pPage->ucGIFPixels[PIXEL_LAST]; - while (code < LINK_UNUSED) { - if (s == pPage->ucFileBuf) { /* Houston, we have a problem */ + while (code < LINK_UNUSED) + { + if (s == pPage->ucFileBuf) /* Houston, we have a problem */ + { return; /* Exit with error */ } *(--s) = gifpels[code]; @@ -794,24 +838,29 @@ static void GIFMakePels(GIFIMAGE *pPage, unsigned int code) { } iPixCount = (int)(intptr_t)(pPage->ucFileBuf + FILE_BUF_SIZE - s); - while (iPixCount && pPage->iYCount > 0) { - if (pPage->iXCount > iPixCount) { /* Pixels fit completely on the line */ - // memcpy(buf, s, iPixCount); - // buf += iPixCount; - pEnd = buf + iPixCount; - while (buf < pEnd) { - *buf++ = *s++; - } + while (iPixCount && pPage->iYCount > 0) + { + if (pPage->iXCount > iPixCount) /* Pixels fit completely on the line */ + { + // memcpy(buf, s, iPixCount); + // buf += iPixCount; + pEnd = buf + iPixCount; + while (buf < pEnd) + { + *buf++ = *s++; + } pPage->iXCount -= iPixCount; // iPixCount = 0; - if (ucNeedMore) { + if (ucNeedMore) GIFGetMoreData(pPage); // check if we need to read more LZW data every 4 lines - } return; - } else { /* Pixels cross into next line */ + } + else /* Pixels cross into next line */ + { GIFDRAW gd; pEnd = buf + pPage->iXCount; - while (buf < pEnd) { + while (buf < pEnd) + { *buf++ = *s++; } iPixCount -= pPage->iXCount; @@ -824,30 +873,31 @@ static void GIFMakePels(GIFIMAGE *pPage, unsigned int code) { gd.pPixels = pPage->ucLineBuf; gd.pPalette = (pPage->bUseLocalPalette) ? pPage->pLocalPalette : pPage->pPalette; gd.pPalette24 = (uint8_t *)gd.pPalette; // just cast the pointer for RGB888 - gd.ucIsGlobalPalette = pPage->bUseLocalPalette == 1?0:1; + gd.ucIsGlobalPalette = pPage->bUseLocalPalette==1?0:1; gd.y = pPage->iHeight - pPage->iYCount; // Ugly logic to handle the interlaced line position, but it // saves having to have another set of state variables if (pPage->ucMap & 0x40) { // interlaced? - int height = pPage->iHeight - 1; - if (gd.y > height / 2) { - gd.y = gd.y * 2 - (height | 1); - } else if (gd.y > height / 4) { - gd.y = gd.y * 4 - ((height & ~1) | 2); - } else if (gd.y > height / 8) { - gd.y = gd.y * 8 - ((height & ~3) | 4); - } else { - gd.y = gd.y * 8; - } + int height = pPage->iHeight-1; + if (gd.y > height / 2) + gd.y = gd.y * 2 - (height | 1); + else if (gd.y > height / 4) + gd.y = gd.y * 4 - ((height & ~1) | 2); + else if (gd.y > height / 8) + gd.y = gd.y * 8 - ((height & ~3) | 4); + else + gd.y = gd.y * 8; } - gd.ucDisposalMethod = (pPage->ucGIFBits & 0x1c) >> 2; + gd.ucDisposalMethod = (pPage->ucGIFBits & 0x1c)>>2; gd.ucTransparent = pPage->ucTransparent; gd.ucHasTransparency = pPage->ucGIFBits & 1; gd.ucBackground = pPage->ucBackground; gd.pUser = pPage->pUser; - if (pPage->pFrameBuffer) { // update the frame buffer + if (pPage->pFrameBuffer) // update the frame buffer + { DrawNewPixels(pPage, &gd); - if (pPage->ucDrawType == GIF_DRAW_COOKED) { + if (pPage->ucDrawType == GIF_DRAW_COOKED) + { ConvertNewPixels(pPage, &gd); // prepare for output gd.pPixels = &pPage->pFrameBuffer[pPage->iCanvasWidth * pPage->iCanvasHeight]; } @@ -855,35 +905,34 @@ static void GIFMakePels(GIFIMAGE *pPage, unsigned int code) { (*pPage->pfnDraw)(&gd); // callback to handle this line pPage->iYCount--; buf = pPage->ucLineBuf; - if ((pPage->iYCount & 3) == 0) { // since we support only small images... + if ((pPage->iYCount & 3) == 0) // since we support only small images... ucNeedMore = 1; - } } } /* while */ - if (ucNeedMore) { + if (ucNeedMore) GIFGetMoreData(pPage); // check if we need to read more LZW data every 4 lines - } return; } /* GIFMakePels() */ // // Macro to extract a variable length code // #define GET_CODE if (bitnum > (REGISTER_WIDTH - codesize)) { pImage->iLZWOff += (bitnum >> 3); \ - bitnum &= 7; ulBits = INTELLONG(&p[pImage->iLZWOff]); } \ - code = (unsigned short)(ulBits >> bitnum); /* Read a 32-bit chunk */ \ - code &= sMask; bitnum += codesize; + bitnum &= 7; ulBits = INTELLONG(&p[pImage->iLZWOff]); } \ + code = (unsigned short) (ulBits >> bitnum); /* Read a 32-bit chunk */ \ + code &= sMask; bitnum += codesize; // // Decode LZW into an image // -static int DecodeLZW(GIFIMAGE *pImage, int iOptions) { +static int DecodeLZW(GIFIMAGE *pImage, int iOptions) +{ int i, bitnum; unsigned short oldcode, codesize, nextcode, nextlim; unsigned short *giftabs, cc, eoi; signed short sMask; unsigned char *gifpels, *p; // int iStripSize; - // unsigned char **index; + //unsigned char **index; uint32_t ulBits; unsigned short code; (void)iOptions; // not used for now @@ -907,7 +956,7 @@ static int DecodeLZW(GIFIMAGE *pImage, int iOptions) { // this part only needs to be initialized once for (i = 0; i < cc; i++) { - gifpels[PIXEL_FIRST + i] = gifpels[PIXEL_LAST + i] = (unsigned short)i; + gifpels[PIXEL_FIRST + i] = gifpels[PIXEL_LAST + i] = (unsigned short) i; giftabs[i] = LINK_END; } init_codetable: @@ -915,79 +964,80 @@ init_codetable: sMask = 0xffff << (pImage->ucCodeStart + 1); sMask = 0xffff - sMask; nextcode = cc + 2; - nextlim = (unsigned short)((1 << codesize)); + nextlim = (unsigned short) ((1 << codesize)); // This part of the table needs to be reset multiple times - memset(&giftabs[cc], LINK_UNUSED, (4096 - cc) * sizeof(short)); + memset(&giftabs[cc], LINK_UNUSED, (4096 - cc)*sizeof(short)); ulBits = INTELLONG(&p[pImage->iLZWOff]); // start by reading 4 bytes of LZW data GET_CODE - if (code == cc) { // we just reset the dictionary, so get another code - GET_CODE + if (code == cc) // we just reset the dictionary, so get another code + { + GET_CODE } oldcode = code; GIFMakePels(pImage, code); // first code is output as the first pixel // Main decode loop - while (code != eoi && pImage->iYCount > 0) { // && y < pImage->iHeight+1) /* Loop through all lines of the image (or strip) */ + while (code != eoi && pImage->iYCount > 0) // && y < pImage->iHeight+1) /* Loop through all lines of the image (or strip) */ + { GET_CODE - if (code == cc) { /* Clear code?, and not first code */ + if (code == cc) /* Clear code?, and not first code */ goto init_codetable; - } - if (code != eoi) { - if (nextcode < nextlim) { // for deferred cc case, don't let it overwrite the last entry (fff) - giftabs[nextcode] = oldcode; - gifpels[PIXEL_FIRST + nextcode] = gifpels[PIXEL_FIRST + oldcode]; - if (giftabs[code] == LINK_UNUSED) { /* Old code */ - gifpels[PIXEL_LAST + nextcode] = gifpels[PIXEL_FIRST + oldcode]; - } else { - gifpels[PIXEL_LAST + nextcode] = gifpels[PIXEL_FIRST + code]; + if (code != eoi) + { + if (nextcode < nextlim) // for deferred cc case, don't let it overwrite the last entry (fff) + { + giftabs[nextcode] = oldcode; + gifpels[PIXEL_FIRST + nextcode] = gifpels[PIXEL_FIRST + oldcode]; + if (giftabs[code] == LINK_UNUSED) /* Old code */ + gifpels[PIXEL_LAST + nextcode] = gifpels[PIXEL_FIRST + oldcode]; + else + gifpels[PIXEL_LAST + nextcode] = gifpels[PIXEL_FIRST + code]; + } + nextcode++; + if (nextcode >= nextlim && codesize < 12) + { + codesize++; + nextlim <<= 1; + sMask = (sMask << 1) | 1; } - } - nextcode++; - if (nextcode >= nextlim && codesize < 12) { - codesize++; - nextlim <<= 1; - sMask = (sMask << 1) | 1; - } GIFMakePels(pImage, code); oldcode = code; } } /* while not end of LZW code stream */ return 0; -// gif_forced_error: +//gif_forced_error: // free(pImage->pPixels); // pImage->pPixels = NULL; // return -1; } /* DecodeLZW() */ -void GIF_setDrawCallback(GIFIMAGE *pGIF, GIF_DRAW_CALLBACK *pfnDraw) { - pGIF->pfnDraw = pfnDraw; +void GIF_setDrawCallback(GIFIMAGE *pGIF, GIF_DRAW_CALLBACK *pfnDraw) +{ + pGIF->pfnDraw = pfnDraw; } /* GIF_setDrawCallback() */ // // Scale 2 scanlines down by 50% with pixel averaging // writes new values over previous line // expects RGB565 little endian pixels as input // -void GIF_scaleHalf(uint16_t *pCurrent, uint16_t *pPrev, int iWidth, int bBigEndian) { - int x; - uint16_t *d = pPrev; - uint32_t gSum, rbSum, pix0,pix1,pix2,pix3; - const uint32_t RBMask = 0xf81f, GMask = 0x7e0; +void GIF_scaleHalf(uint16_t *pCurrent, uint16_t *pPrev, int iWidth, int bBigEndian) +{ +int x; +uint16_t *d = pPrev; +uint32_t gSum, rbSum, pix0,pix1,pix2,pix3; +const uint32_t RBMask = 0xf81f, GMask = 0x7e0; - for (x = 0; x < iWidth; x += 2) - { - pix0 = pCurrent[0]; - pix1 = pCurrent[1]; - pix2 = pPrev[0]; - pix3 = pPrev[1]; - pCurrent += 2; - pPrev += 2; - gSum = (pix0 & GMask) + (pix1 & GMask) + (pix2 & GMask) + (pix3 & GMask); - gSum = ((gSum + 0x40) >> 2) & GMask; // for rounding towards 1 - rbSum = (pix0 & RBMask) + (pix1 & RBMask) + (pix2 & RBMask) + (pix3 & RBMask); - rbSum = ((rbSum + 0x1002) >> 2) & RBMask; - if (bBigEndian) { - *d++ = __builtin_bswap16((uint16_t)(gSum + rbSum)); - } else { - *d++ = (uint16_t)(gSum + rbSum); // store finished pixel - } - } // for x + for (x=0; x> 2) & GMask; // for rounding towards 1 + rbSum = (pix0 & RBMask) + (pix1 & RBMask) + (pix2 & RBMask) + (pix3 & RBMask); + rbSum = ((rbSum + 0x1002) >> 2) & RBMask; + if (bBigEndian) + *d++ = __builtin_bswap16((uint16_t)(gSum + rbSum)); + else + *d++ = (uint16_t)(gSum + rbSum); // store finished pixel + } // for x } /* GIF_scaleHalf() */ diff --git a/py/circuitpy_defns.mk b/py/circuitpy_defns.mk index 6c8a513d8f..5956b3e965 100644 --- a/py/circuitpy_defns.mk +++ b/py/circuitpy_defns.mk @@ -580,7 +580,6 @@ SRC_SHARED_MODULE_ALL = \ displayio/I2CDisplay.c \ displayio/OnDiskBitmap.c \ displayio/OnDiskGif.c \ - displayio/gif.c \ displayio/Palette.c \ displayio/Shape.c \ displayio/TileGrid.c \ @@ -699,10 +698,10 @@ SRC_MOD += $(addprefix lib/protomatter/src/, \ $(BUILD)/lib/protomatter/src/core.o: CFLAGS += -include "shared-module/rgbmatrix/allocator.h" -DCIRCUITPY -Wno-missing-braces -Wno-missing-prototypes endif -#SRC_MOD += $(addprefix lib/AnimatedGIF/, \ - #gif.c \ -#) -#$(BUILD)/lib/AnimatedGIF/gif.o: CFLAGS += -Wno-missing-braces -Wno-missing-prototypes +SRC_MOD += $(addprefix lib/AnimatedGIF/, \ + gif.c \ +) +$(BUILD)/lib/AnimatedGIF/gif.o: CFLAGS += -DCIRCUITPY ifeq ($(CIRCUITPY_ZLIB),1) SRC_MOD += $(addprefix lib/uzlib/, \ diff --git a/shared-bindings/displayio/gif.c b/shared-bindings/displayio/gif.c deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/shared-module/displayio/OnDiskGif.h b/shared-module/displayio/OnDiskGif.h index 2184f78dbe..5089e52b42 100644 --- a/shared-module/displayio/OnDiskGif.h +++ b/shared-module/displayio/OnDiskGif.h @@ -32,8 +32,7 @@ #include "py/obj.h" -// #include "lib/AnimatedGIF/AnimatedGIF_circuitpy.h" -#include "AnimatedGIF_circuitpy.h" +#include "lib/AnimatedGIF/AnimatedGIF_circuitpy.h" #include "Bitmap.h" #include "extmod/vfs_fat.h"