migration to System.Drawing

Author: laz1444

src/MiNET/MiNET/Entities/ImageProviders/TextMapImageProvider.cs

@@ -23,33 +23,20 @@
 
 #endregion
 
-using System.Drawing.Drawing2D;
+using System.Drawing;
+using System.Drawing.Imaging;
 using MiNET.Net;
 using MiNET.Utils;
-using SixLabors.Fonts;
-using SixLabors.ImageSharp;
-using SixLabors.ImageSharp.Drawing.Processing;
-using SixLabors.ImageSharp.PixelFormats;
-using SixLabors.ImageSharp.Processing;
-using Color = System.Drawing.Color;
-using RectangleF = System.Drawing.RectangleF;
 
 namespace MiNET.Entities.ImageProviders
 {
 	public class TextMapImageProvider : IMapImageProvider
 	{
-		private static FontCollection _fontCollection;
 		private static Font _font = null;
 
 		static TextMapImageProvider()
 		{
-			_fontCollection = new FontCollection();
-			_fontCollection.AddSystemFonts();
-
-			if (_fontCollection.TryGet("Arial", out var family))
-			{
-				_font = family.CreateFont(9);
-			}
+			_font = new Font("Arial", 9);
 		}
 
 		public string Text { get; set; }
@@ -91,36 +78,39 @@ public virtual McpeWrapper GetBatch(MapInfo mapInfo, bool forced)
 
 		private static byte[] DrawText(MapInfo map, string text)
 		{
-			var bitmap = new Image<Rgba32>(map.Col, map.Row);
-			var rectf = new RectangleF(0, 0, map.Col, map.Row);
-			/*var g = Graphics.FromImage(bitmap);
-			g.SmoothingMode = SmoothingMode.AntiAlias;
-			g.InterpolationMode = InterpolationMode.HighQualityBicubic;
-			g.PixelOffsetMode = PixelOffsetMode.HighQuality;
-			g.DrawString(text, new Font("SketchFlow Print", 10), Brushes.AntiqueWhite, rectf);
-			g.Flush();*/
-			
-			bitmap.Mutate(
-				x =>
+			using (var bitmap = new Bitmap(map.Col, map.Row))
+			{
+				using (Graphics graphics = Graphics.FromImage(bitmap))
 				{
-					x.DrawText(text, _font, SixLabors.ImageSharp.Color.AntiqueWhite, new PointF(0, 0));
-				});
+					graphics.TextRenderingHint = System.Drawing.Text.TextRenderingHint.AntiAlias;
+					graphics.DrawString(text, _font, Brushes.AntiqueWhite, new PointF(0, 0));
+				}
 
-			byte[] bytes = new byte[bitmap.Height * bitmap.Width * 4];
+				Rectangle rect = new Rectangle(0, 0, bitmap.Width, bitmap.Height);
+				BitmapData bmpData = bitmap.LockBits(rect, ImageLockMode.ReadOnly, bitmap.PixelFormat);
 
-			int i = 0;
-			for (int y = 0; y < bitmap.Height; y++)
-			{
-				for (int x = 0; x < bitmap.Width; x++)
+				int bytesPerPixel = Bitmap.GetPixelFormatSize(bitmap.PixelFormat) / 8;
+				int byteCount = bmpData.Stride * bitmap.Height;
+				byte[] bytes = new byte[byteCount];
+
+				System.Runtime.InteropServices.Marshal.Copy(bmpData.Scan0, bytes, 0, byteCount);
+
+				bitmap.UnlockBits(bmpData);
+
+				for (int i = 0; i < bytes.Length; i += bytesPerPixel)
 				{
-					var color = bitmap[x, y];
-					bytes[i++] = color.R;
-					bytes[i++] = color.G;
-					bytes[i++] = color.B;
-					bytes[i++] = 0xff;
+					byte b = bytes[i];
+					byte g = bytes[i + 1];
+					byte r = bytes[i + 2];
+					byte a = bytes[i + 3];
+					bytes[i] = r;
+					bytes[i + 1] = g;
+					bytes[i + 2] = b;
+					bytes[i + 3] = a;
 				}
+
+				return bytes;
 			}
-			return bytes;
 		}
 	}
 }

src/MiNET/MiNET/MiNET.csproj

@@ -49,8 +49,6 @@
     <PackageReference Include="MiNET.LevelDB" Version="1.0.49" />
     <PackageReference Include="Newtonsoft.Json" Version="13.0.2" />
     <PackageReference Include="Portable.BouncyCastle" Version="1.9.0" />
-    <PackageReference Include="SixLabors.ImageSharp" Version="3.1.3" />
-    <PackageReference Include="SixLabors.ImageSharp.Drawing" Version="1.0.0-beta14" />
     <PackageReference Include="System.Drawing.Common" Version="8.0.3" />
     <PackageReference Include="System.Security.Cryptography.ProtectedData" Version="8.0.0" />
   </ItemGroup>

src/MiNET/MiNET/Utils/Skins/Skin.cs

@@ -25,14 +25,11 @@
 
 using System;
 using System.Collections.Generic;
+using System.Drawing;
 using System.Drawing.Imaging;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Converters;
 using Newtonsoft.Json.Serialization;
-using SixLabors.ImageSharp;
-using SixLabors.ImageSharp.Formats.Png;
-using SixLabors.ImageSharp.PixelFormats;
-using Color = System.Drawing.Color;
 
 namespace MiNET.Utils.Skins
 {
@@ -106,7 +103,7 @@ public SkinResourcePatch SkinResourcePatch
 
 		public static byte[] GetTextureFromFile(string filename)
 		{
-			var bitmap = Image.Load<Rgba32>(filename);// new Image<Rgba32>(filename);
+			Bitmap bitmap = new Bitmap(filename);
 
 			var size = bitmap.Height * bitmap.Width * 4;
 
@@ -119,7 +116,7 @@ public static byte[] GetTextureFromFile(string filename)
 			{
 				for (int x = 0; x < bitmap.Width; x++)
 				{
-					var color = bitmap[x, y];
+					var color = bitmap.GetPixel(x, y);
 					bytes[i++] = color.R;
 					bytes[i++] = color.G;
 					bytes[i++] = color.B;
@@ -137,7 +134,15 @@ public static void SaveTextureToFile(string filename, byte[] bytes)
 			int width = size == 0x10000 ? 128 : 64;
 			var height = size == 0x2000 ? 32 : (size == 0x4000 ? 64 : 128);
 
-			var bitmap = new Image<Rgba32>(width, height);
+			var bitmap = new Bitmap(width, height);
+
+			BitmapData bmpData = bitmap.LockBits(new Rectangle(0, 0, bitmap.Width, bitmap.Height), ImageLockMode.ReadWrite, bitmap.PixelFormat);
+
+			int bytesPerPixel = Bitmap.GetPixelFormatSize(bitmap.PixelFormat) / 8;
+			int byteCount = bmpData.Stride * bitmap.Height;
+			byte[] rgbValues = new byte[byteCount];
+
+			System.Runtime.InteropServices.Marshal.Copy(bmpData.Scan0, rgbValues, 0, byteCount);
 
 			int i = 0;
 			for (int y = 0; y < bitmap.Height; y++)
@@ -149,10 +154,19 @@ public static void SaveTextureToFile(string filename, byte[] bytes)
 					byte b = bytes[i++];
 					byte a = bytes[i++];
 
-					bitmap[x, y] = new Rgba32(r, g, b, a);
+					int index = y * bmpData.Stride + x * bytesPerPixel;
+
+					rgbValues[index] = r;
+					rgbValues[index + 1] = g;
+					rgbValues[index + 2] = b;
+					if (bytesPerPixel == 4) { rgbValues[index + 3] = a; }
 				}
 			}
-			
+
+			System.Runtime.InteropServices.Marshal.Copy(rgbValues, 0, bmpData.Scan0, byteCount);
+
+			bitmap.UnlockBits(bmpData);
+
 			bitmap.Save(filename);
 		}