diff options
| author | inmarket <andrewh@inmarket.com.au> | 2014-02-15 22:31:33 +1000 |
|---|---|---|
| committer | inmarket <andrewh@inmarket.com.au> | 2014-02-15 22:31:33 +1000 |
| commit | dcedf414136e55e6dacbe736babe748e1374e19e (patch) | |
| tree | de3823534bfa37f9cc92c0dae3b474db8ece9088 /demos/modules/gdisp/images/main.c | |
| parent | 84fc1ac166fc2908b5840a78ceb515b4f14edd80 (diff) | |
| parent | 5edf7c956e8a00a6a49e1f3c446c80cecf0e59ef (diff) | |
| download | uGFX-dcedf414136e55e6dacbe736babe748e1374e19e.tar.gz uGFX-dcedf414136e55e6dacbe736babe748e1374e19e.tar.bz2 uGFX-dcedf414136e55e6dacbe736babe748e1374e19e.zip | |
Merge branch 'master' into gwin
Diffstat (limited to 'demos/modules/gdisp/images/main.c')
| -rw-r--r-- | demos/modules/gdisp/images/main.c | 23 |
1 files changed, 7 insertions, 16 deletions
diff --git a/demos/modules/gdisp/images/main.c b/demos/modules/gdisp/images/main.c index b87f663c..6a2e4418 100644 --- a/demos/modules/gdisp/images/main.c +++ b/demos/modules/gdisp/images/main.c @@ -29,15 +29,12 @@ #include "gfx.h" -#ifdef WIN32 - #define USE_MEMORY_FILE TRUE // 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 +/** + * The image file must be stored on a GFILE file-system. + * Use either GFILE_NEED_NATIVEFS or GFILE_NEED_ROMFS (or both). + * + * The ROMFS uses the file "romfs_files.h" to describe the set of files in the ROMFS. + */ static gdispImage myImage; @@ -52,13 +49,7 @@ 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); + gdispImageOpenFile(&myImage, "test-pal8.bmp"); gdispImageDraw(&myImage, 0, 0, swidth, sheight, 0, 0); gdispImageClose(&myImage); |