diff options
| author | Andrew Hannam <andrewh@inmarket.com.au> | 2013-05-23 20:35:42 -0700 |
|---|---|---|
| committer | Andrew Hannam <andrewh@inmarket.com.au> | 2013-05-23 20:35:42 -0700 |
| commit | 42006a67b5ccfd86f30d8a91cc474681c437eaf6 (patch) | |
| tree | 39b6fa0bd051f274cdacc1925f262bc1a81b4c5e /src/gdisp | |
| parent | b5ce2405501aa693fc4c134e3425e74ba0ff7589 (diff) | |
| parent | 5f2a32714cda6bcfc8829e61895def2f627e1b8f (diff) | |
| download | uGFX-42006a67b5ccfd86f30d8a91cc474681c437eaf6.tar.gz uGFX-42006a67b5ccfd86f30d8a91cc474681c437eaf6.tar.bz2 uGFX-42006a67b5ccfd86f30d8a91cc474681c437eaf6.zip | |
Merge pull request #30 from Tectu/master
Merge Tectu Changes
Diffstat (limited to 'src/gdisp')
| -rw-r--r-- | src/gdisp/fonts.c | 1 | ||||
| -rw-r--r-- | src/gdisp/image.c | 3 | ||||
| -rw-r--r-- | src/gdisp/image_bmp.c | 3 | ||||
| -rw-r--r-- | src/gdisp/image_gif.c | 7 | ||||
| -rw-r--r-- | src/gdisp/image_native.c | 3 | ||||
| -rw-r--r-- | src/gdisp/image_png.c | 5 |
6 files changed, 20 insertions, 2 deletions
diff --git a/src/gdisp/fonts.c b/src/gdisp/fonts.c index f0d9f8fd..3d29e50c 100644 --- a/src/gdisp/fonts.c +++ b/src/gdisp/fonts.c @@ -10,6 +10,7 @@ * @brief GDISP Font Handling. * * @addtogroup GDISP + * * @{ */ diff --git a/src/gdisp/image.c b/src/gdisp/image.c index ce4e1250..2a648e59 100644 --- a/src/gdisp/image.c +++ b/src/gdisp/image.c @@ -8,6 +8,9 @@ /** * @file src/gdisp/image.c * @brief GDISP generic image code. + * + * @defgroup Image Image + * @ingroup GDISP */ #include "ch.h" #include "hal.h" diff --git a/src/gdisp/image_bmp.c b/src/gdisp/image_bmp.c index be97eb39..830ee327 100644 --- a/src/gdisp/image_bmp.c +++ b/src/gdisp/image_bmp.c @@ -8,6 +8,9 @@ /** * @file src/gdisp/image_bmp.c * @brief GDISP native image code. + * + * @defgroup Image Image + * @ingroup GDISP */ #include "ch.h" #include "hal.h" diff --git a/src/gdisp/image_gif.c b/src/gdisp/image_gif.c index 084e2fb7..6c61219a 100644 --- a/src/gdisp/image_gif.c +++ b/src/gdisp/image_gif.c @@ -8,7 +8,10 @@ /** * @file src/gdisp/image_gif.c * @brief GDISP native image code. - */ + * + * @defgroup Image Image + * @ingroup GDISP +*/ #include "ch.h" #include "hal.h" #include "gfx.h" @@ -573,6 +576,8 @@ gdispImageError gdispImageOpen_GIF(gdispImage *img) { priv->palsize = 0; priv->palette = 0; priv->frame.flags = 0; + priv->cache = 0; + priv->curcache = 0; /* Process the Screen Descriptor structure */ diff --git a/src/gdisp/image_native.c b/src/gdisp/image_native.c index 43a342cc..6da4e862 100644 --- a/src/gdisp/image_native.c +++ b/src/gdisp/image_native.c @@ -8,6 +8,9 @@ /** * @file src/gdisp/image_native.c * @brief GDISP native image code. + * + * @defgroup Image Image + * @ingroup GDISP */ #include "ch.h" #include "hal.h" diff --git a/src/gdisp/image_png.c b/src/gdisp/image_png.c index 2ea59f8b..1cfba97f 100644 --- a/src/gdisp/image_png.c +++ b/src/gdisp/image_png.c @@ -8,7 +8,10 @@ /** * @file src/gdisp/image_png.c * @brief GDISP native image code. - */ + * + * @defgroup Image Image + * @ingroup GDISP +*/ #include "ch.h" #include "hal.h" #include "gfx.h" |