diff options
author | Joel Bodenmann <joel.bodenmann@simulton.com> | 2019-05-01 17:07:43 +0200 |
---|---|---|
committer | Joel Bodenmann <joel.bodenmann@simulton.com> | 2019-05-01 17:07:43 +0200 |
commit | 39bde23dd9b156b05aad549ca1d9c0e5026378fe (patch) | |
tree | cd09969caf68e02571faecc53a3b8ba8e047f716 /src/gdisp/gdisp_image_gif.c | |
parent | 835f0f197f7fc7eecf5dcd36892987c71caa5caa (diff) | |
parent | ac4b7fc8b4ebfe080b6f3f6d90a1fe15221144cc (diff) | |
download | uGFX-39bde23dd9b156b05aad549ca1d9c0e5026378fe.tar.gz uGFX-39bde23dd9b156b05aad549ca1d9c0e5026378fe.tar.bz2 uGFX-39bde23dd9b156b05aad549ca1d9c0e5026378fe.zip |
Merge branch 'develop'
Diffstat (limited to 'src/gdisp/gdisp_image_gif.c')
-rw-r--r-- | src/gdisp/gdisp_image_gif.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/src/gdisp/gdisp_image_gif.c b/src/gdisp/gdisp_image_gif.c index 804dce52..d1060083 100644 --- a/src/gdisp/gdisp_image_gif.c +++ b/src/gdisp/gdisp_image_gif.c @@ -106,7 +106,7 @@ typedef struct gdispImagePrivate_GIF { * * Pre: Frame info has been read. */ -static gdispImageError startDecodeGif(gdispImage *img) { +static gdispImageError startDecodeGif(gImage *img) { gdispImagePrivate_GIF * priv; gifimgdecode * decode; gU16 cnt; @@ -170,7 +170,7 @@ baddatacleanup: * * Pre: Frame info has been read. */ -static void stopDecodeGif(gdispImage *img) { +static void stopDecodeGif(gImage *img) { gdispImagePrivate_GIF * priv; priv = (gdispImagePrivate_GIF *)img->priv; @@ -201,7 +201,7 @@ static gU16 getPrefixGif(gifimgdecode *decode, gU16 code) { * * Note: The resulting pixels are stored in decode->buf */ -static gU16 getBytesGif(gdispImage *img) { +static gU16 getBytesGif(gImage *img) { gdispImagePrivate_GIF * priv; gifimgdecode * decode; gU16 cnt; @@ -334,7 +334,7 @@ static gU16 getBytesGif(gdispImage *img) { * * Pre: The file position is at the start of the frame. */ -static gdispImageError initFrameGif(gdispImage *img) { +static gdispImageError initFrameGif(gImage *img) { gdispImagePrivate_GIF * priv; gifimgcache * cache; gU8 blocktype; @@ -493,7 +493,7 @@ static gdispImageError initFrameGif(gdispImage *img) { } } -void gdispImageClose_GIF(gdispImage *img) { +void gdispImageClose_GIF(gImage *img) { gdispImagePrivate_GIF * priv; gifimgcache * cache; gifimgcache * ncache; @@ -514,7 +514,7 @@ void gdispImageClose_GIF(gdispImage *img) { } } -gdispImageError gdispImageOpen_GIF(gdispImage *img) { +gdispImageError gdispImageOpen_GIF(gImage *img) { gdispImagePrivate_GIF *priv; gU8 hdr[6]; gU16 aword; @@ -595,7 +595,7 @@ gdispImageError gdispImageOpen_GIF(gdispImage *img) { } } -gdispImageError gdispImageCache_GIF(gdispImage *img) { +gdispImageError gdispImageCache_GIF(gImage *img) { gdispImagePrivate_GIF * priv; gifimgcache * cache; gifimgdecode * decode; @@ -766,7 +766,7 @@ baddatacleanup: return GDISP_IMAGE_ERR_BADDATA; } -gdispImageError gdispGImageDraw_GIF(GDisplay *g, gdispImage *img, gCoord x, gCoord y, gCoord cx, gCoord cy, gCoord sx, gCoord sy) { +gdispImageError gdispGImageDraw_GIF(GDisplay *g, gImage *img, gCoord x, gCoord y, gCoord cx, gCoord cy, gCoord sx, gCoord sy) { gdispImagePrivate_GIF * priv; gifimgdecode * decode; gU8 * q = 0; @@ -1106,7 +1106,7 @@ baddatacleanup: return GDISP_IMAGE_ERR_BADDATA; } -gDelay gdispImageNext_GIF(gdispImage *img) { +gDelay gdispImageNext_GIF(gImage *img) { gdispImagePrivate_GIF * priv; gDelay delay; gU8 blocksz; |