Embedded/lvgl
1
0
Fork 0
mirror of https://github.com/lvgl/lvgl.git synced 2025-01-14 06:42:58 +08:00
Code Issues Projects Releases Wiki Activity

free the buffer of font decompression

Browse Source
This commit is contained in:
Gabor Kiss-Vamosi 2020-05-06 09:27:28 +02:00
parent adbc158a5c
commit 12919453d3
3 changed files with 25 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/lv_core/lv_refr.c
View File

@ -16,6 +16,7 @@
#include "../lv_misc/lv_math.h" #include "../lv_misc/lv_math.h"
#include "../lv_misc/lv_gc.h" #include "../lv_misc/lv_gc.h"
#include "../lv_draw/lv_draw.h" #include "../lv_draw/lv_draw.h"
#include "../lv_font/lv_font_fmt_txt.h"
#if LV_USE_PERF_MONITOR #if LV_USE_PERF_MONITOR
#include "../lv_widgets/lv_label.h" #include "../lv_widgets/lv_label.h"
@ -245,6 +246,7 @@ void lv_disp_refr_task(lv_task_t * task)
} }
lv_mem_buf_free_all(); lv_mem_buf_free_all();
lv_font_clean_up_fmt_txt();
#if LV_USE_PERF_MONITOR && LV_USE_LABEL #if LV_USE_PERF_MONITOR && LV_USE_LABEL
static lv_obj_t * perf_label = NULL; static lv_obj_t * perf_label = NULL;

26
src/lv_font/lv_font_fmt_txt.c
View File

@ -47,7 +47,7 @@ static inline uint8_t rle_next(void);
/********************** /**********************
* STATIC VARIABLES * STATIC VARIABLES
**********************/ **********************/
static uint8_t * decompr_buf;
static uint32_t rle_rdp; static uint32_t rle_rdp;
static const uint8_t * rle_in; static const uint8_t * rle_in;
static uint8_t rle_bpp; static uint8_t rle_bpp;
@ -88,19 +88,18 @@ const uint8_t * lv_font_get_bitmap_fmt_txt(const lv_font_t * font, uint32_t unic
} }
/*Handle compressed bitmap*/ /*Handle compressed bitmap*/
else { else {
static uint8_t * buf = NULL;
uint32_t gsize = gdsc->box_w * gdsc->box_h; uint32_t gsize = gdsc->box_w * gdsc->box_h;
if(gsize == 0) return NULL; if(gsize == 0) return NULL;
if(lv_mem_get_size(buf) < gsize) { if(lv_mem_get_size(decompr_buf) < gsize) {
buf = lv_mem_realloc(buf, gsize); decompr_buf = lv_mem_realloc(decompr_buf, gsize);
LV_ASSERT_MEM(buf); LV_ASSERT_MEM(decompr_buf);
if(buf == NULL) return NULL; if(decompr_buf == NULL) return NULL;
} }
decompress(&fdsc->glyph_bitmap[gdsc->bitmap_index], buf, gdsc->box_w, gdsc->box_h, (uint8_t)fdsc->bpp); decompress(&fdsc->glyph_bitmap[gdsc->bitmap_index], decompr_buf, gdsc->box_w, gdsc->box_h, (uint8_t)fdsc->bpp);
return buf; return decompr_buf;
} }
/*If not returned earlier then the letter is not found in this font*/ /*If not returned earlier then the letter is not found in this font*/
@ -158,6 +157,17 @@ bool lv_font_get_glyph_dsc_fmt_txt(const lv_font_t * font, lv_font_glyph_dsc_t *
return true; return true;
} }
/**
* Free the allocated memories.
*/
void lv_font_clean_up_fmt_txt(void)
{
if(decompr_buf) {
lv_mem_free(decompr_buf);
decompr_buf = NULL;
}
}
/********************** /**********************
* STATIC FUNCTIONS * STATIC FUNCTIONS
**********************/ **********************/

5
src/lv_font/lv_font_fmt_txt.h
View File

@ -218,6 +218,11 @@ const uint8_t * lv_font_get_bitmap_fmt_txt(const lv_font_t * font, uint32_t lett
bool lv_font_get_glyph_dsc_fmt_txt(const lv_font_t * font, lv_font_glyph_dsc_t * dsc_out, uint32_t unicode_letter, bool lv_font_get_glyph_dsc_fmt_txt(const lv_font_t * font, lv_font_glyph_dsc_t * dsc_out, uint32_t unicode_letter,
uint32_t unicode_letter_next); uint32_t unicode_letter_next);
/**
* Free the allocated memories.
*/
void lv_font_clean_up_fmt_txt(void);
/********************** /**********************
* MACROS * MACROS
**********************/ **********************/