Bläddra i källkod

ImLoadFileToMemory() default parameters

ocornut 10 år sedan
förälder
incheckning
7552f48d7b
2 ändrade filer med 3 tillägg och 2 borttagningar
  1. 2 1
      imgui.cpp
  2. 1 1
      imgui_internal.h

+ 2 - 1
imgui.cpp

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

+ 1 - 1
imgui_internal.h

@@ -82,7 +82,7 @@ int                 ImTextCountUtf8BytesFromStr(const ImWchar* in_text, const Im
 
 // Helpers: Misc
 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);
 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; }