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

Fixed prototypes

Browse Source
This commit is contained in:
ocornut 2015-04-11 18:12:11 +01:00
parent ac740170b9
commit 7ca21a1bc2
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
imgui.cpp
View File

@ -8124,7 +8124,7 @@ ImFont* ImFontAtlas::AddFontFromFileTTF(const char* filename, float size_pixels,
} }
// NB: ownership of 'data' is given to ImFontAtlas which will clear it. // NB: ownership of 'data' is given to ImFontAtlas which will clear it.
ImFont* ImFontAtlas::AddFontFromMemoryTTF(void* in_ttf_data, size_t in_ttf_data_size, float size_pixels, const ImWchar* glyph_ranges, int font_no) ImFont* ImFontAtlas::AddFontFromMemoryTTF(void* in_ttf_data, unsigned int in_ttf_data_size, float size_pixels, const ImWchar* glyph_ranges, int font_no)
{ {
// Create new font // Create new font
ImFont* font = (ImFont*)ImGui::MemAlloc(sizeof(ImFont)); ImFont* font = (ImFont*)ImGui::MemAlloc(sizeof(ImFont));
@ -8148,7 +8148,7 @@ ImFont* ImFontAtlas::AddFontFromMemoryTTF(void* in_ttf_data, size_t in_ttf_data_
return font; return font;
} }
ImFont* ImFontAtlas::AddFontFromMemoryCompressedTTF(const void* in_compressed_ttf_data, size_t in_compressed_ttf_data_size, float size_pixels, const ImWchar* glyph_ranges, int font_no) ImFont* ImFontAtlas::AddFontFromMemoryCompressedTTF(const void* in_compressed_ttf_data, unsigned int in_compressed_ttf_data_size, float size_pixels, const ImWchar* glyph_ranges, int font_no)
{ {
// Decompress // Decompress
const size_t buf_decompressed_size = stb_decompress_length((unsigned char*)in_compressed_ttf_data); const size_t buf_decompressed_size = stb_decompress_length((unsigned char*)in_compressed_ttf_data);