Improve the marshalling of ImWchar* parameters (glyph ranges, mainly)

mellinoe · mellinoe · commit 666b2392e414 · 2018-10-26T23:18:07.000-07:00
diff --git a/src/CodeGenerator/Program.cs b/src/CodeGenerator/Program.cs
@@ -694,11 +694,12 @@ private static void EmitOverload(
                     preCallLines.Add($"byte* {nativeArgName} = &{nativeArgName}_val;");
                     postCallLines.Add($"{correctedIdentifier} = {nativeArgName}_val != 0;");
                 }
-                else if (tr.Type == "void*")
+                else if (tr.Type == "void*" || tr.Type == "ImWchar*")
                 {
+                    string nativePtrTypeName = tr.Type == "void*" ? "void*" : "ushort*";
                     string nativeArgName = "native_" + tr.Name;
                     marshalledParameters[i] = new MarshalledParameter("IntPtr", false, nativeArgName, false);
-                    preCallLines.Add($"void* {nativeArgName} = {correctedIdentifier}.ToPointer();");
+                    preCallLines.Add($"{nativePtrTypeName} {nativeArgName} = ({nativePtrTypeName}){correctedIdentifier}.ToPointer();");
                 }
                 else if (GetWrappedType(tr.Type, out string wrappedParamType)
                     && !s_wellKnownTypes.ContainsKey(tr.Type)
@@ -795,6 +796,10 @@ private static void EmitOverload(
                 {
                     writer.WriteLine("return Util.StringFromPtr(ret);");
                 }
+                else if (overload.ReturnType == "ImWchar*")
+                {
+                    writer.WriteLine("return (IntPtr)ret;");
+                }
                 else if (overload.ReturnType == "void*")
                 {
                     writer.WriteLine("return (IntPtr)ret;");
@@ -829,7 +834,7 @@ private static string GetSafeType(string nativeRet)
             {
                 return "string";
             }
-            else if (nativeRet == "void*")
+            else if (nativeRet == "ImWchar*" || nativeRet == "void*")
             {
                 return "IntPtr";
             }
diff --git a/src/ImGui.NET/Generated/GlyphRangesBuilder.gen.cs b/src/ImGui.NET/Generated/GlyphRangesBuilder.gen.cs
@@ -34,12 +34,10 @@ public void AddText(string text)
             byte* native_text_end = null;
             ImGuiNative.GlyphRangesBuilder_AddText(NativePtr, native_text, native_text_end);
         }
-        public void AddRanges(ref ushort ranges)
+        public void AddRanges(IntPtr ranges)
         {
-            fixed (ushort* native_ranges = &ranges)
-            {
-                ImGuiNative.GlyphRangesBuilder_AddRanges(NativePtr, native_ranges);
-            }
+            ushort* native_ranges = (ushort*)ranges.ToPointer();
+            ImGuiNative.GlyphRangesBuilder_AddRanges(NativePtr, native_ranges);
         }
         public void BuildRanges(out ImVector out_ranges)
         {
diff --git a/src/ImGui.NET/Generated/ImDrawList.gen.cs b/src/ImGui.NET/Generated/ImDrawList.gen.cs
@@ -179,7 +179,7 @@ public void AddRect(Vector2 a, Vector2 b, uint col, float rounding, int rounding
         }
         public void AddCallback(IntPtr callback, IntPtr callback_data)
         {
-            void* native_callback_data = callback_data.ToPointer();
+            void* native_callback_data = (void*)callback_data.ToPointer();
             ImGuiNative.ImDrawList_AddCallback(NativePtr, callback, native_callback_data);
         }
         public void PathRect(Vector2 rect_min, Vector2 rect_max)
diff --git a/src/ImGui.NET/Generated/ImFontAtlas.gen.cs b/src/ImGui.NET/Generated/ImFontAtlas.gen.cs
@@ -74,7 +74,7 @@ public ImFontPtr AddFontFromMemoryCompressedBase85TTF(string compressed_font_dat
             ImFont* ret = ImGuiNative.ImFontAtlas_AddFontFromMemoryCompressedBase85TTF(NativePtr, native_compressed_font_data_base85, size_pixels, native_font_cfg, glyph_ranges);
             return new ImFontPtr(ret);
         }
-        public ImFontPtr AddFontFromMemoryCompressedBase85TTF(string compressed_font_data_base85, float size_pixels, ImFontConfigPtr font_cfg, ref ushort glyph_ranges)
+        public ImFontPtr AddFontFromMemoryCompressedBase85TTF(string compressed_font_data_base85, float size_pixels, ImFontConfigPtr font_cfg, IntPtr glyph_ranges)
         {
             int compressed_font_data_base85_byteCount = Encoding.UTF8.GetByteCount(compressed_font_data_base85);
             byte* native_compressed_font_data_base85 = stackalloc byte[compressed_font_data_base85_byteCount + 1];
@@ -84,11 +84,9 @@ public ImFontPtr AddFontFromMemoryCompressedBase85TTF(string compressed_font_dat
                 native_compressed_font_data_base85[native_compressed_font_data_base85_offset] = 0;
             }
             ImFontConfig* native_font_cfg = font_cfg.NativePtr;
-            fixed (ushort* native_glyph_ranges = &glyph_ranges)
-            {
-                ImFont* ret = ImGuiNative.ImFontAtlas_AddFontFromMemoryCompressedBase85TTF(NativePtr, native_compressed_font_data_base85, size_pixels, native_font_cfg, native_glyph_ranges);
-                return new ImFontPtr(ret);
-            }
+            ushort* native_glyph_ranges = (ushort*)glyph_ranges.ToPointer();
+            ImFont* ret = ImGuiNative.ImFontAtlas_AddFontFromMemoryCompressedBase85TTF(NativePtr, native_compressed_font_data_base85, size_pixels, native_font_cfg, native_glyph_ranges);
+            return new ImFontPtr(ret);
         }
         public bool Build()
         {
@@ -129,30 +127,30 @@ public bool IsBuilt()
             byte ret = ImGuiNative.ImFontAtlas_IsBuilt(NativePtr);
             return ret != 0;
         }
-        public ushort* GetGlyphRangesThai()
+        public IntPtr GetGlyphRangesThai()
         {
             ushort* ret = ImGuiNative.ImFontAtlas_GetGlyphRangesThai(NativePtr);
-            return ret;
+            return (IntPtr)ret;
         }
-        public ushort* GetGlyphRangesCyrillic()
+        public IntPtr GetGlyphRangesCyrillic()
         {
             ushort* ret = ImGuiNative.ImFontAtlas_GetGlyphRangesCyrillic(NativePtr);
-            return ret;
+            return (IntPtr)ret;
         }
-        public ushort* GetGlyphRangesChineseSimplifiedCommon()
+        public IntPtr GetGlyphRangesChineseSimplifiedCommon()
         {
             ushort* ret = ImGuiNative.ImFontAtlas_GetGlyphRangesChineseSimplifiedCommon(NativePtr);
-            return ret;
+            return (IntPtr)ret;
         }
-        public ushort* GetGlyphRangesChineseFull()
+        public IntPtr GetGlyphRangesChineseFull()
         {
             ushort* ret = ImGuiNative.ImFontAtlas_GetGlyphRangesChineseFull(NativePtr);
-            return ret;
+            return (IntPtr)ret;
         }
-        public ushort* GetGlyphRangesDefault()
+        public IntPtr GetGlyphRangesDefault()
         {
             ushort* ret = ImGuiNative.ImFontAtlas_GetGlyphRangesDefault(NativePtr);
-            return ret;
+            return (IntPtr)ret;
         }
         public void SetTexID(IntPtr id)
         {
@@ -172,55 +170,51 @@ public void Clear()
         }
         public ImFontPtr AddFontFromMemoryCompressedTTF(IntPtr compressed_font_data, int compressed_font_size, float size_pixels)
         {
-            void* native_compressed_font_data = compressed_font_data.ToPointer();
+            void* native_compressed_font_data = (void*)compressed_font_data.ToPointer();
             ImFontConfig* font_cfg = null;
             ushort* glyph_ranges = null;
             ImFont* ret = ImGuiNative.ImFontAtlas_AddFontFromMemoryCompressedTTF(NativePtr, native_compressed_font_data, compressed_font_size, size_pixels, font_cfg, glyph_ranges);
             return new ImFontPtr(ret);
         }
         public ImFontPtr AddFontFromMemoryCompressedTTF(IntPtr compressed_font_data, int compressed_font_size, float size_pixels, ImFontConfigPtr font_cfg)
         {
-            void* native_compressed_font_data = compressed_font_data.ToPointer();
+            void* native_compressed_font_data = (void*)compressed_font_data.ToPointer();
             ImFontConfig* native_font_cfg = font_cfg.NativePtr;
             ushort* glyph_ranges = null;
             ImFont* ret = ImGuiNative.ImFontAtlas_AddFontFromMemoryCompressedTTF(NativePtr, native_compressed_font_data, compressed_font_size, size_pixels, native_font_cfg, glyph_ranges);
             return new ImFontPtr(ret);
         }
-        public ImFontPtr AddFontFromMemoryCompressedTTF(IntPtr compressed_font_data, int compressed_font_size, float size_pixels, ImFontConfigPtr font_cfg, ref ushort glyph_ranges)
+        public ImFontPtr AddFontFromMemoryCompressedTTF(IntPtr compressed_font_data, int compressed_font_size, float size_pixels, ImFontConfigPtr font_cfg, IntPtr glyph_ranges)
         {
-            void* native_compressed_font_data = compressed_font_data.ToPointer();
+            void* native_compressed_font_data = (void*)compressed_font_data.ToPointer();
             ImFontConfig* native_font_cfg = font_cfg.NativePtr;
-            fixed (ushort* native_glyph_ranges = &glyph_ranges)
-            {
-                ImFont* ret = ImGuiNative.ImFontAtlas_AddFontFromMemoryCompressedTTF(NativePtr, native_compressed_font_data, compressed_font_size, size_pixels, native_font_cfg, native_glyph_ranges);
-                return new ImFontPtr(ret);
-            }
+            ushort* native_glyph_ranges = (ushort*)glyph_ranges.ToPointer();
+            ImFont* ret = ImGuiNative.ImFontAtlas_AddFontFromMemoryCompressedTTF(NativePtr, native_compressed_font_data, compressed_font_size, size_pixels, native_font_cfg, native_glyph_ranges);
+            return new ImFontPtr(ret);
         }
         public ImFontPtr AddFontFromMemoryTTF(IntPtr font_data, int font_size, float size_pixels)
         {
-            void* native_font_data = font_data.ToPointer();
+            void* native_font_data = (void*)font_data.ToPointer();
             ImFontConfig* font_cfg = null;
             ushort* glyph_ranges = null;
             ImFont* ret = ImGuiNative.ImFontAtlas_AddFontFromMemoryTTF(NativePtr, native_font_data, font_size, size_pixels, font_cfg, glyph_ranges);
             return new ImFontPtr(ret);
         }
         public ImFontPtr AddFontFromMemoryTTF(IntPtr font_data, int font_size, float size_pixels, ImFontConfigPtr font_cfg)
         {
-            void* native_font_data = font_data.ToPointer();
+            void* native_font_data = (void*)font_data.ToPointer();
             ImFontConfig* native_font_cfg = font_cfg.NativePtr;
             ushort* glyph_ranges = null;
             ImFont* ret = ImGuiNative.ImFontAtlas_AddFontFromMemoryTTF(NativePtr, native_font_data, font_size, size_pixels, native_font_cfg, glyph_ranges);
             return new ImFontPtr(ret);
         }
-        public ImFontPtr AddFontFromMemoryTTF(IntPtr font_data, int font_size, float size_pixels, ImFontConfigPtr font_cfg, ref ushort glyph_ranges)
+        public ImFontPtr AddFontFromMemoryTTF(IntPtr font_data, int font_size, float size_pixels, ImFontConfigPtr font_cfg, IntPtr glyph_ranges)
         {
-            void* native_font_data = font_data.ToPointer();
+            void* native_font_data = (void*)font_data.ToPointer();
             ImFontConfig* native_font_cfg = font_cfg.NativePtr;
-            fixed (ushort* native_glyph_ranges = &glyph_ranges)
-            {
-                ImFont* ret = ImGuiNative.ImFontAtlas_AddFontFromMemoryTTF(NativePtr, native_font_data, font_size, size_pixels, native_font_cfg, native_glyph_ranges);
-                return new ImFontPtr(ret);
-            }
+            ushort* native_glyph_ranges = (ushort*)glyph_ranges.ToPointer();
+            ImFont* ret = ImGuiNative.ImFontAtlas_AddFontFromMemoryTTF(NativePtr, native_font_data, font_size, size_pixels, native_font_cfg, native_glyph_ranges);
+            return new ImFontPtr(ret);
         }
         public ImFontPtr AddFontFromFileTTF(string filename, float size_pixels)
         {
@@ -250,7 +244,7 @@ public ImFontPtr AddFontFromFileTTF(string filename, float size_pixels, ImFontCo
             ImFont* ret = ImGuiNative.ImFontAtlas_AddFontFromFileTTF(NativePtr, native_filename, size_pixels, native_font_cfg, glyph_ranges);
             return new ImFontPtr(ret);
         }
-        public ImFontPtr AddFontFromFileTTF(string filename, float size_pixels, ImFontConfigPtr font_cfg, ref ushort glyph_ranges)
+        public ImFontPtr AddFontFromFileTTF(string filename, float size_pixels, ImFontConfigPtr font_cfg, IntPtr glyph_ranges)
         {
             int filename_byteCount = Encoding.UTF8.GetByteCount(filename);
             byte* native_filename = stackalloc byte[filename_byteCount + 1];
@@ -260,11 +254,9 @@ public ImFontPtr AddFontFromFileTTF(string filename, float size_pixels, ImFontCo
                 native_filename[native_filename_offset] = 0;
             }
             ImFontConfig* native_font_cfg = font_cfg.NativePtr;
-            fixed (ushort* native_glyph_ranges = &glyph_ranges)
-            {
-                ImFont* ret = ImGuiNative.ImFontAtlas_AddFontFromFileTTF(NativePtr, native_filename, size_pixels, native_font_cfg, native_glyph_ranges);
-                return new ImFontPtr(ret);
-            }
+            ushort* native_glyph_ranges = (ushort*)glyph_ranges.ToPointer();
+            ImFont* ret = ImGuiNative.ImFontAtlas_AddFontFromFileTTF(NativePtr, native_filename, size_pixels, native_font_cfg, native_glyph_ranges);
+            return new ImFontPtr(ret);
         }
         public ImFontPtr AddFontDefault()
         {
@@ -278,10 +270,10 @@ public ImFontPtr AddFontDefault(ImFontConfigPtr font_cfg)
             ImFont* ret = ImGuiNative.ImFontAtlas_AddFontDefault(NativePtr, native_font_cfg);
             return new ImFontPtr(ret);
         }
-        public ushort* GetGlyphRangesJapanese()
+        public IntPtr GetGlyphRangesJapanese()
         {
             ushort* ret = ImGuiNative.ImFontAtlas_GetGlyphRangesJapanese(NativePtr);
-            return ret;
+            return (IntPtr)ret;
         }
         public void GetTexDataAsAlpha8(out byte* out_pixels, out int out_width, out int out_height)
         {
@@ -334,10 +326,10 @@ public bool GetMouseCursorTexData(ImGuiMouseCursor cursor, out Vector2 out_offse
                 }
             }
         }
-        public ushort* GetGlyphRangesKorean()
+        public IntPtr GetGlyphRangesKorean()
         {
             ushort* ret = ImGuiNative.ImFontAtlas_GetGlyphRangesKorean(NativePtr);
-            return ret;
+            return (IntPtr)ret;
         }
         public void GetTexDataAsRGBA32(out byte* out_pixels, out int out_width, out int out_height)
         {
diff --git a/src/ImGui.NET/Generated/ImGui.gen.cs b/src/ImGui.NET/Generated/ImGui.gen.cs
diff --git a/src/ImGui.NET/Generated/ImGuiStorage.gen.cs b/src/ImGui.NET/Generated/ImGuiStorage.gen.cs

Original file line number	Diff line number	Diff line change
`@@ -694,11 +694,12 @@ private static void EmitOverload(`
`694`	`694`	`preCallLines.Add($"byte* {nativeArgName} = &{nativeArgName}_val;");`
`695`	`695`	`postCallLines.Add($"{correctedIdentifier} = {nativeArgName}_val != 0;");`
`696`	`696`	`}`
`697`		`- else if (tr.Type == "void*")`
	`697`	`+ else if (tr.Type == "void" \|\| tr.Type == "ImWchar")`
`698`	`698`	`{`
	`699`	`+ string nativePtrTypeName = tr.Type == "void" ? "void" : "ushort*";`
`699`	`700`	`string nativeArgName = "native_" + tr.Name;`
`700`	`701`	`marshalledParameters[i] = new MarshalledParameter("IntPtr", false, nativeArgName, false);`
`701`		`- preCallLines.Add($"void* {nativeArgName} = {correctedIdentifier}.ToPointer();");`
	`702`	`+ preCallLines.Add($"{nativePtrTypeName} {nativeArgName} = ({nativePtrTypeName}){correctedIdentifier}.ToPointer();");`
`702`	`703`	`}`
`703`	`704`	`else if (GetWrappedType(tr.Type, out string wrappedParamType)`
`704`	`705`	`&& !s_wellKnownTypes.ContainsKey(tr.Type)`
`@@ -795,6 +796,10 @@ private static void EmitOverload(`
`795`	`796`	`{`
`796`	`797`	`writer.WriteLine("return Util.StringFromPtr(ret);");`
`797`	`798`	`}`
	`799`	`+ else if (overload.ReturnType == "ImWchar*")`
	`800`	`+ {`
	`801`	`+ writer.WriteLine("return (IntPtr)ret;");`
	`802`	`+ }`
`798`	`803`	`else if (overload.ReturnType == "void*")`
`799`	`804`	`{`
`800`	`805`	`writer.WriteLine("return (IntPtr)ret;");`
`@@ -829,7 +834,7 @@ private static string GetSafeType(string nativeRet)`
`829`	`834`	`{`
`830`	`835`	`return "string";`
`831`	`836`	`}`
`832`		`- else if (nativeRet == "void*")`
	`837`	`+ else if (nativeRet == "ImWchar" \|\| nativeRet == "void")`
`833`	`838`	`{`
`834`	`839`	`return "IntPtr";`
`835`	`840`	`}`
Original file line number	Diff line number	Diff line change
`@@ -34,12 +34,10 @@ public void AddText(string text)`
`34`	`34`	`byte* native_text_end = null;`
`35`	`35`	`ImGuiNative.GlyphRangesBuilder_AddText(NativePtr, native_text, native_text_end);`
`36`	`36`	`}`
`37`		`- public void AddRanges(ref ushort ranges)`
	`37`	`+ public void AddRanges(IntPtr ranges)`
`38`	`38`	`{`
`39`		`- fixed (ushort* native_ranges = &ranges)`
`40`		`- {`
`41`		`- ImGuiNative.GlyphRangesBuilder_AddRanges(NativePtr, native_ranges);`
`42`		`- }`
	`39`	`+ ushort* native_ranges = (ushort*)ranges.ToPointer();`
	`40`	`+ ImGuiNative.GlyphRangesBuilder_AddRanges(NativePtr, native_ranges);`
`43`	`41`	`}`
`44`	`42`	`public void BuildRanges(out ImVector out_ranges)`
`45`	`43`	`{`
Original file line number	Diff line number	Diff line change
`@@ -179,7 +179,7 @@ public void AddRect(Vector2 a, Vector2 b, uint col, float rounding, int rounding`
`179`	`179`	`}`
`180`	`180`	`public void AddCallback(IntPtr callback, IntPtr callback_data)`
`181`	`181`	`{`
`182`		`- void* native_callback_data = callback_data.ToPointer();`
	`182`	`+ void* native_callback_data = (void*)callback_data.ToPointer();`
`183`	`183`	`ImGuiNative.ImDrawList_AddCallback(NativePtr, callback, native_callback_data);`
`184`	`184`	`}`
`185`	`185`	`public void PathRect(Vector2 rect_min, Vector2 rect_max)`
Original file line number	Diff line number	Diff line change
`@@ -74,7 +74,7 @@ public ImFontPtr AddFontFromMemoryCompressedBase85TTF(string compressed_font_dat`
`74`	`74`	`ImFont* ret = ImGuiNative.ImFontAtlas_AddFontFromMemoryCompressedBase85TTF(NativePtr, native_compressed_font_data_base85, size_pixels, native_font_cfg, glyph_ranges);`
`75`	`75`	`return new ImFontPtr(ret);`
`76`	`76`	`}`
`77`		`- public ImFontPtr AddFontFromMemoryCompressedBase85TTF(string compressed_font_data_base85, float size_pixels, ImFontConfigPtr font_cfg, ref ushort glyph_ranges)`
	`77`	`+ public ImFontPtr AddFontFromMemoryCompressedBase85TTF(string compressed_font_data_base85, float size_pixels, ImFontConfigPtr font_cfg, IntPtr glyph_ranges)`
`78`	`78`	`{`
`79`	`79`	`int compressed_font_data_base85_byteCount = Encoding.UTF8.GetByteCount(compressed_font_data_base85);`
`80`	`80`	`byte* native_compressed_font_data_base85 = stackalloc byte[compressed_font_data_base85_byteCount + 1];`
`@@ -84,11 +84,9 @@ public ImFontPtr AddFontFromMemoryCompressedBase85TTF(string compressed_font_dat`
`84`	`84`	`native_compressed_font_data_base85[native_compressed_font_data_base85_offset] = 0;`
`85`	`85`	`}`
`86`	`86`	`ImFontConfig* native_font_cfg = font_cfg.NativePtr;`
`87`		`- fixed (ushort* native_glyph_ranges = &glyph_ranges)`
`88`		`- {`
`89`		`- ImFont* ret = ImGuiNative.ImFontAtlas_AddFontFromMemoryCompressedBase85TTF(NativePtr, native_compressed_font_data_base85, size_pixels, native_font_cfg, native_glyph_ranges);`
`90`		`- return new ImFontPtr(ret);`
`91`		`- }`
	`87`	`+ ushort* native_glyph_ranges = (ushort*)glyph_ranges.ToPointer();`
	`88`	`+ ImFont* ret = ImGuiNative.ImFontAtlas_AddFontFromMemoryCompressedBase85TTF(NativePtr, native_compressed_font_data_base85, size_pixels, native_font_cfg, native_glyph_ranges);`
	`89`	`+ return new ImFontPtr(ret);`
`92`	`90`	`}`
`93`	`91`	`public bool Build()`
`94`	`92`	`{`
`@@ -129,30 +127,30 @@ public bool IsBuilt()`
`129`	`127`	`byte ret = ImGuiNative.ImFontAtlas_IsBuilt(NativePtr);`
`130`	`128`	`return ret != 0;`
`131`	`129`	`}`
`132`		`- public ushort* GetGlyphRangesThai()`
	`130`	`+ public IntPtr GetGlyphRangesThai()`
`133`	`131`	`{`
`134`	`132`	`ushort* ret = ImGuiNative.ImFontAtlas_GetGlyphRangesThai(NativePtr);`
`135`		`- return ret;`
	`133`	`+ return (IntPtr)ret;`
`136`	`134`	`}`
`137`		`- public ushort* GetGlyphRangesCyrillic()`
	`135`	`+ public IntPtr GetGlyphRangesCyrillic()`
`138`	`136`	`{`
`139`	`137`	`ushort* ret = ImGuiNative.ImFontAtlas_GetGlyphRangesCyrillic(NativePtr);`
`140`		`- return ret;`
	`138`	`+ return (IntPtr)ret;`
`141`	`139`	`}`
`142`		`- public ushort* GetGlyphRangesChineseSimplifiedCommon()`
	`140`	`+ public IntPtr GetGlyphRangesChineseSimplifiedCommon()`
`143`	`141`	`{`
`144`	`142`	`ushort* ret = ImGuiNative.ImFontAtlas_GetGlyphRangesChineseSimplifiedCommon(NativePtr);`
`145`		`- return ret;`
	`143`	`+ return (IntPtr)ret;`
`146`	`144`	`}`
`147`		`- public ushort* GetGlyphRangesChineseFull()`
	`145`	`+ public IntPtr GetGlyphRangesChineseFull()`
`148`	`146`	`{`
`149`	`147`	`ushort* ret = ImGuiNative.ImFontAtlas_GetGlyphRangesChineseFull(NativePtr);`
`150`		`- return ret;`
	`148`	`+ return (IntPtr)ret;`
`151`	`149`	`}`
`152`		`- public ushort* GetGlyphRangesDefault()`
	`150`	`+ public IntPtr GetGlyphRangesDefault()`
`153`	`151`	`{`
`154`	`152`	`ushort* ret = ImGuiNative.ImFontAtlas_GetGlyphRangesDefault(NativePtr);`
`155`		`- return ret;`
	`153`	`+ return (IntPtr)ret;`
`156`	`154`	`}`
`157`	`155`	`public void SetTexID(IntPtr id)`
`158`	`156`	`{`
`@@ -172,55 +170,51 @@ public void Clear()`
`172`	`170`	`}`
`173`	`171`	`public ImFontPtr AddFontFromMemoryCompressedTTF(IntPtr compressed_font_data, int compressed_font_size, float size_pixels)`
`174`	`172`	`{`
`175`		`- void* native_compressed_font_data = compressed_font_data.ToPointer();`
	`173`	`+ void* native_compressed_font_data = (void*)compressed_font_data.ToPointer();`
`176`	`174`	`ImFontConfig* font_cfg = null;`
`177`	`175`	`ushort* glyph_ranges = null;`
`178`	`176`	`ImFont* ret = ImGuiNative.ImFontAtlas_AddFontFromMemoryCompressedTTF(NativePtr, native_compressed_font_data, compressed_font_size, size_pixels, font_cfg, glyph_ranges);`
`179`	`177`	`return new ImFontPtr(ret);`
`180`	`178`	`}`
`181`	`179`	`public ImFontPtr AddFontFromMemoryCompressedTTF(IntPtr compressed_font_data, int compressed_font_size, float size_pixels, ImFontConfigPtr font_cfg)`
`182`	`180`	`{`
`183`		`- void* native_compressed_font_data = compressed_font_data.ToPointer();`
	`181`	`+ void* native_compressed_font_data = (void*)compressed_font_data.ToPointer();`
`184`	`182`	`ImFontConfig* native_font_cfg = font_cfg.NativePtr;`
`185`	`183`	`ushort* glyph_ranges = null;`
`186`	`184`	`ImFont* ret = ImGuiNative.ImFontAtlas_AddFontFromMemoryCompressedTTF(NativePtr, native_compressed_font_data, compressed_font_size, size_pixels, native_font_cfg, glyph_ranges);`
`187`	`185`	`return new ImFontPtr(ret);`
`188`	`186`	`}`
`189`		`- public ImFontPtr AddFontFromMemoryCompressedTTF(IntPtr compressed_font_data, int compressed_font_size, float size_pixels, ImFontConfigPtr font_cfg, ref ushort glyph_ranges)`
	`187`	`+ public ImFontPtr AddFontFromMemoryCompressedTTF(IntPtr compressed_font_data, int compressed_font_size, float size_pixels, ImFontConfigPtr font_cfg, IntPtr glyph_ranges)`
`190`	`188`	`{`
`191`		`- void* native_compressed_font_data = compressed_font_data.ToPointer();`
	`189`	`+ void* native_compressed_font_data = (void*)compressed_font_data.ToPointer();`
`192`	`190`	`ImFontConfig* native_font_cfg = font_cfg.NativePtr;`
`193`		`- fixed (ushort* native_glyph_ranges = &glyph_ranges)`
`194`		`- {`
`195`		`- ImFont* ret = ImGuiNative.ImFontAtlas_AddFontFromMemoryCompressedTTF(NativePtr, native_compressed_font_data, compressed_font_size, size_pixels, native_font_cfg, native_glyph_ranges);`
`196`		`- return new ImFontPtr(ret);`
`197`		`- }`
	`191`	`+ ushort* native_glyph_ranges = (ushort*)glyph_ranges.ToPointer();`
	`192`	`+ ImFont* ret = ImGuiNative.ImFontAtlas_AddFontFromMemoryCompressedTTF(NativePtr, native_compressed_font_data, compressed_font_size, size_pixels, native_font_cfg, native_glyph_ranges);`
	`193`	`+ return new ImFontPtr(ret);`
`198`	`194`	`}`
`199`	`195`	`public ImFontPtr AddFontFromMemoryTTF(IntPtr font_data, int font_size, float size_pixels)`
`200`	`196`	`{`
`201`		`- void* native_font_data = font_data.ToPointer();`
	`197`	`+ void* native_font_data = (void*)font_data.ToPointer();`
`202`	`198`	`ImFontConfig* font_cfg = null;`
`203`	`199`	`ushort* glyph_ranges = null;`
`204`	`200`	`ImFont* ret = ImGuiNative.ImFontAtlas_AddFontFromMemoryTTF(NativePtr, native_font_data, font_size, size_pixels, font_cfg, glyph_ranges);`
`205`	`201`	`return new ImFontPtr(ret);`
`206`	`202`	`}`
`207`	`203`	`public ImFontPtr AddFontFromMemoryTTF(IntPtr font_data, int font_size, float size_pixels, ImFontConfigPtr font_cfg)`
`208`	`204`	`{`
`209`		`- void* native_font_data = font_data.ToPointer();`
	`205`	`+ void* native_font_data = (void*)font_data.ToPointer();`
`210`	`206`	`ImFontConfig* native_font_cfg = font_cfg.NativePtr;`
`211`	`207`	`ushort* glyph_ranges = null;`
`212`	`208`	`ImFont* ret = ImGuiNative.ImFontAtlas_AddFontFromMemoryTTF(NativePtr, native_font_data, font_size, size_pixels, native_font_cfg, glyph_ranges);`
`213`	`209`	`return new ImFontPtr(ret);`
`214`	`210`	`}`
`215`		`- public ImFontPtr AddFontFromMemoryTTF(IntPtr font_data, int font_size, float size_pixels, ImFontConfigPtr font_cfg, ref ushort glyph_ranges)`
	`211`	`+ public ImFontPtr AddFontFromMemoryTTF(IntPtr font_data, int font_size, float size_pixels, ImFontConfigPtr font_cfg, IntPtr glyph_ranges)`
`216`	`212`	`{`
`217`		`- void* native_font_data = font_data.ToPointer();`
	`213`	`+ void* native_font_data = (void*)font_data.ToPointer();`
`218`	`214`	`ImFontConfig* native_font_cfg = font_cfg.NativePtr;`
`219`		`- fixed (ushort* native_glyph_ranges = &glyph_ranges)`
`220`		`- {`
`221`		`- ImFont* ret = ImGuiNative.ImFontAtlas_AddFontFromMemoryTTF(NativePtr, native_font_data, font_size, size_pixels, native_font_cfg, native_glyph_ranges);`
`222`		`- return new ImFontPtr(ret);`
`223`		`- }`
	`215`	`+ ushort* native_glyph_ranges = (ushort*)glyph_ranges.ToPointer();`
	`216`	`+ ImFont* ret = ImGuiNative.ImFontAtlas_AddFontFromMemoryTTF(NativePtr, native_font_data, font_size, size_pixels, native_font_cfg, native_glyph_ranges);`
	`217`	`+ return new ImFontPtr(ret);`
`224`	`218`	`}`
`225`	`219`	`public ImFontPtr AddFontFromFileTTF(string filename, float size_pixels)`
`226`	`220`	`{`
`@@ -250,7 +244,7 @@ public ImFontPtr AddFontFromFileTTF(string filename, float size_pixels, ImFontCo`
`250`	`244`	`ImFont* ret = ImGuiNative.ImFontAtlas_AddFontFromFileTTF(NativePtr, native_filename, size_pixels, native_font_cfg, glyph_ranges);`
`251`	`245`	`return new ImFontPtr(ret);`
`252`	`246`	`}`
`253`		`- public ImFontPtr AddFontFromFileTTF(string filename, float size_pixels, ImFontConfigPtr font_cfg, ref ushort glyph_ranges)`
	`247`	`+ public ImFontPtr AddFontFromFileTTF(string filename, float size_pixels, ImFontConfigPtr font_cfg, IntPtr glyph_ranges)`
`254`	`248`	`{`
`255`	`249`	`int filename_byteCount = Encoding.UTF8.GetByteCount(filename);`
`256`	`250`	`byte* native_filename = stackalloc byte[filename_byteCount + 1];`
`@@ -260,11 +254,9 @@ public ImFontPtr AddFontFromFileTTF(string filename, float size_pixels, ImFontCo`
`260`	`254`	`native_filename[native_filename_offset] = 0;`
`261`	`255`	`}`
`262`	`256`	`ImFontConfig* native_font_cfg = font_cfg.NativePtr;`
`263`		`- fixed (ushort* native_glyph_ranges = &glyph_ranges)`
`264`		`- {`
`265`		`- ImFont* ret = ImGuiNative.ImFontAtlas_AddFontFromFileTTF(NativePtr, native_filename, size_pixels, native_font_cfg, native_glyph_ranges);`
`266`		`- return new ImFontPtr(ret);`
`267`		`- }`
	`257`	`+ ushort* native_glyph_ranges = (ushort*)glyph_ranges.ToPointer();`
	`258`	`+ ImFont* ret = ImGuiNative.ImFontAtlas_AddFontFromFileTTF(NativePtr, native_filename, size_pixels, native_font_cfg, native_glyph_ranges);`
	`259`	`+ return new ImFontPtr(ret);`
`268`	`260`	`}`
`269`	`261`	`public ImFontPtr AddFontDefault()`
`270`	`262`	`{`
`@@ -278,10 +270,10 @@ public ImFontPtr AddFontDefault(ImFontConfigPtr font_cfg)`
`278`	`270`	`ImFont* ret = ImGuiNative.ImFontAtlas_AddFontDefault(NativePtr, native_font_cfg);`
`279`	`271`	`return new ImFontPtr(ret);`
`280`	`272`	`}`
`281`		`- public ushort* GetGlyphRangesJapanese()`
	`273`	`+ public IntPtr GetGlyphRangesJapanese()`
`282`	`274`	`{`
`283`	`275`	`ushort* ret = ImGuiNative.ImFontAtlas_GetGlyphRangesJapanese(NativePtr);`
`284`		`- return ret;`
	`276`	`+ return (IntPtr)ret;`
`285`	`277`	`}`
`286`	`278`	`public void GetTexDataAsAlpha8(out byte* out_pixels, out int out_width, out int out_height)`
`287`	`279`	`{`
`@@ -334,10 +326,10 @@ public bool GetMouseCursorTexData(ImGuiMouseCursor cursor, out Vector2 out_offse`
`334`	`326`	`}`
`335`	`327`	`}`
`336`	`328`	`}`
`337`		`- public ushort* GetGlyphRangesKorean()`
	`329`	`+ public IntPtr GetGlyphRangesKorean()`
`338`	`330`	`{`
`339`	`331`	`ushort* ret = ImGuiNative.ImFontAtlas_GetGlyphRangesKorean(NativePtr);`
`340`		`- return ret;`
	`332`	`+ return (IntPtr)ret;`
`341`	`333`	`}`
`342`	`334`	`public void GetTexDataAsRGBA32(out byte* out_pixels, out int out_width, out int out_height)`
`343`	`335`	`{`