diff options
| author | mrwastl <mrwastl@users.sourceforge.net> | 2011-06-03 00:13:56 +0200 |
|---|---|---|
| committer | mrwastl <mrwastl@users.sourceforge.net> | 2011-06-03 00:13:56 +0200 |
| commit | 2dd042939f3774a1fc473aceaf25b128ca27f740 (patch) | |
| tree | 3ca30b8f87438298d65a534d8cc9f372fc731dfa | |
| parent | 34273deb566046cf5958365a67ab31bfc946d037 (diff) | |
| download | graphlcd-base-2dd042939f3774a1fc473aceaf25b128ca27f740.tar.gz graphlcd-base-2dd042939f3774a1fc473aceaf25b128ca27f740.tar.bz2 | |
bug corrected in EncodedCharAdjustCounter() (incorrect bitmasks used)
| -rw-r--r-- | glcdgraphics/font.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/glcdgraphics/font.c b/glcdgraphics/font.c index a1e8a16..8b80186 100644 --- a/glcdgraphics/font.c +++ b/glcdgraphics/font.c @@ -403,7 +403,7 @@ void cFont::EncodedCharAdjustCounter(const bool isutf8, const std::string & str, i += 1; } else if ( (c0 & 0xF0) == 0xE0 ) { // three byte utf8: 1110zzzz 10yyyyyy 10xxxxxx -> zzzzyyyy yyxxxxxx - if ( ((c2 & 0xE0) == 0xC0) && ((c1 & 0xE0) == 0xC0) ) { + if ( ((c1 & 0xC0) == 0x80) && ((c2 & 0xC0) == 0x80) ) { c = ( (c0 & 0x0F) << 12 ) | ( (c1 & 0x3F) << 6 ) | ( c2 & 0x3F ); } else { syslog(LOG_INFO, "GraphLCD: illegal 3-byte UTF-8 sequence found: 0x%02x 0x%02x 0x%02x\n", c0, c1, c2); @@ -412,7 +412,7 @@ void cFont::EncodedCharAdjustCounter(const bool isutf8, const std::string & str, i += 2; } else if ( (c0 & 0xF8) == 0xF0 ) { // four byte utf8: 11110www 10zzzzzz 10yyyyyy 10xxxxxx -> 000wwwzz zzzzyyyy yyxxxxxx - if ( ((c3 & 0xE0) == 0xC0) && ((c2 & 0xE0) == 0xC0) && ((c1 & 0xE0) == 0xC0) ) { + if ( ((c1 & 0xC0) == 0x80) && ((c2 & 0xC0) == 0x80) && ((c3 & 0xC0) == 0x80) ) { c = ( (c0 & 0x07) << 18 ) | ( (c1 & 0x3F) << 12 ) | ( (c2 & 0x3F) << 6 ) | (c3 & 0x3F); } else { syslog(LOG_INFO, "GraphLCD: illegal 4-byte UTF-8 sequence found: 0x%02x 0x%02x 0x%02x 0x%02x\n", c0, c1, c2, c3); |