github-code/lvgl
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix file handling in image decoder

Browse Source
This commit is contained in:
Gabor Kiss-Vamosi
2020-09-15 08:32:41 +02:00
parent 572974b5e0
commit c46be31df1
1 changed files with 1 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/lv_draw/lv_img_decoder.c
View File

@@ -342,16 +342,7 @@ lv_res_t lv_img_decoder_built_in_open(lv_img_decoder_t * decoder, lv_img_decoder
} }
lv_img_decoder_built_in_data_t * user_data = dsc->user_data; lv_img_decoder_built_in_data_t * user_data = dsc->user_data;
user_data->f = lv_mem_alloc(sizeof(f)); user_data->f = f;
LV_ASSERT_MEM(user_data->f);
if(user_data->f == NULL) {
LV_LOG_ERROR("img_decoder_built_in_open: out of memory");
lv_img_decoder_built_in_close(decoder, dsc);
return LV_RES_INV;
}
_lv_memcpy_small(user_data->f, &f, sizeof(f));
#else #else
LV_LOG_WARN("Image built-in decoder cannot read file because LV_USE_FILESYSTEM = 0"); LV_LOG_WARN("Image built-in decoder cannot read file because LV_USE_FILESYSTEM = 0");
return LV_RES_INV; return LV_RES_INV;
@@ -523,7 +514,6 @@ void lv_img_decoder_built_in_close(lv_img_decoder_t * decoder, lv_img_decoder_ds
#if LV_USE_FILESYSTEM #if LV_USE_FILESYSTEM
if(user_data->f) { if(user_data->f) {
lv_fs_close(user_data->f); lv_fs_close(user_data->f);
lv_mem_free(user_data->f);
} }
#endif #endif
if(user_data->palette) lv_mem_free(user_data->palette); if(user_data->palette) lv_mem_free(user_data->palette);