diff options
| author | Bernard Xiong <[email protected]> | 2017-12-07 18:35:53 +0800 |
|---|---|---|
| committer | GitHub <[email protected]> | 2017-12-07 18:35:53 +0800 |
| commit | aa65c75d8f9653a09c682ba222be34dea4e34458 (patch) | |
| tree | 8c6ee9f8ab2ecdcacab2d562a3f58e87828d711d /components | |
| parent | 749fa2b73a56541e90a81c36f4c612c98939a054 (diff) | |
| parent | 5b4215d1d78ddacfdb67db1400484fdece7b57ed (diff) | |
Merge pull request #1082 from enkiller/add_gui_demo
[gui]修正不能正确获取图片数据长度的问题
Diffstat (limited to 'components')
| -rw-r--r-- | components/gui/example/gui_demo.c | 5 | ||||
| -rw-r--r-- | components/gui/example/resources.c | 7 |
2 files changed, 9 insertions, 3 deletions
diff --git a/components/gui/example/gui_demo.c b/components/gui/example/gui_demo.c index fc4a361bab..901e21ff9f 100644 --- a/components/gui/example/gui_demo.c +++ b/components/gui/example/gui_demo.c @@ -9,7 +9,8 @@ #include <rtgui/widgets/window.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) { @@ -40,7 +41,7 @@ static rt_bool_t show_demo(struct rtgui_win *win) rtgui_rect_t draw_rect; 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) { draw_rect.x1 = rect.x2 / 2 + (rect.x2 / 2 - img->w) / 2; diff --git a/components/gui/example/resources.c b/components/gui/example/resources.c index 06c0e0fcae..99fd805c1d 100644 --- a/components/gui/example/resources.c +++ b/components/gui/example/resources.c @@ -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, 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, @@ -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, 0x4e,0x44,0xae,0x42,0x60,0x82, }; + +int _picture_png_length_get(void) +{ + return sizeof(_picture_png); +} |