diff options
| author | [email protected] <[email protected]> | 2012-07-20 12:37:56 +0000 |
|---|---|---|
| committer | [email protected] <[email protected]> | 2012-07-20 12:37:56 +0000 |
| commit | 92a50c838d8ca2ae4027fd77b71db12fb52d86e3 (patch) | |
| tree | 08cb5a9273c78c36df97f48eea17eb2e1034a497 /components/rtgui/common/image.c | |
| parent | c2868be90d0f1f43ee13bacdb1c0f55a9fe34276 (diff) | |
sync with RTGUI c074ff2898b9e
Full log is in GitHub.
git-svn-id: https://rt-thread.googlecode.com/svn/trunk@2222 bbd45198-f89e-11dd-88c7-29a3b14d5316
Diffstat (limited to 'components/rtgui/common/image.c')
| -rw-r--r-- | components/rtgui/common/image.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/components/rtgui/common/image.c b/components/rtgui/common/image.c index 1ae57e0ece..358ba2bff5 100644 --- a/components/rtgui/common/image.c +++ b/components/rtgui/common/image.c @@ -10,6 +10,7 @@ * Change Logs: * Date Author Notes * 2009-10-16 Bernard first version + * 2012-01-24 onelife add TJpgDec (Tiny JPEG Decompressor) support */ #include <rtthread.h> #include <rtgui/image.h> @@ -27,7 +28,7 @@ #ifdef RTGUI_IMAGE_BMP #include <rtgui/image_bmp.h> #endif -#ifdef RTGUI_IMAGE_JPEG +#if (defined(RTGUI_IMAGE_JPEG) || defined(RTGUI_IMAGE_TJPGD)) #include <rtgui/image_jpeg.h> #endif #ifdef RTGUI_IMAGE_PNG @@ -50,7 +51,7 @@ void rtgui_system_image_init(void) rtgui_image_bmp_init(); #endif -#ifdef RTGUI_IMAGE_JPEG +#if (defined(RTGUI_IMAGE_JPEG) || defined(RTGUI_IMAGE_TJPGD)) rtgui_image_jpeg_init(); #endif |
