libs/rt-thread-official
libs
/
rt-thread-official
mirror of https://github.com/RT-Thread/rt-thread.git
4
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #1082 from enkiller/add_gui_demo 

[gui]修正不能正确获取图片数据长度的问题
This commit is contained in:
Bernard Xiong 2017-12-07 18:35:53 +08:00 committed by GitHub
parent 749fa2b73a 5b4215d1d7
commit aa65c75d8f
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
components/gui/example/gui_demo.c
View File

@ -9,7 +9,8 @@
#include <rtgui/widgets/window.h> #include <rtgui/widgets/window.h>
#include <rtgui/dc.h> #include <rtgui/dc.h>
extern const static unsigned char _picture_png[]; extern const unsigned char _picture_png[];
extern int _picture_png_length_get(void);
static rt_bool_t show_demo(struct rtgui_win *win) static rt_bool_t show_demo(struct rtgui_win *win)
{ {
@ -40,7 +41,7 @@ static rt_bool_t show_demo(struct rtgui_win *win)
rtgui_rect_t draw_rect; rtgui_rect_t draw_rect;
struct rtgui_image *img; struct rtgui_image *img;
img = rtgui_image_create_from_mem("png", _picture_png, sizeof(_picture_png), RT_TRUE); img = rtgui_image_create_from_mem("png", _picture_png, _picture_png_length_get(), RT_TRUE);
if (img != RT_NULL) if (img != RT_NULL)
{ {
draw_rect.x1 = rect.x2 / 2 + (rect.x2 / 2 - img->w) / 2; draw_rect.x1 = rect.x2 / 2 + (rect.x2 / 2 - img->w) / 2;

7
components/gui/example/resources.c
View File

@ -1,4 +1,4 @@
const static unsigned char _picture_png[] = { const unsigned char _picture_png[] = {
0x89,0x50,0x4e,0x47,0x0d,0x0a,0x1a,0x0a,0x00,0x00,0x00,0x0d,0x49,0x48,0x44,0x52, 0x89,0x50,0x4e,0x47,0x0d,0x0a,0x1a,0x0a,0x00,0x00,0x00,0x0d,0x49,0x48,0x44,0x52,
0x00,0x00,0x00,0xbe,0x00,0x00,0x00,0x4a,0x08,0x06,0x00,0x00,0x00,0x05,0x77,0xee, 0x00,0x00,0x00,0xbe,0x00,0x00,0x00,0x4a,0x08,0x06,0x00,0x00,0x00,0x05,0x77,0xee,
0x92,0x00,0x00,0x00,0x09,0x70,0x48,0x59,0x73,0x00,0x00,0x0b,0x13,0x00,0x00,0x0b, 0x92,0x00,0x00,0x00,0x09,0x70,0x48,0x59,0x73,0x00,0x00,0x0b,0x13,0x00,0x00,0x0b,
@ -1393,3 +1393,8 @@ const static unsigned char _picture_png[] = {
0x1f,0x00,0x4b,0xa8,0x7e,0x3f,0xd2,0x12,0x11,0x79,0x00,0x00,0x00,0x00,0x49,0x45, 0x1f,0x00,0x4b,0xa8,0x7e,0x3f,0xd2,0x12,0x11,0x79,0x00,0x00,0x00,0x00,0x49,0x45,
0x4e,0x44,0xae,0x42,0x60,0x82, 0x4e,0x44,0xae,0x42,0x60,0x82,
}; };
int _picture_png_length_get(void)
{
return sizeof(_picture_png);
}