Embedded/lvgl
1
0
Fork 0
mirror of https://github.com/lvgl/lvgl.git synced 2025-02-04 07:13:00 +08:00
Code Issues Projects Releases Wiki Activity

minor fixes

Browse Source
This commit is contained in:
Gabor Kiss-Vamosi 2019-11-25 12:24:17 +01:00
parent 4215516fb8
commit 257f1ed2fe
2 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/lv_api_map.h
View File

@ -30,21 +30,30 @@ extern "C" {
/*--------------------- /*---------------------
* V6.0 COMPATIBILITY * V6.0 COMPATIBILITY
*--------------------*/ *--------------------*/
#if LV_USE_CHART
#define lv_chart_get_point_cnt lv_chart_get_point_count #define lv_chart_get_point_cnt lv_chart_get_point_count
#endif
#if LV_USE_DDLIST
static inline void lv_ddlist_set_draw_arrow(lv_obj_t * ddlist, bool en) static inline void lv_ddlist_set_draw_arrow(lv_obj_t * ddlist, bool en)
{ {
if(en) lv_ddlist_set_symbol(ddlist, LV_SYMBOL_DOWN); if(en) lv_ddlist_set_symbol(ddlist, LV_SYMBOL_DOWN);
else lv_ddlist_set_symbol(ddlist, NULL); else lv_ddlist_set_symbol(ddlist, NULL);
} }
static inline bool lv_ddlist_get_draw_arrow(lv_obj_t * ddlist) static inline bool lv_ddlist_get_draw_arrow(lv_obj_t * ddlist)
{ {
if(lv_ddlist_get_symbol(ddlist)) return true; if(lv_ddlist_get_symbol(ddlist)) return true;
else return false; else return false;
} }
#endif
/********************** /**********************
* MACROS * MACROS
**********************/ **********************/

8
src/lv_draw/lv_img_decoder.c
View File

@ -623,7 +623,7 @@ static lv_res_t lv_img_decoder_built_in_line_alpha(lv_img_decoder_dsc_t * dsc, l
#if LV_USE_FILESYSTEM #if LV_USE_FILESYSTEM
lv_img_decoder_built_in_data_t * user_data = dsc->user_data; lv_img_decoder_built_in_data_t * user_data = dsc->user_data;
uint8_t * fs_buf = lv_draw_buf_get(w); uint8_t * fs_buf = lv_mem_buf_get(w);
#endif #endif
const uint8_t * data_tmp = NULL; const uint8_t * data_tmp = NULL;
@ -658,7 +658,7 @@ static lv_res_t lv_img_decoder_built_in_line_alpha(lv_img_decoder_dsc_t * dsc, l
} }
} }
#if LV_USE_FILESYSTEM #if LV_USE_FILESYSTEM
lv_draw_buf_release(fs_buf); lv_mem_buf_release(fs_buf);
#endif #endif
return LV_RES_OK; return LV_RES_OK;
@ -712,7 +712,7 @@ static lv_res_t lv_img_decoder_built_in_line_indexed(lv_img_decoder_dsc_t * dsc,
lv_img_decoder_built_in_data_t * user_data = dsc->user_data; lv_img_decoder_built_in_data_t * user_data = dsc->user_data;
#if LV_USE_FILESYSTEM #if LV_USE_FILESYSTEM
uint8_t * fs_buf = lv_draw_buf_get(w); uint8_t * fs_buf = lv_mem_buf_get(w);
#endif #endif
const uint8_t * data_tmp = NULL; const uint8_t * data_tmp = NULL;
if(dsc->src_type == LV_IMG_SRC_VARIABLE) { if(dsc->src_type == LV_IMG_SRC_VARIABLE) {
@ -756,7 +756,7 @@ static lv_res_t lv_img_decoder_built_in_line_indexed(lv_img_decoder_dsc_t * dsc,
} }
} }
#if LV_USE_FILESYSTEM #if LV_USE_FILESYSTEM
lv_draw_buf_release(fs_buf); lv_mem_buf_release(fs_buf);
#endif #endif
return LV_RES_OK; return LV_RES_OK;
#else #else