Embedded/lvgl
1
0
Fork 0
mirror of https://github.com/lvgl/lvgl.git synced 2025-01-28 07:03:00 +08:00
Code Issues Projects Releases Wiki Activity

font: fix glyph_ids_size usage

Browse Source
This commit is contained in:
Gabor Kiss-Vamosi 2019-06-05 12:28:31 +02:00
parent c54d2d2fd7
commit 62c531eec3
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/lv_misc/lv_font_fmt/lv_font_fmt_txt.c
View File

@ -160,7 +160,7 @@ static int8_t get_kern_value(const lv_font_t * font, uint32_t gid_left, uint32_t
if(fdsc->kern_classes == 0) {
/*Kern pairs*/
const lv_font_fmt_txt_kern_pair_t * kdsc = fdsc->kern_dsc;
if(kdsc->glyph_ids_size == 1) {
if(kdsc->glyph_ids_size == 0) {
const uint8_t * g_ids = kdsc->glyph_ids;
for(k = 0; k < (uint32_t)kdsc->pair_cnt * 2; k += 2) {
if(g_ids[k] == gid_left &&
@ -169,7 +169,7 @@ static int8_t get_kern_value(const lv_font_t * font, uint32_t gid_left, uint32_t
break;
}
}
} else {
} else if(kdsc->glyph_ids_size == 1) {
const uint16_t * g_ids = kdsc->glyph_ids;
for(k = 0; k < (uint32_t)kdsc->pair_cnt * 2; k += 2) {
if(g_ids[k] == gid_left &&
@ -178,6 +178,8 @@ static int8_t get_kern_value(const lv_font_t * font, uint32_t gid_left, uint32_t
break;
}
}
} else {
/*Invalid value*/
}
} else {
/*Kern classes*/