Cool_Tools/imgui
1
0
Fork 0
mirror of https://github.com/ocornut/imgui.git synced 2024-11-24 15:50:25 +01:00
Code Releases Wiki Activity

ImLoadFileToMemory() default parameters

Browse Source
This commit is contained in:
ocornut 2015-07-21 17:46:49 -06:00
parent 94f085aa3e
commit 7552f48d7b
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
imgui.cpp
View File

@ -1168,6 +1168,7 @@ bool ImLoadFileToMemory(const char* filename, const char* file_open_mode, void**
fclose(f); fclose(f);
*out_file_data = file_data; *out_file_data = file_data;
if (out_file_size)
*out_file_size = file_size; *out_file_size = file_size;
return true; return true;

2
imgui_internal.h
View File

@ -82,7 +82,7 @@ int ImTextCountUtf8BytesFromStr(const ImWchar* in_text, const Im
// Helpers: Misc // Helpers: Misc
ImU32 ImHash(const void* data, int data_size, ImU32 seed); ImU32 ImHash(const void* data, int data_size, ImU32 seed);
bool ImLoadFileToMemory(const char* filename, const char* file_open_mode, void** out_file_data, int* out_file_size, int padding_bytes); bool ImLoadFileToMemory(const char* filename, const char* file_open_mode, void** out_file_data, int* out_file_size = NULL, int padding_bytes = 0);
bool ImIsPointInTriangle(const ImVec2& p, const ImVec2& a, const ImVec2& b, const ImVec2& c); bool ImIsPointInTriangle(const ImVec2& p, const ImVec2& a, const ImVec2& b, const ImVec2& c);
static inline bool ImCharIsSpace(int c) { return c == ' ' || c == '\t' || c == 0x3000; } static inline bool ImCharIsSpace(int c) { return c == ' ' || c == '\t' || c == 0x3000; }
static inline int ImUpperPowerOfTwo(int v) { v--; v |= v >> 1; v |= v >> 2; v |= v >> 4; v |= v >> 8; v |= v >> 16; v++; return v; } static inline int ImUpperPowerOfTwo(int v) { v--; v |= v >> 1; v |= v >> 2; v |= v >> 4; v |= v >> 8; v |= v >> 16; v++; return v; }