mirrors/lvgl
0
0
Fork 0
mirror of https://github.com/lvgl/lvgl.git synced 2024-11-23 17:53:45 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix font laoder supprt LV_FONT_FMT_TXT_LARGE

Browse Source
This commit is contained in:
Gabor Kiss-Vamosi 2020-09-21 11:57:20 +02:00
parent d547d8afe1
commit 1067d04c03
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -21,6 +21,7 @@
- Fix divisioin by zero in draw_pattern (lv_draw_rect.c) if the image or letter is not found
- Fix drawing images with 1 px height or width
- Fix selectiion of options with non-ASCII letters in dropdown list
- Fix font loader to support LV_FONT_FMT_TXT_LARGE
## v7.4.0 (01.09.2020)

2
src/lv_font/lv_font_loader.c
View File

@ -225,7 +225,7 @@ static int read_bits_signed(bit_iterator_t * it, int n_bits, lv_fs_res_t * res)
{
int value = read_bits(it, n_bits, res);
if(value & (1 << (n_bits - 1))) {
for(int bit = n_bits; bit < 8; ++bit) {
for(int bit = n_bits; bit < 16; ++bit) {
value |= (1 << bit);
}
}

6
tests/lv_test_core/lv_test_font_loader.c
View File

@ -28,7 +28,7 @@
* STATIC PROTOTYPES
**********************/
#if LV_USE_FILESYSTEM && LV_FONT_FMT_TXT_LARGE == 0
#if LV_USE_FILESYSTEM
static int compare_fonts(lv_font_t * f1, lv_font_t * f2);
#endif
@ -50,7 +50,7 @@ extern lv_font_t font_3;
void lv_test_font_loader(void)
{
#if LV_USE_FILESYSTEM && LV_FONT_FMT_TXT_LARGE == 0
#if LV_USE_FILESYSTEM
lv_font_t * font_1_bin = lv_font_load("f:font_1.fnt");
lv_font_t * font_2_bin = lv_font_load("f:font_2.fnt");
lv_font_t * font_3_bin = lv_font_load("f:font_3.fnt");
@ -67,7 +67,7 @@ void lv_test_font_loader(void)
#endif
}
#if LV_USE_FILESYSTEM && LV_FONT_FMT_TXT_LARGE == 0
#if LV_USE_FILESYSTEM
static int compare_fonts(lv_font_t * f1, lv_font_t * f2)
{
lv_test_assert_true(f1 != NULL && f2 != NULL, "font not null");