Use ImageSharp instead for image decoding/resizing in dotnet build

ClassiCube · Aug 16, 2022 · 522260d · 522260d
1 parent e36b969
commit 522260d
Show file tree

Hide file tree

Showing 3 changed files with 56 additions and 2 deletions.
diff --git a/CLI/MCGalaxyCLI_core.csproj → CLI/MCGalaxyCLI_dotnet.csproj b/CLI/MCGalaxyCLI_core.csproj → CLI/MCGalaxyCLI_dotnet.csproj
@@ -5,6 +5,6 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\MCGalaxy\MCGalaxy_core.csproj" />
+    <ProjectReference Include="..\MCGalaxy\MCGalaxy_dotnet.csproj" />
   </ItemGroup>
 </Project>
diff --git a/MCGalaxy/MCGalaxy_core.csproj → MCGalaxy/MCGalaxy_dotnet.csproj b/MCGalaxy/MCGalaxy_core.csproj → MCGalaxy/MCGalaxy_dotnet.csproj
@@ -5,7 +5,7 @@
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="System.Drawing.Common" Version="4.5.0" />
     <PackageReference Include="MySql.Data" Version="6.7.9" />
+    <PackageReference Include="SixLabors.ImageSharp" Version="2.1.3" />
   </ItemGroup>
 </Project>
diff --git a/MCGalaxy/util/ImageUtils.cs b/MCGalaxy/util/ImageUtils.cs
@@ -16,9 +16,16 @@
     permissions and limitations under the Licenses.
  */
 using System;
+#if !NETSTANDARD
 using System.Drawing;
 using System.Drawing.Drawing2D;
 using System.Drawing.Imaging;
+#else
+using SixLabors.ImageSharp;
+using SixLabors.ImageSharp.PixelFormats;
+using SixLabors.ImageSharp.Processing;
+using SixLabors.ImageSharp.Processing.Processors.Transforms;
+#endif
 using System.IO;
 
 namespace MCGalaxy.Util 
@@ -41,9 +48,14 @@ public abstract class IBitmap2D : IDisposable
 
         public abstract void Dispose();
 
+#if !NETSTANDARD
         public static IBitmap2D Create() { return new GDIPlusBitmap(); }
+#else
+        public static IBitmap2D Create() { return new ImageSharpBitmap(); }
+#endif
     }
 
+#if !NETSTANDARD
     unsafe sealed class GDIPlusBitmap : IBitmap2D
     {
         Image img;
@@ -138,4 +150,46 @@ unsafe sealed class GDIPlusBitmap : IBitmap2D
             data = null;
         }
     }
+#else
+	unsafe sealed class ImageSharpBitmap : IBitmap2D
+    {
+        Image<Rgba32> img;
+
+        public override void Decode(byte[] data) {
+            img = Image.Load<Rgba32>(data);
+            UpdateDimensions();
+            Get = GetPixel;
+        }
+
+        public override void Resize(int width, int height, bool hq) {
+            IResampler resampler = hq ? KnownResamplers.Bicubic : KnownResamplers.NearestNeighbor;
+            img.Mutate(x => x.Resize(width, height, resampler));
+            UpdateDimensions();
+        }
+
+        void UpdateDimensions() {
+            Width  = img.Width;
+            Height = img.Height;
+        }
+
+        Pixel GetPixel(int x, int y) {
+            Pixel pixel;
+            Rgba32 src = img[x, y];
+            pixel.A = src.A;
+            pixel.R = src.R;
+            pixel.G = src.G;
+            pixel.B = src.B; // TODO avoid overhead by direct blit??
+            return pixel;
+        }
+
+        public override void Dispose() {
+            if (img != null) img.Dispose();
+            img = null;
+        }
+
+
+        public override void LockBits() { }
+        public override void UnlockBits() { }
+	}
+#endif
 }