diff --git a/src/core/lv_global.h b/src/core/lv_global.h index 2b36a10e5f..fdbf7394dd 100644 --- a/src/core/lv_global.h +++ b/src/core/lv_global.h @@ -99,7 +99,6 @@ typedef struct _lv_global_t { #if LV_CACHE_DEF_SIZE > 0 lv_cache_t * img_cache; - size_t cache_builtin_max_size; #endif lv_draw_global_info_t draw_info; diff --git a/src/draw/lv_image_decoder.c b/src/draw/lv_image_decoder.c index 52899266b9..fb8ac193db 100644 --- a/src/draw/lv_image_decoder.c +++ b/src/draw/lv_image_decoder.c @@ -117,14 +117,7 @@ lv_result_t lv_image_decoder_open(lv_image_decoder_dsc_t * dsc, const void * src dsc->src_type = src_type; if(dsc->src_type == LV_IMAGE_SRC_FILE) { - size_t fnlen = lv_strlen(src); - dsc->src = lv_malloc(fnlen + 1); - LV_ASSERT_MALLOC(dsc->src); - if(dsc->src == NULL) { - LV_LOG_WARN("Out of memory"); - return LV_RESULT_INVALID; - } - lv_strcpy((char *)dsc->src, src); + dsc->src = lv_strdup(src); } else { dsc->src = src; @@ -133,7 +126,6 @@ lv_result_t lv_image_decoder_open(lv_image_decoder_dsc_t * dsc, const void * src lv_result_t res = LV_RESULT_INVALID; lv_image_decoder_t * decoder; - lv_image_decoder_args_t * args_copy = NULL; static const lv_image_decoder_args_t def_args = { .stride_align = LV_DRAW_BUF_STRIDE_ALIGN != 1, @@ -181,8 +173,6 @@ lv_result_t lv_image_decoder_open(lv_image_decoder_dsc_t * dsc, const void * src if(dsc->src_type == LV_IMAGE_SRC_FILE) lv_free((void *)dsc->src); - if(args_copy) lv_free(args_copy); - return res; }