Try to fix pointer bug again

Picocrypt · May 7, 2022 · 81c09b6 · 81c09b6
1 parent e64a8b4
commit 81c09b6
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/DrawCommandWrapper.cpp b/DrawCommandWrapper.cpp
@@ -22,7 +22,7 @@ void iggDrawCommandGetClipRect(IggDrawCmd handle, IggVec4 *rect)
 void iggDrawCommandGetTextureID(IggDrawCmd handle, IggTextureID *id)
 {
    ImDrawCmd *cmd = reinterpret_cast<ImDrawCmd *>(handle);
-   *id = cmd->GetTexID();
+   *id = reinterpret_cast<IggTextureID>(cmd->TextureId);
 }
 
 IggBool iggDrawCommandHasUserCallback(IggDrawCmd handle)

diff --git a/FontAtlasWrapper.cpp b/FontAtlasWrapper.cpp
@@ -113,7 +113,7 @@ void iggFontAtlasGetTexDataAsRGBA32(IggFontAtlas handle, unsigned char **pixels,
 void iggFontAtlasSetTextureID(IggFontAtlas handle, IggTextureID id)
 {
    ImFontAtlas *fontAtlas = reinterpret_cast<ImFontAtlas *>(handle);
-   fontAtlas->SetTexID(id);
+   fontAtlas->SetTexID(reinterpret_cast<ImTextureID>(id));
 }
 
 void iggFontAtlasBuild(IggFontAtlas handle)

diff --git a/imguiWrapperTypes.h b/imguiWrapperTypes.h
@@ -1,13 +1,15 @@
 #pragma once
 
+#include <stdint.h>
+
 #ifdef __cplusplus
 extern "C"
 {
 #endif
 
 typedef int IggBool;
 typedef float IggFloat;
-typedef void *IggTextureID;
+typedef uintptr_t IggTextureID;
 
 typedef void *IggContext;
 typedef void *IggDrawCmd;