Fixed #570

Perfare · Perfare · commit 1766dcbdeb80 · 2020-08-06T13:31:17.000+08:00
diff --git a/AssetStudioUtility/Texture2DConverter.cs b/AssetStudioUtility/Texture2DConverter.cs
@@ -37,10 +37,10 @@ public Bitmap ConvertToBitmap(bool flip)
             {
                 return null;
             }
-            var handle = GCHandle.Alloc(buff, GCHandleType.Pinned);
-            var scan0 = handle.AddrOfPinnedObject();
-            var bitmap = new Bitmap(m_Width, m_Height, m_Width * 4, PixelFormat.Format32bppArgb, scan0);
-            handle.Free();
+            var bitmap = new Bitmap(m_Width, m_Height, PixelFormat.Format32bppArgb);
+            var bmpData = bitmap.LockBits(new Rectangle(0, 0, m_Width, m_Height), ImageLockMode.ReadWrite, PixelFormat.Format32bppArgb);
+            Marshal.Copy(buff, 0, bmpData.Scan0, buff.Length);
+            bitmap.UnlockBits(bmpData);
             if (flip)
             {
                 bitmap.RotateFlip(RotateFlipType.RotateNoneFlipY);

Original file line number	Diff line number	Diff line change
`@@ -37,10 +37,10 @@ public Bitmap ConvertToBitmap(bool flip)`
`37`	`37`	`{`
`38`	`38`	`return null;`
`39`	`39`	`}`
`40`		`- var handle = GCHandle.Alloc(buff, GCHandleType.Pinned);`
`41`		`- var scan0 = handle.AddrOfPinnedObject();`
`42`		`- var bitmap = new Bitmap(m_Width, m_Height, m_Width * 4, PixelFormat.Format32bppArgb, scan0);`
`43`		`- handle.Free();`
	`40`	`+ var bitmap = new Bitmap(m_Width, m_Height, PixelFormat.Format32bppArgb);`
	`41`	`+ var bmpData = bitmap.LockBits(new Rectangle(0, 0, m_Width, m_Height), ImageLockMode.ReadWrite, PixelFormat.Format32bppArgb);`
	`42`	`+ Marshal.Copy(buff, 0, bmpData.Scan0, buff.Length);`
	`43`	`+ bitmap.UnlockBits(bmpData);`
`44`	`44`	`if (flip)`
`45`	`45`	`{`
`46`	`46`	`bitmap.RotateFlip(RotateFlipType.RotateNoneFlipY);`