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

Merge branch 'dev-6.0' of https://github.com/littlevgl/lvgl into dev-6.0

Browse Source
This commit is contained in:
Gabor Kiss-Vamosi 2019-05-20 15:52:22 +02:00
commit ba3e7d1da6
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/lv_core/lv_style.h
View File

@ -264,7 +264,7 @@ static inline lv_anim_user_data_t * lv_style_anim_get_user_data_ptr(lv_anim_t *
*/ */
static inline void lv_style_anim_create(lv_anim_t * a) static inline void lv_style_anim_create(lv_anim_t * a)
{ {
return lv_anim_create(a); lv_anim_create(a);
} }
#endif #endif

2
src/lv_draw/lv_img_decoder.c
View File

@ -425,7 +425,7 @@ static lv_res_t lv_img_decoder_built_in_read_line(lv_img_decoder_t * decoder, l
dsc->header.cf == LV_IMG_CF_TRUE_COLOR_ALPHA || dsc->header.cf == LV_IMG_CF_TRUE_COLOR_ALPHA ||
dsc->header.cf == LV_IMG_CF_TRUE_COLOR_CHROMA_KEYED) dsc->header.cf == LV_IMG_CF_TRUE_COLOR_CHROMA_KEYED)
{ {
/* For TRUE_COLOE images read line required only for files. /* For TRUE_COLOR images read line required only for files.
* For variables the image data was returned in `open`*/ * For variables the image data was returned in `open`*/
if(dsc->src_type == LV_IMG_SRC_FILE) { if(dsc->src_type == LV_IMG_SRC_FILE) {
res = lv_img_decoder_built_in_line_true_color(dsc, x, y, len, buf); res = lv_img_decoder_built_in_line_true_color(dsc, x, y, len, buf);