Minorly tidy up image decoding code

Author: UnknownShadow200

MCGalaxy/MCGalaxy_.csproj

@@ -670,8 +670,9 @@
     <Compile Include="Server\Maintenance\ZipWriter.cs" />
     <Compile Include="util\CountryUtils.cs" />
     <Compile Include="util\Formatting\Wildcard.cs" />
-    <Compile Include="util\ImageUtils.cs" />
     <Compile Include="util\DotnetBackend.cs" />
+    <Compile Include="util\Imaging\Bitmap2D.cs" />
+    <Compile Include="util\Imaging\ImageUtils.cs" />
     <Compile Include="util\NumberUtils.cs" />
     <Compile Include="util\OperatingSystem.cs" />
     <Compile Include="Server\Server.cs" />
@@ -726,7 +727,9 @@
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
   </ItemGroup>
-  <ItemGroup />
+  <ItemGroup>
+    <Folder Include="util\Imaging" />
+  </ItemGroup>
   <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.

MCGalaxy/util/ImageUtils.cs MCGalaxy/util/Imaging/Bitmap2D.csMCGalaxy/util/ImageUtils.cs renamed to MCGalaxy/util/Imaging/Bitmap2D.cs

@@ -38,7 +38,8 @@ public struct Pixel { public byte A, R, G, B; }
     /// <remarks> Backing implementation depends on whether running on dotnet or .NET </remarks>
     public abstract class IBitmap2D : IDisposable
     {
-        public int Width, Height;
+        public int Width;
+        public int Height;
         public PixelGet Get;
         public PixelSet Set;
 
@@ -62,38 +63,6 @@ public abstract class IBitmap2D : IDisposable
 #endif
     }
 
-    public static class ImageUtils 
-    {       
-        public static IBitmap2D DecodeImage(byte[] data, Player p) {
-            IBitmap2D bmp = null;
-            try {
-                bmp = IBitmap2D.Create();
-                bmp.Decode(data);
-                return bmp;
-            } catch (ArgumentException ex) {
-                // GDI+ throws ArgumentException when data is not an image
-                // This is a fairly expected error - e.g. when a user tries to /imgprint
-                //   the webpage an image is hosted on, instead of the actual image itself. 
-                // So don't bother logging a full error for this case
-                Logger.Log(LogType.Warning, "Error decoding image: " + ex.Message);
-                OnDecodeError(p, bmp);
-                return null;
-            } catch (Exception ex) {
-                Logger.LogError("Error decoding image", ex);
-                OnDecodeError(p, bmp);
-                return null;
-            }
-        }
-
-        static void OnDecodeError(Player p, IBitmap2D bmp) {
-            if (bmp != null) bmp.Dispose();
-            // TODO failed to decode the image. make sure you are using the URL of the image directly, not just the webpage it is hosted on              
-            p.Message("&WThere was an error reading the downloaded image.");
-            p.Message("&WThe url may need to end with its extension (such as .jpg).");
-        }
-    }
-
-
 #if !MCG_DOTNET
     unsafe sealed class GDIPlusBitmap : IBitmap2D
     {

MCGalaxy/util/Imaging/ImageUtils.cs

@@ -0,0 +1,53 @@
+/*
+    Copyright 2015-2024 MCGalaxy
+        
+    Dual-licensed under the Educational Community License, Version 2.0 and
+    the GNU General Public License, Version 3 (the "Licenses"); you may
+    not use this file except in compliance with the Licenses. You may
+    obtain a copy of the Licenses at
+    
+    https://opensource.org/license/ecl-2-0/
+    https://www.gnu.org/licenses/gpl-3.0.html
+    
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the Licenses are distributed on an "AS IS"
+    BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
+    or implied. See the Licenses for the specific language governing
+    permissions and limitations under the Licenses.
+ */
+using System;
+using System.IO;
+
+namespace MCGalaxy.Util 
+{
+    public static class ImageUtils 
+    {       
+        public static IBitmap2D DecodeImage(byte[] data, Player p) {
+            IBitmap2D bmp = null;
+            try {
+                bmp = IBitmap2D.Create();
+                bmp.Decode(data);
+                return bmp;
+            } catch (ArgumentException ex) {
+                // GDI+ throws ArgumentException when data is not an image
+                // This is a fairly expected error - e.g. when a user tries to /imgprint
+                //   the webpage an image is hosted on, instead of the actual image itself. 
+                // So don't bother logging a full error for this case
+                Logger.Log(LogType.Warning, "Error decoding image: " + ex.Message);
+                OnDecodeError(p, bmp);
+                return null;
+            } catch (Exception ex) {
+                Logger.LogError("Error decoding image", ex);
+                OnDecodeError(p, bmp);
+                return null;
+            }
+        }
+
+        static void OnDecodeError(Player p, IBitmap2D bmp) {
+            if (bmp != null) bmp.Dispose();
+            // TODO failed to decode the image. make sure you are using the URL of the image directly, not just the webpage it is hosted on              
+            p.Message("&WThere was an error reading the downloaded image.");
+            p.Message("&WThe url may need to end with its extension (such as .jpg).");
+        }
+    }
+}

MCGalaxy/util/Utils.cs

@@ -29,6 +29,22 @@ public static class Utils
         public static string Hex(byte r, byte g, byte b) {
             return "#" + r.ToString("X2") + g.ToString("X2") + b.ToString("X2");
         }
+        
+        public static string ToHexString(byte[] data) {
+            char[] hex = new char[data.Length * 2];
+
+            for (int i = 0; i < data.Length; i++)
+            {
+                int value = data[i];
+                hex[i * 2 + 0] = HexEncode(value >> 4);
+                hex[i * 2 + 1] = HexEncode(value & 0x0F);
+            }
+            return new string(hex);
+        }
+
+        static char HexEncode(int i) {
+            return i < 10 ? (char)(i + '0') : (char)((i - 10) + 'a');
+        }
 
 
         public static int Clamp(int value, int lo, int hi) {
@@ -49,22 +65,6 @@ public static List<string> ReadAllLinesList(string path) {
         }
 
 
-        public static string ToHexString(byte[] data) {            
-            char[] hex = new char[data.Length * 2];
-
-            for (int i = 0; i < data.Length; i++)
-            {
-                int value = data[i];
-                hex[i * 2 + 0] = HexEncode(value >> 4);
-                hex[i * 2 + 1] = HexEncode(value & 0x0F);
-            }
-            return new string(hex);
-        }
-
-        static char HexEncode(int i) {
-            return i < 10 ? (char)(i + '0') : (char)((i - 10) + 'a');
-        }
-        
         public static void SetBackgroundMode(Thread thread) {
             // Throws an exception when called on a dead thread,
             //  which can very rarely happen