chore: remove dependency on System.Drawing

dmako · dmako · commit 02b2cd5dcb70 · 2025-07-09T01:03:07.000+02:00
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -10,7 +10,6 @@
         <EmbeddedResourceUseDependentUponConvention>true</EmbeddedResourceUseDependentUponConvention>
         <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
         <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
-        <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
     </PropertyGroup>
     <PropertyGroup>
         <Version>0.99.3-preview.4</Version>
diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -1,13 +1,15 @@
 <Project>
   <ItemGroup>
+    <PackageVersion Include="MessagePack" Version="2.5.198" />
     <PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="8.0.1" />
     <PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.2" />
+    <PackageVersion Include="Microsoft.NETCore.Platforms" Version="7.0.4" />
     <PackageVersion Include="Microsoft.VisualStudio.DebuggerVisualizers" Version="17.6.1032901" />
     <PackageVersion Include="Microsoft.VisualStudio.Extensibility.Sdk" Version="17.12.40390" />
     <PackageVersion Include="Microsoft.VisualStudio.Extensibility.Build" Version="17.12.40390" />
+    <PackageVersion Include="Microsoft.VisualStudio.Imaging.Interop.14.0.DesignTime" Version="17.12.40390" />
     <PackageVersion Include="OpenCvSharp4" Version="4.11.0.20250507" />
     <PackageVersion Include="OpenCvSharp4.Windows" Version="4.11.0.20250507" />
     <PackageVersion Include="Microsoft.SourceLink.GitHub" Version="8.0.0" />
-    <PackageVersion Include="System.Drawing.Common" Version="8.0.18" />
   </ItemGroup>
-</Project>
+</Project>
diff --git a/OpenCvSharpVisualizer/HttpImageProvider.cs b/OpenCvSharpVisualizer/HttpImageProvider.cs
@@ -1,6 +1,4 @@
-﻿using System.Drawing;
-using System.Drawing.Imaging;
-using System.Net;
+﻿using System.Net;
 
 namespace OpenCvSharpVisualizer;
 
@@ -60,23 +58,14 @@ private void ProcessRequest(HttpListenerContext listenerContext)
                 lock (_imageDataLock)
                 {
                     response.OutputStream.Write(_imageData, 0, _imageData.Length);
+                    response.Close();
                 }
             }
             else
             {
-                using var bmpImage = new Bitmap(128, 128);
-                var g = Graphics.FromImage(bmpImage);
-                g.Clear(Color.Transparent);
-                using var font = new Font("Arial", 20);
-                var stringSize = g.MeasureString("?", font);
-                var titleLocation = new PointF((bmpImage.Width - stringSize.Width) / 2.0f, (bmpImage.Height - stringSize.Height) / 2.0f);
-                g.DrawString("?", font, Brushes.LightGray, titleLocation);
-
-                using var memStream = new MemoryStream();
-                bmpImage.Save(memStream, ImageFormat.Png);
-                memStream.WriteTo(response.OutputStream);
+                response.StatusCode = 404;
+                response.Close();
             }
-            response.Close();
         }
         else
         {
diff --git a/OpenCvSharpVisualizer/OpenCvSharpVisualizer.csproj b/OpenCvSharpVisualizer/OpenCvSharpVisualizer.csproj
@@ -8,6 +8,8 @@
         <RepositoryType>git</RepositoryType>
         <MinimumVisualStudioVersion>17.12.0</MinimumVisualStudioVersion>
         <ApplicationIcon>icon\opencvsharpvis.ico</ApplicationIcon>
+        <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
+        <UseWPF>true</UseWPF>
     </PropertyGroup>
 
     <ItemGroup>
@@ -71,12 +73,14 @@
     </ItemGroup>
 
     <ItemGroup>
+        <PackageReference Include="MessagePack" />
         <PackageReference Include="Microsoft.Extensions.DependencyInjection" />
         <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" />
+        <PackageReference Include="Microsoft.NETCore.Platforms" />
         <PackageReference Include="Microsoft.VisualStudio.Extensibility.Sdk" />
         <PackageReference Include="Microsoft.VisualStudio.Extensibility.Build" />
+        <PackageReference Include="Microsoft.VisualStudio.Imaging.Interop.14.0.DesignTime" />
         <PackageReference Include="OpenCvSharp4.Windows" />
-        <PackageReference Include="System.Drawing.Common" />
     </ItemGroup>
 
 </Project>
diff --git a/OpenCvSharpVisualizer/OpenCvSharpVisualizerProvider.cs b/OpenCvSharpVisualizer/OpenCvSharpVisualizerProvider.cs
@@ -24,7 +24,7 @@ public OpenCvSharpVisualizerProvider(OpenCvSharpVisualizerExtension extension, V
             VisualizerObjectSourceType = new(typeof(DebuggeeSide.OpenCvSharpVisualizerSource)),
             Style = VisualizerStyle.ToolWindow
         };
-    
+
     /// <inheritdoc/>
     public override async Task<IRemoteUserControl> CreateVisualizerAsync(VisualizerTarget visualizerTarget, CancellationToken cancellationToken)
         => await Task.FromResult(new OpenCvSharpVisualizerControl(visualizerTarget, _httpImageProvider));
diff --git a/OpenCvSharpVisualizer/OpenInExternalViewerCommand.cs b/OpenCvSharpVisualizer/OpenInExternalViewerCommand.cs
@@ -1,4 +1,6 @@
-﻿using Microsoft.VisualStudio.Extensibility;
+﻿using System.IO;
+using System.Net.Http;
+using Microsoft.VisualStudio.Extensibility;
 using Microsoft.VisualStudio.Extensibility.UI;
 
 namespace OpenCvSharpVisualizer;

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,4 @@`
`1`		`-using System.Drawing;`
`2`		`-using System.Drawing.Imaging;`
`3`		`-using System.Net;`
	`1`	`+using System.Net;`
`4`	`2`
`5`	`3`	`namespace OpenCvSharpVisualizer;`
`6`	`4`
`@@ -60,23 +58,14 @@ private void ProcessRequest(HttpListenerContext listenerContext)`
`60`	`58`	`lock (_imageDataLock)`
`61`	`59`	`{`
`62`	`60`	`response.OutputStream.Write(_imageData, 0, _imageData.Length);`
	`61`	`+ response.Close();`
`63`	`62`	`}`
`64`	`63`	`}`
`65`	`64`	`else`
`66`	`65`	`{`
`67`		`- using var bmpImage = new Bitmap(128, 128);`
`68`		`- var g = Graphics.FromImage(bmpImage);`
`69`		`- g.Clear(Color.Transparent);`
`70`		`- using var font = new Font("Arial", 20);`
`71`		`- var stringSize = g.MeasureString("?", font);`
`72`		`- var titleLocation = new PointF((bmpImage.Width - stringSize.Width) / 2.0f, (bmpImage.Height - stringSize.Height) / 2.0f);`
`73`		`- g.DrawString("?", font, Brushes.LightGray, titleLocation);`
`74`		`-`
`75`		`- using var memStream = new MemoryStream();`
`76`		`- bmpImage.Save(memStream, ImageFormat.Png);`
`77`		`- memStream.WriteTo(response.OutputStream);`
	`66`	`+ response.StatusCode = 404;`
	`67`	`+ response.Close();`
`78`	`68`	`}`
`79`		`- response.Close();`
`80`	`69`	`}`
`81`	`70`	`else`
`82`	`71`	`{`