minor fixup: updated util function signature.

zaafar · mellinoe · commit 85d01be39421 · 2020-12-31T00:31:19.000-08:00
diff --git a/src/ImGui.NET/ImGui.Manual.cs b/src/ImGui.NET/ImGui.Manual.cs
@@ -403,7 +403,7 @@ private static Vector2 CalcTextSizeImpl(
             {
 
                 int textToCopyLen = length.HasValue ? length.Value : text.Length;
-                textByteCount = Util.CalcUtf8(text, start, textToCopyLen);
+                textByteCount = Util.CalcSizeInUtf8(text, start, textToCopyLen);
                 if (textByteCount > Util.StackAllocationSizeLimit)
                 {
                     nativeTextStart = Util.Allocate(textByteCount + 1);
@@ -414,7 +414,7 @@ private static Vector2 CalcTextSizeImpl(
                     nativeTextStart = nativeTextStackBytes;
                 }
 
-                int nativeTextOffset = Util.GetUtf8(text, nativeTextStart, textByteCount, start, textToCopyLen);
+                int nativeTextOffset = Util.GetUtf8(text, start, textToCopyLen, nativeTextStart, textByteCount);
                 nativeTextStart[nativeTextOffset] = 0;
                 nativeTextEnd = nativeTextStart + nativeTextOffset;
             }
diff --git a/src/ImGui.NET/Util.cs b/src/ImGui.NET/Util.cs
@@ -32,8 +32,10 @@ internal static bool AreStringsEqual(byte* a, int aLength, byte* b)
         }
 
         internal static byte* Allocate(int byteCount) => (byte*)Marshal.AllocHGlobal(byteCount);
+
         internal static void Free(byte* ptr) => Marshal.FreeHGlobal((IntPtr)ptr);
-        internal static int CalcUtf8(string s, int start, int length)
+
+        internal static int CalcSizeInUtf8(string s, int start, int length)
         {
             if (start > s.Length - 1 || length > s.Length || start + length > s.Length)
             {
@@ -54,7 +56,7 @@ internal static int GetUtf8(string s, byte* utf8Bytes, int utf8ByteCount)
             }
         }
 
-        internal static int GetUtf8(string s, byte* utf8Bytes, int utf8ByteCount, int start = 0, int length = 0)
+        internal static int GetUtf8(string s, int start, int length, byte* utf8Bytes, int utf8ByteCount)
         {
             fixed (char* utf16Ptr = s)
             {

Original file line number	Diff line number	Diff line change
`@@ -403,7 +403,7 @@ private static Vector2 CalcTextSizeImpl(`
`403`	`403`	`{`
`404`	`404`
`405`	`405`	`int textToCopyLen = length.HasValue ? length.Value : text.Length;`
`406`		`- textByteCount = Util.CalcUtf8(text, start, textToCopyLen);`
	`406`	`+ textByteCount = Util.CalcSizeInUtf8(text, start, textToCopyLen);`
`407`	`407`	`if (textByteCount > Util.StackAllocationSizeLimit)`
`408`	`408`	`{`
`409`	`409`	`nativeTextStart = Util.Allocate(textByteCount + 1);`
`@@ -414,7 +414,7 @@ private static Vector2 CalcTextSizeImpl(`
`414`	`414`	`nativeTextStart = nativeTextStackBytes;`
`415`	`415`	`}`
`416`	`416`
`417`		`- int nativeTextOffset = Util.GetUtf8(text, nativeTextStart, textByteCount, start, textToCopyLen);`
	`417`	`+ int nativeTextOffset = Util.GetUtf8(text, start, textToCopyLen, nativeTextStart, textByteCount);`
`418`	`418`	`nativeTextStart[nativeTextOffset] = 0;`
`419`	`419`	`nativeTextEnd = nativeTextStart + nativeTextOffset;`
`420`	`420`	`}`
Original file line number	Diff line number	Diff line change
`@@ -32,8 +32,10 @@ internal static bool AreStringsEqual(byte* a, int aLength, byte* b)`
`32`	`32`	`}`
`33`	`33`
`34`	`34`	`internal static byte* Allocate(int byteCount) => (byte*)Marshal.AllocHGlobal(byteCount);`
	`35`	`+`
`35`	`36`	`internal static void Free(byte* ptr) => Marshal.FreeHGlobal((IntPtr)ptr);`
`36`		`- internal static int CalcUtf8(string s, int start, int length)`
	`37`	`+`
	`38`	`+ internal static int CalcSizeInUtf8(string s, int start, int length)`
`37`	`39`	`{`
`38`	`40`	`if (start > s.Length - 1 \|\| length > s.Length \|\| start + length > s.Length)`
`39`	`41`	`{`
`@@ -54,7 +56,7 @@ internal static int GetUtf8(string s, byte* utf8Bytes, int utf8ByteCount)`
`54`	`56`	`}`
`55`	`57`	`}`
`56`	`58`
`57`		`- internal static int GetUtf8(string s, byte* utf8Bytes, int utf8ByteCount, int start = 0, int length = 0)`
	`59`	`+ internal static int GetUtf8(string s, int start, int length, byte* utf8Bytes, int utf8ByteCount)`
`58`	`60`	`{`
`59`	`61`	`fixed (char* utf16Ptr = s)`
`60`	`62`	`{`