diff options
| author | inmarket <andrewh@inmarket.com.au> | 2014-05-09 21:30:00 +1000 |
|---|---|---|
| committer | inmarket <andrewh@inmarket.com.au> | 2014-05-09 21:30:00 +1000 |
| commit | cf5867b33d76d775782412d74733d221136af556 (patch) | |
| tree | 6a6eba6a1fe2cc4bf94d40320c0115b1102ca2c2 /src | |
| parent | 7c2b2555f879264ccece4afe688e85bd2201baff (diff) | |
| download | uGFX-cf5867b33d76d775782412d74733d221136af556.tar.gz uGFX-cf5867b33d76d775782412d74733d221136af556.tar.bz2 uGFX-cf5867b33d76d775782412d74733d221136af556.zip | |
New gdispImageInit() call to initialise a gdispImage structure
Use in gwinImage
Diffstat (limited to 'src')
| -rw-r--r-- | src/gdisp/image.c | 4 | ||||
| -rw-r--r-- | src/gdisp/image.h | 8 | ||||
| -rw-r--r-- | src/gwin/gimage.c | 3 |
3 files changed, 13 insertions, 2 deletions
diff --git a/src/gdisp/image.c b/src/gdisp/image.c index 5a743905..e2b7d758 100644 --- a/src/gdisp/image.c +++ b/src/gdisp/image.c @@ -130,6 +130,10 @@ gdispImageError } #endif +void gdispImageInit(gdispImage *img) { + img->type = GDISP_IMAGE_TYPE_UNKNOWN; +} + gdispImageError gdispImageOpenGFile(gdispImage *img, GFILE *f) { gdispImageError err; diff --git a/src/gdisp/image.h b/src/gdisp/image.h index 1bf378f1..76e8bdea 100644 --- a/src/gdisp/image.h +++ b/src/gdisp/image.h @@ -131,6 +131,14 @@ extern "C" { #endif /** + * @brief Initialise a gdispImage object + * + * @param[in] img The image structure to initialise + * + */ + void gdispImageInit(gdispImage *img); + + /** * @brief Open an image using an open GFILE and get it ready for drawing * @details Determine the image format and get ready to decode the first image frame * @return GDISP_IMAGE_ERR_OK (0) on success or an error code. diff --git a/src/gwin/gimage.c b/src/gwin/gimage.c index 44ba785a..07d27dd0 100644 --- a/src/gwin/gimage.c +++ b/src/gwin/gimage.c @@ -127,8 +127,7 @@ GHandle gwinGImageCreate(GDisplay *g, GImageObject *gobj, GWindowInit *pInit) { return 0; // Ensure the gdispImageIsOpen() gives valid results - gobj->image.type = 0; - gobj->image.fns = 0; + gdispImageInit(&gobj->image); // Initialise the timer #if GWIN_NEED_IMAGE_ANIMATION |