mirror/imgui
1
0
Fork 0
mirror of https://github.com/ocornut/imgui.git synced 2026-01-11 00:04:24 +00:00
Code Activity

Merge branch 'master' into docking

Browse source
This commit is contained in:
ocornut 2025-06-17 20:15:12 +02:00
commit 344d5ff4b7
9 changed files with 78 additions and 61 deletions
Download patch file Download diff file Expand all files Collapse all files

4
misc/freetype/imgui_freetype.cpp
View file

@ -501,7 +501,7 @@ bool ImGui_ImplFreeType_FontBakedLoadGlyph(ImFontAtlas* atlas, ImFontConfig* src
FT_Error error = FT_Render_Glyph(slot, render_mode);
const FT_Bitmap* ft_bitmap = &slot->bitmap;
if (error != 0 || ft_bitmap == nullptr)
return NULL;
return false;
const int w = (int)ft_bitmap->width;
const int h = (int)ft_bitmap->rows;
@ -520,7 +520,7 @@ bool ImGui_ImplFreeType_FontBakedLoadGlyph(ImFontAtlas* atlas, ImFontConfig* src
{
// Pathological out of memory case (TexMaxWidth/TexMaxHeight set too small?)
IM_ASSERT(pack_id != ImFontAtlasRectId_Invalid && "Out of texture memory.");
return NULL;
return false;
}
ImTextureRect* r = ImFontAtlasPackGetRect(atlas, pack_id);