Fixed #570

Perfare · Aug 6, 2020 · 1766dcb · 1766dcb
1 parent ef38471
commit 1766dcb
Showing 1 changed file with 4 additions and 4 deletions.
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);