From 4712d4b3551585e2fa59b620ecaed9cacabb8ce1 Mon Sep 17 00:00:00 2001
From: xianjimli <xianjimli@gmail.com>
Date: Sat, 9 Jun 2018 19:05:56 +0800
Subject: [PATCH] update resource

---
 .gitignore                           |  12 ++++++++++++
 demos/res/inc/images/bricks.data     |   2 +-
 demos/res/inc/images/checked.data    |   2 +-
 demos/res/inc/images/earth.data      |   2 +-
 demos/res/inc/images/middle_off.data |   2 +-
 demos/res/inc/strings/en_US.data     |   2 +-
 demos/res/inc/strings/zh_CN.data     |   2 +-
 demos/res/inc/ui/animator.data       |   2 +-
 demos/res/inc/ui/main.data           |   6 +++---
 demos/res/inc/ui/top.data            |   2 +-
 demos/res/raw/ui/main.bin            | Bin 388 -> 388 bytes
 demos/res/raw/ui/main.xml            |   2 +-
 demos/resource.c                     |   6 +++---
 tools/image_gen/image_gen.c          |   2 +-
 14 files changed, 28 insertions(+), 16 deletions(-)

diff --git a/.gitignore b/.gitignore
index c3008b3c0..8ba41a0ba 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,3 +12,15 @@ lua/demo1
 lua/lftk_run
 lib
 tags
+bin/demo1
+bin/demo_animator
+bin/demo_thread
+bin/demotr
+bin/demovg
+bin/fontgen
+bin/imagegen
+bin/preview_ui
+bin/resgen
+bin/runLua
+bin/runTest
+bin/strgen
diff --git a/demos/res/inc/images/bricks.data b/demos/res/inc/images/bricks.data
index ebaece085..0041d9ab2 100644
--- a/demos/res/inc/images/bricks.data
+++ b/demos/res/inc/images/bricks.data
@@ -361,4 +361,4 @@ const unsigned char image_bricks[] = {
 0xcd,0xbb,0xcc,0xbb,0xed,0xbb,0x0d,0xc4,0x0d,0xbc,0x0d,0xc4,0x0d,0xc4,0x0d,0xc4,0xed,0xc3,0x0d,0xc4,
 0x0d,0xc4,0x0d,0xc4,0x0e,0xcc,0x11,0xd5,0xb0,0xc4,0xad,0xbb,0xac,0xbb,0xec,0xc3,0xec,0xc3,0xcc,0xbb,
 0xcc,0xbb,0xcc,0xc3,0xcc,0xc3,0xed,0xc3,0xed,0xc3,0xcc,0xbb,0xcc,0xbb,0xd2,0xc4,0x00,0x00,0x00,0x00,
-0x00,0x00,0x00,0x00,};/*7244*/
+0x00,0x00,0x01,0x03,};/*7244*/
diff --git a/demos/res/inc/images/checked.data b/demos/res/inc/images/checked.data
index b189b21c2..77ab9e71e 100644
--- a/demos/res/inc/images/checked.data
+++ b/demos/res/inc/images/checked.data
@@ -116,4 +116,4 @@ const unsigned char image_checked[] = {
 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,};/*2348*/
+0x00,0x00,0x00,0x00,0x30,0x21,0x60,0x79,};/*2348*/
diff --git a/demos/res/inc/images/earth.data b/demos/res/inc/images/earth.data
index 7f4137aa5..5882be71e 100644
--- a/demos/res/inc/images/earth.data
+++ b/demos/res/inc/images/earth.data
@@ -116,4 +116,4 @@ const unsigned char image_earth[] = {
 0x00,0x00,0x00,0xb4,0x00,0x00,0x00,0xdf,0x00,0x00,0x00,0xff,0x00,0x00,0x00,0xff,0x00,0x00,0x00,0xdf,
 0x00,0x00,0x00,0xb4,0x00,0x00,0x00,0x73,0x00,0x00,0x00,0x0d,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,};/*2348*/
+0x00,0x00,0x00,0x00,0x50,0x01,0xd0,0xf1,};/*2348*/
diff --git a/demos/res/inc/images/middle_off.data b/demos/res/inc/images/middle_off.data
index b56771089..0e922e701 100644
--- a/demos/res/inc/images/middle_off.data
+++ b/demos/res/inc/images/middle_off.data
@@ -116,4 +116,4 @@ const unsigned char image_middle_off[] = {
 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
-0x00,0x00,0x00,0x00,0x88,0x2a,0xe9,0x7a,};/*2348*/
+0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,};/*2348*/
diff --git a/demos/res/inc/strings/en_US.data b/demos/res/inc/strings/en_US.data
index f92a291b0..1e2cbaac7 100644
--- a/demos/res/inc/strings/en_US.data
+++ b/demos/res/inc/strings/en_US.data
@@ -2,4 +2,4 @@ const unsigned char strings_en_US[] = {
 0x06,0x00,0x00,0x01,0x30,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x65,0x6e,0x5f,0x55,0x53,0x00,0x64,0x61,
 0x74,0x61,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02,0x00,0x1c,0x00,0x00,0x00,0x23,0x00,0x00,0x00,
 0x2a,0x00,0x00,0x00,0x2d,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x63,0x61,0x6e,0x63,
-0x65,0x6c,0x00,0x43,0x61,0x6e,0x63,0x65,0x6c,0x00,0x6f,0x6b,0x00,0x4f,0x4b,0x00,0x00,0x00,0x00,0x00,};/*80*/
+0x65,0x6c,0x00,0x43,0x61,0x6e,0x63,0x65,0x6c,0x00,0x6f,0x6b,0x00,0x4f,0x4b,0x00,0x00,0x00,0x05,0x00,};/*80*/
diff --git a/demos/res/inc/strings/zh_CN.data b/demos/res/inc/strings/zh_CN.data
index b8000cb8d..775ed1158 100644
--- a/demos/res/inc/strings/zh_CN.data
+++ b/demos/res/inc/strings/zh_CN.data
@@ -3,4 +3,4 @@ const unsigned char strings_zh_CN[] = {
 0x74,0x61,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x02,0x00,0x1c,0x00,0x00,0x00,0x23,0x00,0x00,0x00,
 0x2a,0x00,0x00,0x00,0x2d,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x63,0x61,0x6e,0x63,
 0x65,0x6c,0x00,0xe5,0x8f,0x96,0xe6,0xb6,0x88,0x00,0x6f,0x6b,0x00,0xe7,0xa1,0xae,0xe5,0xae,0x9a,0x00,
-0x00,0x00,0x00,0x00,};/*84*/
+0x02,0x00,0xe8,0x7a,};/*84*/
diff --git a/demos/res/inc/ui/animator.data b/demos/res/inc/ui/animator.data
index 6d3a37789..51bd36cbb 100644
--- a/demos/res/inc/ui/animator.data
+++ b/demos/res/inc/ui/animator.data
@@ -6,4 +6,4 @@ const unsigned char ui_animator[] = {
 0x30,0x20,0x68,0x33,0x30,0x20,0x35,0x20,0x31,0x30,0x00,0x00,0x01,0x00,0x0a,0x00,0x00,0x00,0x01,0x00,
 0x0a,0x00,0x00,0x00,0x05,0x00,0x00,0x00,0x19,0x00,0x00,0x00,0x1e,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
 0x6e,0x61,0x6d,0x65,0x00,0x63,0x6c,0x6f,0x73,0x65,0x00,0x74,0x65,0x78,0x74,0x00,0x43,0x6c,0x6f,0x73,
-0x65,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,};/*149*/
+0x65,0x00,0x00,0x00,0x00,0x92,0xd1,0x29,0xe7,};/*149*/
diff --git a/demos/res/inc/ui/main.data b/demos/res/inc/ui/main.data
index 2b310a5c1..038014959 100644
--- a/demos/res/inc/ui/main.data
+++ b/demos/res/inc/ui/main.data
@@ -2,8 +2,8 @@ const unsigned char ui_main[] = {
 0x04,0x00,0x01,0x01,0x84,0x01,0x00,0x00,0x00,0x00,0x00,0x00,0x6d,0x61,0x69,0x6e,0x00,0x64,0x61,0x74,
 0x61,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x12,0x12,0x22,0x11,0x01,0x00,0x02,0x00,0x00,0x00,0x00,0x00,
 0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x40,0x01,0x00,0x00,0xe0,0x01,0x00,0x00,0x00,0x00,0x00,0x00,
-0x6e,0x61,0x6d,0x65,0x00,0x6d,0x61,0x69,0x6e,0x00,0x6c,0x61,0x79,0x6f,0x75,0x74,0x00,0x77,0x31,0x30,
-0x30,0x20,0x68,0x33,0x30,0x20,0x35,0x20,0x31,0x30,0x00,0x00,0x01,0x00,0x0a,0x00,0x00,0x00,0x01,0x00,
+0x6e,0x61,0x6d,0x65,0x00,0x6d,0x61,0x69,0x6e,0x00,0x6c,0x61,0x79,0x6f,0x75,0x74,0x00,0x77,0x31,0x32,
+0x38,0x20,0x68,0x33,0x30,0x20,0x35,0x20,0x31,0x30,0x00,0x00,0x01,0x00,0x0a,0x00,0x00,0x00,0x01,0x00,
 0x0a,0x00,0x00,0x00,0x05,0x00,0x00,0x00,0x19,0x00,0x00,0x00,0x1e,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
 0x6e,0x61,0x6d,0x65,0x00,0x6f,0x70,0x65,0x6e,0x3a,0x6d,0x65,0x6d,0x74,0x65,0x73,0x74,0x00,0x74,0x65,
 0x78,0x74,0x00,0x4d,0x65,0x6d,0x54,0x65,0x73,0x74,0x00,0x00,0x00,0x01,0x00,0x0a,0x00,0x00,0x00,0x01,
@@ -19,4 +19,4 @@ const unsigned char ui_main[] = {
 0x64,0x6f,0x77,0x00,0x00,0x00,0x01,0x00,0x0a,0x00,0x03,0x00,0x01,0x00,0x0a,0x00,0x00,0x00,0x05,0x00,
 0x00,0x00,0x19,0x00,0x00,0x00,0x1e,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x6e,0x61,0x6d,0x65,0x00,0x6f,
 0x70,0x65,0x6e,0x3a,0x61,0x6e,0x69,0x6d,0x61,0x74,0x6f,0x72,0x00,0x74,0x65,0x78,0x74,0x00,0x41,0x6e,
-0x69,0x6d,0x61,0x74,0x65,0x20,0x57,0x69,0x64,0x67,0x65,0x74,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,};/*420*/
+0x69,0x6d,0x61,0x74,0x65,0x20,0x57,0x69,0x64,0x67,0x65,0x74,0x00,0x00,0x00,0x00,0x07,0x00,0x00,0x00,};/*420*/
diff --git a/demos/res/inc/ui/top.data b/demos/res/inc/ui/top.data
index 4cca31387..e16372724 100644
--- a/demos/res/inc/ui/top.data
+++ b/demos/res/inc/ui/top.data
@@ -12,4 +12,4 @@ const unsigned char ui_top[] = {
 0x00,0x71,0x75,0x69,0x74,0x00,0x74,0x65,0x78,0x74,0x00,0xe7,0xa1,0xae,0xe5,0xae,0x9a,0x00,0x00,0x00,
 0x01,0x00,0x0a,0x00,0x03,0x03,0x01,0x00,0x0a,0x00,0x00,0x00,0x0a,0x00,0x00,0x00,0x28,0x00,0x00,0x00,
 0x1e,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x6e,0x61,0x6d,0x65,0x00,0x71,0x75,0x69,0x74,0x00,0x74,0x65,
-0x78,0x74,0x00,0xe5,0x8f,0x96,0xe6,0xb6,0x88,0x00,0x00,0x00,0x00,0x00,0x70,0x00,0x6f,};/*277*/
+0x78,0x74,0x00,0xe5,0x8f,0x96,0xe6,0xb6,0x88,0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,};/*277*/
diff --git a/demos/res/raw/ui/main.bin b/demos/res/raw/ui/main.bin
index f6e59a4d4d534957ca5638d42cba4b00fbb9e92a..a7a39c6c6c899eb7f942b9fccebbac244c3ded95 100644
GIT binary patch
delta 13
UcmZo+ZegBa%w%M-(bS(202!+TbN~PV

delta 13
UcmZo+ZegBa%w%A&(bS(202y}!Y5)KL

diff --git a/demos/res/raw/ui/main.xml b/demos/res/raw/ui/main.xml
index 85b17d030..fad8512bf 100644
--- a/demos/res/raw/ui/main.xml
+++ b/demos/res/raw/ui/main.xml
@@ -1,4 +1,4 @@
-<window name="main" x="0" y="0" w="320" h="480" layout="w100 h30 5 10">
+<window name="main" x="0" y="0" w="320" h="480" layout="w128 h30 5 10">
     <button name="open:memtest" x="10" y="5" w="25%" h="30" text="MemTest"/>
     <button name="open:basic" x="10" y="5" w="25%" h="30" text="Basic"/>
     <button name="open:slide_view" x="center" y="5" w="25%" h="30" text="SlideView"/>
diff --git a/demos/resource.c b/demos/resource.c
index c6b239785..e847de7f7 100644
--- a/demos/resource.c
+++ b/demos/resource.c
@@ -90,13 +90,13 @@
 #include "res/inc/images/unchecked.data"
 #include "res/inc/images/unmuted.data"
 #include "res/inc/images/warn.data"
-#endif /*WITH_STB_IMAGE*/
+#endif/*WITH_STB_IMAGE*/
 #ifdef WITH_STB_FONT
 #include "res/inc/fonts/default.res"
 #else
 #include "res/inc/fonts/default.data"
-#endif /*WITH_STB_FONT*/
-#endif /*WITH_FS_RES*/
+#endif/*WITH_STB_FONT*/
+#endif/*WITH_FS_RES*/
 
 ret_t resource_init(void) {
   resource_manager_t* rm = resource_manager();
diff --git a/tools/image_gen/image_gen.c b/tools/image_gen/image_gen.c
index 3383f7a99..f1e38e282 100644
--- a/tools/image_gen/image_gen.c
+++ b/tools/image_gen/image_gen.c
@@ -57,7 +57,7 @@ uint32_t image_gen_buff(bitmap_t* image, uint8_t* output_buff, uint32_t buff_siz
 
   if (image->flags & BITMAP_FLAG_OPAQUE) {
     if (image->format == BITMAP_FMT_RGBA) {
-      if (bitmap_rgba_to_rgb565(image, header->data) == RET_OK) {
+      if (bitmap_rgba_to_rgb565(image, (uint16_t*)(header->data)) == RET_OK) {
         header->format = BITMAP_FMT_RGB565;
         size = sizeof(uint16_t) * image->w * image->h;
       } else {