Drezil/imgui
1
0
Fork 0
mirror of https://github.com/Drezil/imgui.git synced 2024-11-23 04:17:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix handling of NULL GlyphRanges. Asserting on AddFontFromFileTTF() failure.

Browse Source
This commit is contained in:
ocornut 2015-01-18 11:36:23 +00:00
parent ed23598e49
commit 8386e4fb7e
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
imgui.cpp
View File

@ -6422,7 +6422,10 @@ ImFont* ImFontAtlas::AddFontFromFileTTF(const char* filename, float size_pixels,
void* data = NULL; void* data = NULL;
size_t data_size = 0; size_t data_size = 0;
if (!ImLoadFileToMemory(filename, "rb", (void**)&data, &data_size)) if (!ImLoadFileToMemory(filename, "rb", (void**)&data, &data_size))
{
IM_ASSERT(0); // Could not load file.
return NULL; return NULL;
}
// Add // Add
ImFont* font = AddFontFromMemoryTTF(data, data_size, size_pixels, glyph_ranges, font_no); ImFont* font = AddFontFromMemoryTTF(data, data_size, size_pixels, glyph_ranges, font_no);
@ -6473,7 +6476,10 @@ bool ImFontAtlas::Build()
IM_ASSERT(font_offset >= 0); IM_ASSERT(font_offset >= 0);
if (!stbtt_InitFont(&data.FontInfo, (unsigned char*)data.TTFData, font_offset)) if (!stbtt_InitFont(&data.FontInfo, (unsigned char*)data.TTFData, font_offset))
return false; return false;
for (const ImWchar* in_range = InputData[input_i]->GlyphRanges; in_range[0] && in_range[1]; in_range += 2)
if (!data.GlyphRanges)
data.GlyphRanges = GetGlyphRangesDefault();
for (const ImWchar* in_range = data.GlyphRanges; in_range[0] && in_range[1]; in_range += 2)
total_glyph_count += (in_range[1] - in_range[0]) + 1; total_glyph_count += (in_range[1] - in_range[0]) + 1;
} }
@ -6498,8 +6504,6 @@ bool ImFontAtlas::Build()
for (size_t input_i = 0; input_i < InputData.size(); input_i++) for (size_t input_i = 0; input_i < InputData.size(); input_i++)
{ {
ImFontAtlasData& data = *InputData[input_i]; ImFontAtlasData& data = *InputData[input_i];
if (!data.GlyphRanges)
data.GlyphRanges = GetGlyphRangesDefault();
// Setup ranges // Setup ranges
int glyph_count = 0; int glyph_count = 0;