lvg 141

inanevin · May 8, 2023 · 2b9d741 · 2b9d741
1 parent 7af5e1e
commit 2b9d741
Show file tree

Hide file tree

Showing 3 changed files with 46 additions and 73 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -96,7 +96,7 @@ add_library(Lina::VG ALIAS ${PROJECT_NAME})
 target_include_directories(${PROJECT_NAME} PUBLIC ${PROJECT_SOURCE_DIR}/include)
 target_compile_definitions(${PROJECT_NAME} PUBLIC LINAVG_VERSION_MAJOR=1)
 target_compile_definitions(${PROJECT_NAME} PUBLIC LINAVG_VERSION_MINOR=4)
-target_compile_definitions(${PROJECT_NAME} PUBLIC LINAVG_VERSION_PATCH=0)
+target_compile_definitions(${PROJECT_NAME} PUBLIC LINAVG_VERSION_PATCH=1)
 
 #--------------------------------------------------------------------
 # Subdirectories & linking

diff --git a/include/Core/Drawer.hpp b/include/Core/Drawer.hpp
@@ -469,7 +469,7 @@ namespace LinaVG
         /// <summary>
         /// For processing UTf8 texts.
         /// </summary>
-        uint32_t GetNextUnicodeChar(const uint8_t*& text);
+        uint32_t GetNextUnicodeChar(const char* text, uint32_t& byteCount);
 #endif
 
     }; // namespace Internal

diff --git a/src/Core/Drawer.cpp b/src/Core/Drawer.cpp
@@ -3176,87 +3176,47 @@ namespace LinaVG
             return offset;
         }
 
-        uint32_t GetNextUnicodeChar(const uint8_t*& text)
+        uint32_t GetNextUnicodeChar(const char* p, uint32_t& byteCount)
         {
             uint32_t codepoint = 0;
-            if ((*text & 0x80) == 0)
+            if ((*p & 0b10000000) == 0b00000000)
             {
-                // ASCII character
-                codepoint = *text;
-                ++text;
+                // 1-byte character (ASCII)
+                auto ch   = static_cast<unsigned char>(*p);
+                byteCount = 1;
+                codepoint = static_cast<uint32_t>(ch);
             }
-            else if ((*text & 0xE0) == 0xC0)
+            else if ((*p & 0b11100000) == 0b11000000)
             {
                 // 2-byte character
-                codepoint = (*text & 0x1F) << 6;
-                ++text;
-                if ((*text & 0xC0) != 0x80)
-                {
-                    if (Config.errorCallback)
-                        Config.errorCallback("Invalid UTF-8!");
-                    return 0;
-                }
-                codepoint |= *text & 0x3F;
-                ++text;
+                codepoint = ((*p & 0b00011111) << 6) |
+                            (*(p + 1) & 0b00111111);
+                byteCount = 2;
             }
-            else if ((*text & 0xF0) == 0xE0)
+            else if ((*p & 0b11110000) == 0b11100000)
             {
                 // 3-byte character
-                codepoint = (*text & 0x0F) << 12;
-                ++text;
-                if ((*text & 0xC0) != 0x80)
-                {
-                    if (Config.errorCallback)
-                        Config.errorCallback("Invalid UTF-8!");
-                    return 0;
-                }
-                codepoint |= (*text & 0x3F) << 6;
-                ++text;
-                if ((*text & 0xC0) != 0x80)
-                {
-                    if (Config.errorCallback)
-                        Config.errorCallback("Invalid UTF-8!");
-                    return 0;
-                }
-                codepoint |= *text & 0x3F;
-                ++text;
+                codepoint = ((*p & 0b00001111) << 12) |
+                            ((*(p + 1) & 0b00111111) << 6) |
+                            (*(p + 2) & 0b00111111);
+                byteCount = 3;
             }
-            else if ((*text & 0xF8) == 0xF0)
+            else if ((*p & 0b11111000) == 0b11110000)
             {
                 // 4-byte character
-                codepoint = (*text & 0x07) << 18;
-                ++text;
-                if ((*text & 0xC0) != 0x80)
-                {
-                    if (Config.errorCallback)
-                        Config.errorCallback("Invalid UTF-8!");
-                    return 0;
-                }
-                codepoint |= (*text & 0x3F) << 12;
-                ++text;
-                if ((*text & 0xC0) != 0x80)
-                {
-                    if (Config.errorCallback)
-                        Config.errorCallback("Invalid UTF-8!");
-                    return 0;
-                }
-                codepoint |= (*text & 0x3F) << 6;
-                ++text;
-                if ((*text & 0xC0) != 0x80)
-                {
-                    if (Config.errorCallback)
-                        Config.errorCallback("Invalid UTF-8!");
-                    return 0;
-                }
-                codepoint |= *text & 0x3F;
-                ++text;
+                codepoint = ((*p & 0b00000111) << 18) |
+                            ((*(p + 1) & 0b00111111) << 12) |
+                            ((*(p + 2) & 0b00111111) << 6) |
+                            (*(p + 3) & 0b00111111);
+                byteCount = 4;
             }
             else
             {
+                // Invalid UTF-8 sequence
                 if (Config.errorCallback)
-                    Config.errorCallback("Invalid UTF-8!");
-                return 0;
+                    Config.errorCallback("LinaVG -> Invalid UTF-8 sequence!");
             }
+
             return codepoint;
         }
 
@@ -3355,11 +3315,18 @@ namespace LinaVG
             if (font->m_supportsUnicode)
             {
                 const uint8_t* c = (const uint8_t*)text;
-                while (*c)
+                for (const char* p = text; *p; p++)
                 {
-                    uint32_t character = GetNextUnicodeChar(c);
-                    auto     ch        = font->m_characterGlyphs[character];
+                    uint32_t byteCount = 0;
+                    uint32_t character = GetNextUnicodeChar(p, byteCount);
+
+                    if (byteCount == 0)
+                        return;
+
+                    auto ch = font->m_characterGlyphs[character];
                     drawChar(ch, character);
+
+                    p += byteCount - 1;
                 }
             }
             else
@@ -3388,12 +3355,18 @@ namespace LinaVG
 
             if (font->m_supportsUnicode)
             {
-                const uint8_t* c = (const uint8_t*)text;
-                while (*c)
+                for (const char* p = text; *p; p++)
                 {
-                    uint32_t character = GetNextUnicodeChar(c);
-                    auto     ch        = font->m_characterGlyphs[character];
+                    uint32_t byteCount = 0;
+                    uint32_t character = GetNextUnicodeChar(p, byteCount);
+
+                    if (byteCount == 0)
+                        return Vec2(0, 0);
+
+                    auto ch = font->m_characterGlyphs[character];
                     calcSizeChar(ch, character);
+
+                    p += byteCount - 1;
                 }
             }
             else