epic/OpenRA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Validate PixelFormat of source bitmap argument in FastCopyIntoSprite.

Browse Source
This commit is contained in:
RoosterDragon
2015-04-10 18:35:02 +01:00
parent 5dfcc3e9d0
commit 7883355481
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
OpenRA.Game/Graphics/Util.cs
View File

@@ -64,6 +64,9 @@ namespace OpenRA.Graphics
public static void FastCopyIntoSprite(Sprite dest, Bitmap src) public static void FastCopyIntoSprite(Sprite dest, Bitmap src)
{ {
if (src.PixelFormat != PixelFormat.Format32bppArgb)
throw new ArgumentException("src must have a PixelFormat of Format32bppArgb", "src");
var data = dest.Sheet.GetData(); var data = dest.Sheet.GetData();
var dataStride = dest.Sheet.Size.Width * 4; var dataStride = dest.Sheet.Size.Width * 4;
var x = dest.Bounds.Left * 4; var x = dest.Bounds.Left * 4;
@@ -72,7 +75,7 @@ namespace OpenRA.Graphics
var height = dest.Bounds.Height; var height = dest.Bounds.Height;
var bd = src.LockBits(src.Bounds(), var bd = src.LockBits(src.Bounds(),
ImageLockMode.ReadWrite, PixelFormat.Format32bppArgb); ImageLockMode.ReadWrite, src.PixelFormat);
for (var row = 0; row < height; row++) for (var row = 0; row < height; row++)
Marshal.Copy(IntPtr.Add(bd.Scan0, row * bd.Stride), data, (y + row) * dataStride + x, width); Marshal.Copy(IntPtr.Add(bd.Scan0, row * bd.Stride), data, (y + row) * dataStride + x, width);
src.UnlockBits(bd); src.UnlockBits(bd);