Drezil/imgui
1
0
Fork 0
mirror of https://github.com/Drezil/imgui.git synced 2024-11-22 20:07:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed temporary glyph rectangle allocation using size much too big.

Browse Source
This commit is contained in:
ocornut 2015-01-11 22:03:03 +00:00
parent e5d0d8334f
commit 0f89e06152
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
imgui.cpp
View File

@ -6421,9 +6421,9 @@ bool ImFont::LoadFromMemoryTTF(const void* data, size_t data_size, float size
// Setup ranges // Setup ranges
int glyph_count = 0; int glyph_count = 0;
int glyph_ranges_count = 0; int glyph_ranges_count = 0;
for (const ImWchar* p = glyph_ranges; p[0] && p[1]; p += 2) for (const ImWchar* in_range = glyph_ranges; in_range[0] && in_range[1]; in_range += 2)
{ {
glyph_count += p[1]; glyph_count += (in_range[1] - in_range[0]) + 1;
glyph_ranges_count++; glyph_ranges_count++;
} }
@ -6433,8 +6433,9 @@ bool ImFont::LoadFromMemoryTTF(const void* data, size_t data_size, float size
{ {
stbtt_pack_range& range = ranges[i]; stbtt_pack_range& range = ranges[i];
range.font_size = size_pixels; range.font_size = size_pixels;
range.first_unicode_char_in_range = glyph_ranges[i*2]; const ImWchar* in_range = &glyph_ranges[i * 2];
range.num_chars_in_range = (glyph_ranges[i*2+1] - range.first_unicode_char_in_range) + 1; range.first_unicode_char_in_range = in_range[0];
range.num_chars_in_range = (in_range[1] - in_range[0]) + 1;
range.chardata_for_range = (stbtt_packedchar*)ImGui::MemAlloc(range.num_chars_in_range * sizeof(stbtt_packedchar)); range.chardata_for_range = (stbtt_packedchar*)ImGui::MemAlloc(range.num_chars_in_range * sizeof(stbtt_packedchar));
} }