diff options
author | mrwastl <mrwastl@users.sourceforge.net> | 2011-05-08 00:06:31 +0200 |
---|---|---|
committer | mrwastl <mrwastl@users.sourceforge.net> | 2011-05-08 00:06:31 +0200 |
commit | 3cb5c3e2d38f284738af6af736df3c4addd85575 (patch) | |
tree | 4d3a826ee7b1b05a73db61a55daa7127e6b1bd10 /glcdskin/cache.c | |
parent | 00e8503d301acc98c012b4ebd5467ebcd99915d0 (diff) | |
download | graphlcd-base-3cb5c3e2d38f284738af6af736df3c4addd85575.tar.gz graphlcd-base-3cb5c3e2d38f284738af6af736df3c4addd85575.tar.bz2 |
add basic reading support for image formats supported by ImageMagick (optional, not enabled by default)
Diffstat (limited to 'glcdskin/cache.c')
-rw-r--r-- | glcdskin/cache.c | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/glcdskin/cache.c b/glcdskin/cache.c index fdcb4b8..4129eb9 100644 --- a/glcdskin/cache.c +++ b/glcdskin/cache.c @@ -12,6 +12,7 @@ #include <glcdgraphics/image.h> #include <glcdgraphics/glcd.h> #include <glcdgraphics/pbm.h> +#include <glcdgraphics/extformats.h> #include <stdlib.h> #include <string.h> @@ -171,8 +172,13 @@ cImageItem * cImageCache::LoadImage(const std::string & path) } else { - delete image; - return NULL; + cExtFormatFile extformat; + + if (extformat.Load(*image, file) == false) + { + delete image; + return NULL; + } } item = new cImageItem(path, image); |