aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorinmarket <inmarket@ugfx.org>2017-01-20 09:23:06 +1000
committerinmarket <inmarket@ugfx.org>2017-01-20 09:23:06 +1000
commit5502aef3e56db8665cba8885f4e5ef050f050f2e (patch)
treecf68dfb9b751da3bbb7fd8acbe3791d58f19059b
parentb90055d2f9792a7ee8df82ffc2a4d65bcf466e38 (diff)
downloaduGFX-5502aef3e56db8665cba8885f4e5ef050f050f2e.tar.gz
uGFX-5502aef3e56db8665cba8885f4e5ef050f050f2e.tar.bz2
uGFX-5502aef3e56db8665cba8885f4e5ef050f050f2e.zip
Increase non-UTF8 font support to 0 to 255 rather than just the true ascii set
-rw-r--r--changelog.txt1
-rw-r--r--src/gdisp/mcufont/mf_font.c2
2 files changed, 2 insertions, 1 deletions
diff --git a/changelog.txt b/changelog.txt
index 4fe38a35..cc04a7be 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -15,6 +15,7 @@ FEATURE: Added GDISP_IMAGE_PNG_FILE_BUFFER_SIZE configuration option
FEATURE: Added GDISP_IMAGE_PNG_Z_BUFFER_SIZE configuration option
FEATURE: Added GDISP_IMAGE_GIF_BLIT_BUFFER_SIZE configuration option
FIX: Fixed extra dots when drawing anti-aliased fonts with wordwrap
+FEATURE: Increase non-UTF8 font support to 0 to 255 rather than just the true ascii set
*** Release 2.7 ***
diff --git a/src/gdisp/mcufont/mf_font.c b/src/gdisp/mcufont/mf_font.c
index ccf71bec..b8989336 100644
--- a/src/gdisp/mcufont/mf_font.c
+++ b/src/gdisp/mcufont/mf_font.c
@@ -33,7 +33,7 @@ uint8_t mf_render_character(const struct mf_font_s *font,
void *state)
{
uint8_t width;
- width = font->render_character(font, x0, y0, character, callback, state);
+ width = font->render_character(font, x0, y0, MFCHAR2UINT16(character), callback, state);
if (!width)
{