From 010e0f0d626b0f03cec9e8dd876762acb38fafc3 Mon Sep 17 00:00:00 2001 From: inmarket Date: Fri, 7 Feb 2014 14:08:39 +1000 Subject: Update demo's with images in them --- demos/modules/gdisp/images/gfxconf.h | 3 +++ demos/modules/gdisp/images/main.c | 5 ++--- demos/modules/gdisp/images_animated/gfxconf.h | 3 +++ demos/modules/gdisp/images_animated/main.c | 5 ++--- 4 files changed, 10 insertions(+), 6 deletions(-) (limited to 'demos/modules/gdisp') diff --git a/demos/modules/gdisp/images/gfxconf.h b/demos/modules/gdisp/images/gfxconf.h index 6cd78b37..09dbe30c 100644 --- a/demos/modules/gdisp/images/gfxconf.h +++ b/demos/modules/gdisp/images/gfxconf.h @@ -51,5 +51,8 @@ #define GDISP_NEED_IMAGE_JPG FALSE #define GDISP_NEED_IMAGE_PNG FALSE +#define GFX_USE_GFILE TRUE +#define GFILE_NEED_MEMFS TRUE + #endif /* _GFXCONF_H */ diff --git a/demos/modules/gdisp/images/main.c b/demos/modules/gdisp/images/main.c index b87f663c..021bf9f5 100644 --- a/demos/modules/gdisp/images/main.c +++ b/demos/modules/gdisp/images/main.c @@ -53,12 +53,11 @@ int main(void) { // Set up IO for our image #if USE_MEMORY_FILE - gdispImageSetMemoryReader(&myImage, test_pal8); + gdispImageOpenMemory(&myImage, test_pal8); #else - gdispImageSetSimulFileReader(&myImage, "test-pal8.bmp"); + gdispImageOpenFile(&myImage, "test-pal8.bmp"); #endif - gdispImageOpen(&myImage); gdispImageDraw(&myImage, 0, 0, swidth, sheight, 0, 0); gdispImageClose(&myImage); diff --git a/demos/modules/gdisp/images_animated/gfxconf.h b/demos/modules/gdisp/images_animated/gfxconf.h index cc38ed36..b2dcaf92 100644 --- a/demos/modules/gdisp/images_animated/gfxconf.h +++ b/demos/modules/gdisp/images_animated/gfxconf.h @@ -51,5 +51,8 @@ #define GDISP_NEED_IMAGE_JPG FALSE #define GDISP_NEED_IMAGE_PNG FALSE +#define GFX_USE_GFILE TRUE +#define GFILE_NEED_MEMFS TRUE + #endif /* _GFXCONF_H */ diff --git a/demos/modules/gdisp/images_animated/main.c b/demos/modules/gdisp/images_animated/main.c index 9b2b5d2c..bf49f692 100644 --- a/demos/modules/gdisp/images_animated/main.c +++ b/demos/modules/gdisp/images_animated/main.c @@ -76,12 +76,11 @@ int main(void) { // Set up IO for our image #if USE_MEMORY_FILE - gdispImageSetMemoryReader(&myImage, testanim); + if (!(gdispImageOpenMemory(&myImage, testanim) & GDISP_IMAGE_ERR_UNRECOVERABLE)) { #else - gdispImageSetFileReader(&myImage, "testanim.gif"); + if (!(gdispImageOpenFile(&myImage, "testanim.gif") & GDISP_IMAGE_ERR_UNRECOVERABLE)) { #endif - if (gdispImageOpen(&myImage) == GDISP_IMAGE_ERR_OK) { gdispImageSetBgColor(&myImage, MY_BG_COLOR); // Adjust the error indicator area if necessary if (myImage.width > errx && myImage.height < sheight) { -- cgit v1.2.3