diff options
author | Bartosz Taudul <wolf@nereid.pl> | 2021-09-20 23:45:52 +0300 |
---|---|---|
committer | Bartosz Taudul <wolf@nereid.pl> | 2021-09-20 23:45:52 +0300 |
commit | 2a994f1c811881920f9230212ea073db19d790db (patch) | |
tree | 8361409b714338c04214f29a1896b9e481f881a3 /imgui/misc | |
parent | 0b03d7b2addab19fadbb0d09af25bc51f4b79a5c (diff) |
Backport freetype 2.11 fix from imgui.
Diffstat (limited to 'imgui/misc')
-rw-r--r-- | imgui/misc/freetype/imgui_freetype.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/imgui/misc/freetype/imgui_freetype.cpp b/imgui/misc/freetype/imgui_freetype.cpp index 71a18870..06eb1758 100644 --- a/imgui/misc/freetype/imgui_freetype.cpp +++ b/imgui/misc/freetype/imgui_freetype.cpp @@ -539,7 +539,8 @@ bool ImFontAtlasBuildWithFreeTypeEx(FT_Library ft_library, ImFontAtlas* atlas, u // Render glyph into a bitmap (currently held by FreeType) const FT_Bitmap* ft_bitmap = src_tmp.Font.RenderGlyphAndGetInfo(&src_glyph.Info); - IM_ASSERT(ft_bitmap); + if (ft_bitmap == NULL) + continue; // Allocate new temporary chunk if needed const int bitmap_size_in_bytes = src_glyph.Info.Width * src_glyph.Info.Height * 4; |