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

feat(imgfont): add option to use img cache to buffer img headers (#3504)

Browse Source 
Co-authored-by: pengyiqiang <pengyiqiang@xiaomi.com>
This commit is contained in:
_VIFEXTech
2022-07-19 19:33:55 +08:00
committed by GitHub
parent 451a1e56f9
commit a6f7370d75
4 changed files with 52 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Kconfig
View File

@@ -1016,6 +1016,14 @@ menu "LVGL configuration"
config LV_USE_IMGFONT config LV_USE_IMGFONT
bool "draw img in label or span obj" bool "draw img in label or span obj"
default n default n
config LV_IMGFONT_PATH_MAX_LEN
int "Imgfont image file path maximum length"
depends on LV_USE_IMGFONT
default 64
config LV_IMGFONT_USE_IMG_CACHE_HEADER
bool "Use img cache to buffer header information"
depends on LV_USE_IMGFONT
default n
config LV_USE_MSG config LV_USE_MSG
bool "Enable a published subscriber based messaging system" bool "Enable a published subscriber based messaging system"

7
lv_conf_template.h
View File

@@ -669,6 +669,13 @@
/*1: Support using images as font in label or span widgets */ /*1: Support using images as font in label or span widgets */
#define LV_USE_IMGFONT 0 #define LV_USE_IMGFONT 0
#if LV_USE_IMGFONT
/*Imgfont image file path maximum length*/
#define LV_IMGFONT_PATH_MAX_LEN 64
/*1: Use img cache to buffer header information*/
#define LV_IMGFONT_USE_IMG_CACHE_HEADER 0
#endif
/*1: Enable a published subscriber based messaging system */ /*1: Enable a published subscriber based messaging system */
#define LV_USE_MSG 0 #define LV_USE_MSG 0

22
src/extra/others/imgfont/lv_imgfont.c
View File

@@ -13,7 +13,6 @@
/********************* /*********************
* DEFINES * DEFINES
*********************/ *********************/
#define LV_IMGFONT_PATH_MAX_LEN 64
/********************** /**********************
* TYPEDEFS * TYPEDEFS
@@ -107,15 +106,30 @@ static bool imgfont_get_glyph_dsc(const lv_font_t * font, lv_font_glyph_dsc_t *
return false; return false;
} }
const lv_img_header_t * img_header;
#if LV_IMGFONT_USE_IMG_CACHE_HEADER
lv_color_t color = { 0 };
_lv_img_cache_entry_t * entry = _lv_img_cache_open(dsc->path, color, 0);
if(entry == NULL) {
return false;
}
img_header = &entry->dec_dsc.header;
#else
lv_img_header_t header; lv_img_header_t header;
if(lv_img_decoder_get_info(dsc->path, &header) != LV_RES_OK) { if(lv_img_decoder_get_info(dsc->path, &header) != LV_RES_OK) {
return false; return false;
} }
img_header = &header;
#endif
dsc_out->is_placeholder = 0; dsc_out->is_placeholder = 0;
dsc_out->adv_w = header.w; dsc_out->adv_w = img_header->w;
dsc_out->box_w = header.w; dsc_out->box_w = img_header->w;
dsc_out->box_h = header.h; dsc_out->box_h = img_header->h;
dsc_out->bpp = LV_IMGFONT_BPP; /* is image identifier */ dsc_out->bpp = LV_IMGFONT_BPP; /* is image identifier */
dsc_out->ofs_x = 0; dsc_out->ofs_x = 0;
dsc_out->ofs_y = 0; dsc_out->ofs_y = 0;

19
src/lv_conf_internal.h
View File

@@ -2229,6 +2229,25 @@
#define LV_USE_IMGFONT 0 #define LV_USE_IMGFONT 0
#endif #endif
#endif #endif
#if LV_USE_IMGFONT
/*Imgfont image file path maximum length*/
#ifndef LV_IMGFONT_PATH_MAX_LEN
#ifdef CONFIG_LV_IMGFONT_PATH_MAX_LEN
#define LV_IMGFONT_PATH_MAX_LEN CONFIG_LV_IMGFONT_PATH_MAX_LEN
#else
#define LV_IMGFONT_PATH_MAX_LEN 64
#endif
#endif
/*1: Use img cache to buffer header information*/
#ifndef LV_IMGFONT_USE_IMG_CACHE_HEADER
#ifdef CONFIG_LV_IMGFONT_USE_IMG_CACHE_HEADER
#define LV_IMGFONT_USE_IMG_CACHE_HEADER CONFIG_LV_IMGFONT_USE_IMG_CACHE_HEADER
#else
#define LV_IMGFONT_USE_IMG_CACHE_HEADER 0
#endif
#endif
#endif
/*1: Enable a published subscriber based messaging system */ /*1: Enable a published subscriber based messaging system */
#ifndef LV_USE_MSG #ifndef LV_USE_MSG