From c7cc84262ada00d10dd9a13674eb3bd01b7b818e Mon Sep 17 00:00:00 2001
From: Chlumsky <viktor.chlumsky@gmail.com>
Date: Wed, 8 Jul 2020 17:21:07 +0200
Subject: [PATCH] Charset parser fix

---
 msdf-atlas-gen/charset-parser.cpp | 1 -
 msdf-atlas-gen/utf8.cpp           | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/msdf-atlas-gen/charset-parser.cpp b/msdf-atlas-gen/charset-parser.cpp
index 44c511b..a272f5a 100644
--- a/msdf-atlas-gen/charset-parser.cpp
+++ b/msdf-atlas-gen/charset-parser.cpp
@@ -171,7 +171,6 @@ bool Charset::load(const char *filename) {
                         goto FAIL;
                     unicodeBuffer.clear();
                     buffer.clear();
-                    state = TIGHT;
                     break;
                 case '"': // string of UTF-8 characters
                     if (state != CLEAR)
diff --git a/msdf-atlas-gen/utf8.cpp b/msdf-atlas-gen/utf8.cpp
index 7e81c57..393c5f2 100644
--- a/msdf-atlas-gen/utf8.cpp
+++ b/msdf-atlas-gen/utf8.cpp
@@ -19,7 +19,7 @@ void utf8Decode(std::vector<unicode_t> &codepoints, const char *utf8String) {
             rBytes = 0;
         } else if (*c&0x40) {
             int block;
-            for (block = 0; (*c<<block)&0x40 && block < 4; ++block);
+            for (block = 0; ((unsigned char) *c<<block)&0x40 && block < 4; ++block);
             if (block < 4) {
                 cp = (*c&(0x3f>>block))<<(6*block);
                 rBytes = block;