aboutsummaryrefslogtreecommitdiffstats
path: root/src/gdisp
diff options
context:
space:
mode:
authorinmarket <andrewh@inmarket.com.au>2013-07-30 14:19:50 +1000
committerinmarket <andrewh@inmarket.com.au>2013-07-30 14:19:50 +1000
commit99642e2a99a0a94e7dad886e323f924ce8af0a36 (patch)
tree368d0a6058c5dcde66671a9fea23f83abde12c3f /src/gdisp
parent0ee1b2045128d1a3e40a7caec4ff2dc718caf741 (diff)
downloaduGFX-99642e2a99a0a94e7dad886e323f924ce8af0a36.tar.gz
uGFX-99642e2a99a0a94e7dad886e323f924ce8af0a36.tar.bz2
uGFX-99642e2a99a0a94e7dad886e323f924ce8af0a36.zip
From mcufont upstream: Fix inconsistency between UTF8 and other encodings
Diffstat (limited to 'src/gdisp')
-rw-r--r--src/gdisp/mcufont/mf_encoding.c11
1 files changed, 8 insertions, 3 deletions
diff --git a/src/gdisp/mcufont/mf_encoding.c b/src/gdisp/mcufont/mf_encoding.c
index 2c8abf3a..e0c89355 100644
--- a/src/gdisp/mcufont/mf_encoding.c
+++ b/src/gdisp/mcufont/mf_encoding.c
@@ -75,11 +75,16 @@ void mf_rewind(mf_str *str)
#else
-mf_char mf_getchar(mf_str *str) {
- return *(*str)++;
+mf_char mf_getchar(mf_str *str)
+{
+ if (!(**str))
+ return 0;
+ else
+ return *(*str)++;
}
-void mf_rewind(mf_str *str) {
+void mf_rewind(mf_str *str)
+{
(*str)--;
}