From 44e1c48103d28fbf213b4e29299a89fbe5debf29 Mon Sep 17 00:00:00 2001
From: Mathias Lui <mathias-lui@freenet.de>
Date: Sat, 19 Nov 2022 15:56:18 +0100
Subject: [PATCH] Remove Pfim references

* Only remove Pfim temporarily, thus commented out
---
 DamageCalculator/DamageCalculator.sln         |  6 -----
 .../SteamShared/SteamShared/CsgoHelper.cs     | 27 ++++++++++---------
 .../SteamShared/SteamShared.csproj            |  3 ---
 3 files changed, 14 insertions(+), 22 deletions(-)

diff --git a/DamageCalculator/DamageCalculator.sln b/DamageCalculator/DamageCalculator.sln
index 690f4d6..506acbb 100644
--- a/DamageCalculator/DamageCalculator.sln
+++ b/DamageCalculator/DamageCalculator.sln
@@ -7,8 +7,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DamageCalculator", "DamageC
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SteamShared", "..\SteamShared\SteamShared\SteamShared\SteamShared.csproj", "{3632D445-DC7D-43FC-AC66-8503F50FCA2A}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Pfim", "..\SteamShared\Pfim\src\Pfim\Pfim.csproj", "{0EA4ECBB-6036-4936-8ABC-3F8AC154AB93}"
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -23,10 +21,6 @@ Global
 		{3632D445-DC7D-43FC-AC66-8503F50FCA2A}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{3632D445-DC7D-43FC-AC66-8503F50FCA2A}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{3632D445-DC7D-43FC-AC66-8503F50FCA2A}.Release|Any CPU.Build.0 = Release|Any CPU
-		{0EA4ECBB-6036-4936-8ABC-3F8AC154AB93}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{0EA4ECBB-6036-4936-8ABC-3F8AC154AB93}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{0EA4ECBB-6036-4936-8ABC-3F8AC154AB93}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{0EA4ECBB-6036-4936-8ABC-3F8AC154AB93}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/SteamShared/SteamShared/SteamShared/CsgoHelper.cs b/SteamShared/SteamShared/SteamShared/CsgoHelper.cs
index 2de26e0..c2ae908 100644
--- a/SteamShared/SteamShared/SteamShared/CsgoHelper.cs
+++ b/SteamShared/SteamShared/SteamShared/CsgoHelper.cs
@@ -205,22 +205,23 @@ namespace SteamShared
                 try
                 {
                     // Read actual radar
-                    //image = new DDSImage(System.IO.File.ReadAllBytes(map.MapImagePath!));
+                    image = new DDSImage(System.IO.File.ReadAllBytes(map.MapImagePath!));
 
-                    using (var pfimImage = Pfim.Pfim.FromFile(map.MapImagePath))
-                    {
-                        // TODO: Do we need to support more pixel formats?
-                        System.Drawing.Imaging.PixelFormat format = System.Drawing.Imaging.PixelFormat.Format24bppRgb;
+                    // If this is still commented out after ages, I'm sorry @FutureMe
+                    //using (var pfimImage = Pfim.Pfim.FromFile(map.MapImagePath))
+                    //{
+                    //    // TODO: Do we need to support more pixel formats?
+                    //    System.Drawing.Imaging.PixelFormat format = System.Drawing.Imaging.PixelFormat.Format24bppRgb;
 
-                        if(pfimImage.Format == Pfim.ImageFormat.Rgba32)
-                        {
-                            format = System.Drawing.Imaging.PixelFormat.Format32bppArgb;
-                        }
+                    //    if (pfimImage.Format == Pfim.ImageFormat.Rgba32)
+                    //    {
+                    //        format = System.Drawing.Imaging.PixelFormat.Format32bppArgb;
+                    //    }
 
-                        // Maybe pin it so GC doesn't collect it, for now just ignore it
-                        var data = System.Runtime.InteropServices.Marshal.UnsafeAddrOfPinnedArrayElement(pfimImage.Data, 0);
-                        image = new System.Drawing.Bitmap(pfimImage.Width, pfimImage.Height, pfimImage.Stride, format, data);
-                    }
+                    //    // Maybe pin it so GC doesn't collect it, for now just ignore it
+                    //    var data = System.Runtime.InteropServices.Marshal.UnsafeAddrOfPinnedArrayElement(pfimImage.Data, 0);
+                    //    image = new System.Drawing.Bitmap(pfimImage.Width, pfimImage.Height, pfimImage.Stride, format, data);
+                    //}
 
                 }
                 catch
diff --git a/SteamShared/SteamShared/SteamShared/SteamShared.csproj b/SteamShared/SteamShared/SteamShared/SteamShared.csproj
index 2de5397..7ddbd8c 100644
--- a/SteamShared/SteamShared/SteamShared/SteamShared.csproj
+++ b/SteamShared/SteamShared/SteamShared/SteamShared.csproj
@@ -29,9 +29,6 @@
   <ItemGroup>
     <PackageReference Include="System.Drawing.Common" Version="6.0.0" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\Pfim\src\Pfim\Pfim.csproj" />
-  </ItemGroup>
   <ItemGroup>
     <None Update="SourceConfig\test_source.cfg">
       <CopyToOutputDirectory>Never</CopyToOutputDirectory>