tidy

OpenRA.FileFormats/Exts.cs

@@ -172,6 +172,8 @@ namespace OpenRA
 			return v;
 		}
 
+		public static Size NextPowerOf2(this Size s) { return new Size(NextPowerOf2(s.Width), NextPowerOf2(s.Height)); }
+
 		public static string JoinWith<T>(this IEnumerable<T> ts, string j)
 		{
 			return string.Join(j, ts.Select(t => t.ToString()).ToArray());
@@ -199,6 +201,8 @@ namespace OpenRA
 
 			return result;
 		}
+
+		public static Rectangle Bounds(this Bitmap b) { return new Rectangle(0, 0, b.Width, b.Height); }
 	}
 
 	public static class Enum<T>

OpenRA.FileFormats/Graphics/PngLoader.cs

@@ -97,7 +97,7 @@ namespace OpenRA.FileFormats.Graphics
 
 							case "IEND":
 								{
-									var bits = bitmap.LockBits(new Rectangle(0, 0, bitmap.Width, bitmap.Height),
+									var bits = bitmap.LockBits(bitmap.Bounds(),
 										ImageLockMode.WriteOnly, PixelFormat.Format8bppIndexed);
 
 									using (var ns = new MemoryStream(data.ToArray()))

OpenRA.FileFormats/Graphics/ShpReader.cs

@@ -8,7 +8,6 @@
  */
 #endregion
 
-using System.Collections;
 using System.Collections.Generic;
 using System.Drawing;
 using System.IO;

OpenRA.FileFormats/Map/TileSet.cs

@@ -166,7 +166,7 @@ namespace OpenRA.FileFormats
 
 			bitmap.Palette = p.AsSystemPalette();
 
-			var data = bitmap.LockBits(new Rectangle(0, 0, bitmap.Width, bitmap.Height),
+			var data = bitmap.LockBits(bitmap.Bounds(),
 				ImageLockMode.WriteOnly, PixelFormat.Format8bppIndexed);
 
 			unsafe