Replaced System.Drawing with SkiaSharp

kolya5544 · Jan 27, 2023 · 9c282b4 · 9c282b4
1 parent 1373d81
commit 9c282b4
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 16 deletions.
diff --git a/ClassHelper.cs b/ClassHelper.cs
@@ -1,4 +1,5 @@
-using System;
+using SkiaSharp;
+using System;
 using System.Collections.Generic;
 using System.Drawing;
 using System.IO;
@@ -242,7 +243,7 @@ public class TradingCard
         public long ID;
         public CardCategory Category;
         private string _FlagURL;
-        private Bitmap BMPFlag;
+        private SKBitmap BMPFlag;
         public string FlagURL
         {
             get {
@@ -271,7 +272,7 @@ public string FlagURL
                 }
             }
         }
-        public Bitmap Flag { get { if (BMPFlag is null) { BMPFlag = Utilities.GetPicture(FlagURL); return BMPFlag; } return BMPFlag; } }
+        public SKBitmap Flag { get { if (BMPFlag is null) { BMPFlag = Utilities.GetPicture(FlagURL); return BMPFlag; } return BMPFlag; } }
         public string Govt;
         public double MarketValue;
         public List<Market> Markets;
@@ -383,13 +384,13 @@ public class Embassy
     public class PublicRegionInfo
     {
         [Obsolete("Use .Flag property instead")]
-        public Bitmap GetFlag()
+        public SKBitmap GetFlag()
         {
             return Utilities.GetPicture(FlagURL);
         }
 
-        public Bitmap _Flag;
-        public Bitmap Flag { get { if (_Flag is null) { _Flag = GetFlag(); } return _Flag; } }
+        public SKBitmap _Flag;
+        public SKBitmap Flag { get { if (_Flag is null) { _Flag = GetFlag(); } return _Flag; } }
 
         public string Name;
         public string Factbook;
@@ -410,13 +411,13 @@ public Bitmap GetFlag()
     public class PublicNationInfo
     {
         [Obsolete("Use .Flag property instead")]
-        public Bitmap GetFlag()
+        public SKBitmap GetFlag()
         {
             return Utilities.GetPicture(FlagURL);
         }
 
-        public Bitmap _Flag;
-        public Bitmap Flag { get { if (_Flag is null) { _Flag = GetFlag(); } return _Flag; } }
+        public SKBitmap _Flag;
+        public SKBitmap Flag { get { if (_Flag is null) { _Flag = GetFlag(); } return _Flag; } }
 
         public string Name;
         public string Type;

diff --git a/Utilities.cs b/Utilities.cs
@@ -1,4 +1,5 @@
 using dotNS.Classes;
+using SkiaSharp;
 using System;
 using System.Collections.Generic;
 using System.Collections.Specialized;
@@ -78,11 +79,11 @@ public static XmlNodeList TakeNodes(this XmlNodeList nodes, string path, int dep
             return null;
         }
 
-        public static Bitmap GetPicture(string url)
+        public static SKBitmap GetPicture(string url)
         {
             WebClient web = new WebClient();
             byte[] data = web.DownloadData(url);
-            Bitmap bmp = new Bitmap(new MemoryStream(data));
+            SKBitmap bmp = SKBitmap.Decode(data);
             return bmp;
         }
 

diff --git a/dotNS.csproj b/dotNS.csproj
@@ -13,15 +13,11 @@
     <RepositoryUrl>https://github.com/kolya5544/dotNS</RepositoryUrl>
     <RepositoryType>public</RepositoryType>
     <PackageTags>nationstates, rest, xml, api, library</PackageTags>
-    <Version>0.4.1</Version>
+    <Version>0.5.0</Version>
     <AssemblyVersion>0.4.0.0</AssemblyVersion>
     <FileVersion>0.4.0.0</FileVersion>
   </PropertyGroup>
 
-  <ItemGroup>
-    <PackageReference Include="System.Drawing.Common" Version="5.0.2" />
-  </ItemGroup>
-
   <ItemGroup>
     <None Include="..\..\..\Desktop\favicon.png">
       <Pack>True</Pack>
@@ -33,4 +29,10 @@
     </None>
   </ItemGroup>
 
+  <ItemGroup>
+    <PackageReference Include="SkiaSharp" Version="2.88.3" />
+    <PackageReference Include="SkiaSharp.NativeAssets.Linux" Version="2.88.3" />
+    <PackageReference Include="SkiaSharp.NativeAssets.Win32" Version="2.88.3" />
+  </ItemGroup>
+
 </Project>