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

Build fix for GCC/Clang, cannot foward declare a static array?

Browse Source
This commit is contained in:
ocornut 2015-01-09 09:00:53 +00:00
parent 2757e3573a
commit 5dff478dc0
1 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
imgui.cpp
View File

@ -6213,19 +6213,24 @@ const ImWchar* ImFont::GetGlyphRangesJapanese()
return &ranges[0]; return &ranges[0];
} }
extern const unsigned int proggy_clean_ttf_compressed_size; static void GetDefaultCompressedFontDataTTF(const void** ttf_compressed_data, unsigned int* ttf_compressed_size);
extern const unsigned int proggy_clean_ttf_compressed_data[9584/4]; static unsigned int stb_decompress_length(unsigned char *input);
extern unsigned int stb_decompress_length(unsigned char *input); static unsigned int stb_decompress(unsigned char *output, unsigned char *i, unsigned int length);
extern unsigned int stb_decompress(unsigned char *output, unsigned char *i, unsigned int length);
// Load embedded ProggyClean.ttf at size 13 // Load embedded ProggyClean.ttf at size 13
bool ImFont::LoadDefault() bool ImFont::LoadDefault()
{ {
unsigned int buf_compressed_size = (int)proggy_clean_ttf_compressed_size; // Get compressed data
unsigned char* buf_compressed = (unsigned char*)proggy_clean_ttf_compressed_data; unsigned int ttf_compressed_size;
const size_t buf_decompressed_size = stb_decompress_length(buf_compressed); const void* ttf_compressed;
GetDefaultCompressedFontDataTTF(&ttf_compressed, &ttf_compressed_size);
// Decompress
const size_t buf_decompressed_size = stb_decompress_length((unsigned char*)ttf_compressed);
unsigned char* buf_decompressed = (unsigned char *)ImGui::MemAlloc(buf_decompressed_size); unsigned char* buf_decompressed = (unsigned char *)ImGui::MemAlloc(buf_decompressed_size);
stb_decompress(buf_decompressed, buf_compressed, buf_compressed_size); stb_decompress(buf_decompressed, (unsigned char*)ttf_compressed, ttf_compressed_size);
// Load TTF
const bool ret = LoadFromMemoryTTF((void *)buf_decompressed, buf_decompressed_size, 13.0f, ImFont::GetGlyphRangesDefault(), 0); const bool ret = LoadFromMemoryTTF((void *)buf_decompressed, buf_decompressed_size, 13.0f, ImFont::GetGlyphRangesDefault(), 0);
ImGui::MemFree(buf_decompressed); ImGui::MemFree(buf_decompressed);
DisplayOffset.y += 1; DisplayOffset.y += 1;
@ -8336,6 +8341,12 @@ static const unsigned int proggy_clean_ttf_compressed_data[9584/4] =
0xef8d3920, 0xef8d3920, 0xef8d3920, 0xef8d3920, 0xef8d3920, 0x00663923, 0x48fa0500, 0x00f762f9, 0xef8d3920, 0xef8d3920, 0xef8d3920, 0xef8d3920, 0xef8d3920, 0x00663923, 0x48fa0500, 0x00f762f9,
}; };
static void GetDefaultCompressedFontDataTTF(const void** ttf_compressed_data, unsigned int* ttf_compressed_size)
{
*ttf_compressed_data = proggy_clean_ttf_compressed_data;
*ttf_compressed_size = proggy_clean_ttf_compressed_size;
}
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
//---- Include imgui_user.inl at the end of imgui.cpp //---- Include imgui_user.inl at the end of imgui.cpp