From 8b15aab802024434bd8565aebb33368e66532a97 Mon Sep 17 00:00:00 2001 From: Andrew Hannam Date: Thu, 4 Apr 2013 21:02:05 +1000 Subject: [PATCH] Update demo to use Memory Reader for images --- demos/modules/gdisp/gdisp_images/main.c | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/demos/modules/gdisp/gdisp_images/main.c b/demos/modules/gdisp/gdisp_images/main.c index 6ca5f640..8f14750e 100644 --- a/demos/modules/gdisp/gdisp_images/main.c +++ b/demos/modules/gdisp/gdisp_images/main.c @@ -22,12 +22,22 @@ #include "hal.h" #include "gfx.h" +#ifdef WIN32 + #define USE_MEMORY_FILE FALSE // Can be true or false for Win32 +#else + #define USE_MEMORY_FILE TRUE // Non-Win32 - use the compiled in image +#endif + +#if USE_MEMORY_FILE + #include "test-pal8.h" +#endif + static gdispImage myImage; int main(void) { coord_t swidth, sheight; - halInit(); // Initialise the Hardware + halInit(); // Initialize the Hardware chSysInit(); // Initialize the OS gdispInit(); // Initialize the display @@ -38,7 +48,11 @@ int main(void) { sheight = gdispGetHeight(); // Set up IO for our image +#if USE_MEMORY_FILE + gdispImageSetMemoryReader(&myImage, test_pal8); +#else gdispImageSetSimulFileReader(&myImage, "test-pal8.bmp"); +#endif gdispImageOpen(&myImage); gdispImageDraw(&myImage, 0, 0, swidth, sheight, 0, 0);