diff options
| author | Bernard Xiong <[email protected]> | 2017-11-06 17:38:35 +0800 |
|---|---|---|
| committer | GitHub <[email protected]> | 2017-11-06 17:38:35 +0800 |
| commit | 22f9486b44f8d0ffd58a35ca967269fde234f3a8 (patch) | |
| tree | 5837633fd4b20ea52159bcc3c19aafe1c666e6d2 /components/gui | |
| parent | 364a223f36af4a8eecd510e1e5d3af780837f303 (diff) | |
| parent | 914a43925b4bcf1fc967ea9ab1699ad98920cf94 (diff) | |
Merge pull request #960 from enkiller/add_image_h
[gui]包含"image.h"文件,解决未定义"struct rtgui_image_engine"问题
Diffstat (limited to 'components/gui')
| -rw-r--r-- | components/gui/src/image_jpg.c | 1 | ||||
| -rw-r--r-- | components/gui/src/image_png.c | 4 | ||||
| -rw-r--r-- | components/gui/src/image_xpm.c | 1 |
3 files changed, 4 insertions, 2 deletions
diff --git a/components/gui/src/image_jpg.c b/components/gui/src/image_jpg.c index c7ba06498d..66390d1cb5 100644 --- a/components/gui/src/image_jpg.c +++ b/components/gui/src/image_jpg.c @@ -24,6 +24,7 @@ */ #include <rtthread.h> #include <rtgui/rtgui.h> +#include <rtgui/image.h> #ifdef RTGUI_IMAGE_JPEG #include <stdio.h> diff --git a/components/gui/src/image_png.c b/components/gui/src/image_png.c index 40e9061581..1af8b92b36 100644 --- a/components/gui/src/image_png.c +++ b/components/gui/src/image_png.c @@ -22,10 +22,11 @@ * 2010-09-15 Bernard first version */ - #include <rtthread.h> +#include <rtthread.h> #include <rtgui/rtgui_system.h> #include <rtgui/blit.h> #include <rtgui/driver.h> +#include <rtgui/image.h> #ifdef RTGUI_IMAGE_PNG #include "png.h" @@ -424,7 +425,6 @@ void rtgui_image_png_init() #elif defined(RTGUI_IMAGE_LODEPNG) #include "lodepng.h" -#include <rtgui/image.h> static rt_bool_t rtgui_image_png_check(struct rtgui_filerw *file); static rt_bool_t rtgui_image_png_load(struct rtgui_image *image, struct rtgui_filerw *file, rt_bool_t load); diff --git a/components/gui/src/image_xpm.c b/components/gui/src/image_xpm.c index 5a7b9b4ed0..2f2a5f10c5 100644 --- a/components/gui/src/image_xpm.c +++ b/components/gui/src/image_xpm.c @@ -26,6 +26,7 @@ #include <rtgui/filerw.h> #include <rtgui/rtgui_system.h> +#include <rtgui/image.h> #ifdef RTGUI_IMAGE_XPM #define XPM_MAGIC_LEN 9 |