Fix wrong Chinese characters being displayed (#1257)

* Fixed wrong index calculation.

* Fixed font generation, indexing will goes wrong when no extra chars bitmap is present.

* Image width exceeded 16384 will cause trouble in CJK.

* Include libopenui update

Co-authored-by: Peter Feerick <peter.feerick@gmail.com>
This commit is contained in:
richardclli
2021-12-17 10:32:28 +11:00
committed by GitHub
co-authored by Peter Feerick
parent 85bd9d16ea
commit 843d1be868
4 changed files with 22 additions and 13 deletions
+5 -1
View File
@@ -32,7 +32,11 @@ add_truetype_font_target(17 17 ${subset} none "${FONT_ARGS}")
add_truetype_font_target(17en 17 en none "${FONT_ARGS}")
add_truetype_font_target(bold17 17 ${subset} bold "${FONT_ARGS}")
add_truetype_font_target(24 24 ${subset} none "${FONT_ARGS}")
add_truetype_font_target(32 32 ${subset} bold "${FONT_ARGS}")
if( (${subset} STREQUAL "cn") OR (${subset} STREQUAL "tw"))
add_truetype_font_target(32 30 ${subset} bold "${FONT_ARGS}")
else()
add_truetype_font_target(32 32 ${subset} bold "${FONT_ARGS}")
endif()
add_truetype_font_target(64 64 en bold "${FONT_ARGS}")
add_custom_target(truetype_fonts DEPENDS ${truetype_fonts_targets})
+1 -1
View File
@@ -62,7 +62,7 @@ int getTextWidth(const char * s, int len, LcdFlags flags)
else if (c >= 0xFE) { // CJK marker
s++;
c = uint8_t(*s) + ((c & 0x01) << 8) - 1;
if (c >= 0x101)
if (c >= 0x100)
c -= 1;
c += CJK_FIRST_LETTER_INDEX;
result += getFontPatternWidth(specs, c) + 1;