Merge branch 'master' of https://github.com/RT-Thread/rt-thread

2 files changed, 6 insertions, 2 deletions

diff --git a/components/gui/src/image_hdc.c b/components/gui/src/image_hdc.c
index b82a10625b..b8563c5887 100644
--- a/components/gui/src/image_hdc.c
+++ b/components/gui/src/image_hdc.c
@@ -128,7 +128,8 @@ static rt_bool_t rtgui_image_hdc_load(struct rtgui_image *image, struct rtgui_fi
     {
         if (header[3] == 2)
         {
-#if 0   /* TODO: add HDC with fastlz compressed */
+#ifdef PKG_USING_FASTLZ
+            /* TODO: add HDC with fastlz compressed */
             int data_length, dec_length;
             rt_uint8_t *data;
 
@@ -173,6 +174,9 @@ static rt_bool_t rtgui_image_hdc_load(struct rtgui_image *image, struct rtgui_fi
             }
             hdc->pixel_offset = 0;
             rtgui_free(data);
+#else
+            hdc->pixels = RT_NULL;
+            return RT_FALSE;
 #endif
         }
         else
diff --git a/components/gui/src/image_png.c b/components/gui/src/image_png.c
index 4d5512bf24..40e9061581 100644
--- a/components/gui/src/image_png.c
+++ b/components/gui/src/image_png.c
@@ -424,7 +424,7 @@ void rtgui_image_png_init()
 
 #elif defined(RTGUI_IMAGE_LODEPNG)
 #include "lodepng.h"
-#include <rtgui/image_png.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);