Merge pull request #960 from enkiller/add_image_h

[gui]包含"image.h"文件,解决未定义"struct rtgui_image_engine"问题
This commit is contained in:
Bernard Xiong 2017-11-06 17:38:35 +08:00 committed by GitHub
commit 22f9486b44
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 2 deletions

View File

@ -24,6 +24,7 @@
*/
#include <rtthread.h>
#include <rtgui/rtgui.h>
#include <rtgui/image.h>
#ifdef RTGUI_IMAGE_JPEG
#include <stdio.h>

View File

@ -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);

View File

@ -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