From 037ec09ffec12294b51d6234447eec50c8fbb964 Mon Sep 17 00:00:00 2001 From: ocornut Date: Thu, 26 Feb 2015 19:06:54 +0000 Subject: [PATCH] Fixed unpackaging of Japanese glyphs ranges --- imgui.cpp | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/imgui.cpp b/imgui.cpp index 91ea149e..7e2cc01f 100644 --- a/imgui.cpp +++ b/imgui.cpp @@ -7429,20 +7429,19 @@ const ImWchar* ImFontAtlas::GetGlyphRangesJapanese() 109,2,18,23,0,0,9,61,3,0,28,41,77,27,19,17,81,5,2,14,5,83,57,252,14,154,263,14,20,8,13,6,57,39,38, }; static int ranges_unpacked = false; - static ImWchar ranges[10 + 1 + IM_ARRAYSIZE(offsets_from_0x4E00)*2] = + static ImWchar ranges[10 + IM_ARRAYSIZE(offsets_from_0x4E00)*2 + 1] = { 0x0020, 0x00FF, // Basic Latin + Latin Supplement 0x3000, 0x3000, // Ideographic Space 0x3040, 0x30FF, // Hiragana, Katakana 0x31F0, 0x31FF, // Katakana Phonetic Extensions 0xFF00, 0xFFEF, // Half-width characters - 0, }; if (!ranges_unpacked) { // Unpack int codepoint = 0x4e00; - ImWchar* dst = &ranges[6]; + ImWchar* dst = &ranges[10]; for (int n = 0; n < IM_ARRAYSIZE(offsets_from_0x4E00); n++, dst += 2) dst[0] = dst[1] = (ImWchar)(codepoint += (offsets_from_0x4E00[n] + 1)); dst[0] = 0;