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_native.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_native.c')
-rw-r--r-- | src/gdisp/gdisp_image_native.c | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/src/gdisp/gdisp_image_native.c b/src/gdisp/gdisp_image_native.c index 4735d71f..e58e97de 100644 --- a/src/gdisp/gdisp_image_native.c +++ b/src/gdisp/gdisp_image_native.c @@ -23,15 +23,15 @@ /** * Helper Routines Needed */ -void *gdispImageAlloc(gdispImage *img, gMemSize sz); -void gdispImageFree(gdispImage *img, void *ptr, gMemSize sz); +void *gdispImageAlloc(gImage *img, gMemSize sz); +void gdispImageFree(gImage *img, void *ptr, gMemSize sz); typedef struct gdispImagePrivate_NATIVE { gPixel *frame0cache; gPixel buf[BLIT_BUFFER_SIZE_NATIVE]; } gdispImagePrivate_NATIVE; -void gdispImageClose_NATIVE(gdispImage *img) { +void gdispImageClose_NATIVE(gImage *img) { gdispImagePrivate_NATIVE * priv; priv = (gdispImagePrivate_NATIVE *)img->priv; @@ -43,7 +43,7 @@ void gdispImageClose_NATIVE(gdispImage *img) { } } -gdispImageError gdispImageOpen_NATIVE(gdispImage *img) { +gdispImageError gdispImageOpen_NATIVE(gImage *img) { gU8 hdr[HEADER_SIZE_NATIVE]; /* Read the 8 byte header */ @@ -70,7 +70,7 @@ gdispImageError gdispImageOpen_NATIVE(gdispImage *img) { return GDISP_IMAGE_ERR_OK; } -gdispImageError gdispImageCache_NATIVE(gdispImage *img) { +gdispImageError gdispImageCache_NATIVE(gImage *img) { gMemSize len; gdispImagePrivate_NATIVE * priv; @@ -93,7 +93,7 @@ gdispImageError gdispImageCache_NATIVE(gdispImage *img) { return GDISP_IMAGE_ERR_OK; } -gdispImageError gdispGImageDraw_NATIVE(GDisplay *g, gdispImage *img, gCoord x, gCoord y, gCoord cx, gCoord cy, gCoord sx, gCoord sy) { +gdispImageError gdispGImageDraw_NATIVE(GDisplay *g, gImage *img, gCoord x, gCoord y, gCoord cx, gCoord cy, gCoord sx, gCoord sy) { gCoord mx, mcx; gFileSize pos; gMemSize len; @@ -141,7 +141,7 @@ gdispImageError gdispGImageDraw_NATIVE(GDisplay *g, gdispImage *img, gCoord x, g return GDISP_IMAGE_ERR_OK; } -gDelay gdispImageNext_NATIVE(gdispImage *img) { +gDelay gdispImageNext_NATIVE(gImage *img) { (void) img; /* No more frames/pages */ |