Merge branch 'Viosion-OpenCv' into master_complete

MvvmScaffoldFrame48.DLL/ImageAlgorithm/OpenCvImageAlgorihm.cs

@@ -0,0 +1,31 @@
+using OpenCvSharp;
+using System;
+using System.Collections.Generic;
+using System.Drawing;
+using System.Drawing.Imaging;
+using System.IO;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace MvvmScaffoldFrame48.DLL.ImageAlgorithm
+{
+    public static class OpenCvImageAlgorihm
+    {
+        /// <summary>
+        /// 将Bitmap转换为Mat(输出为彩色图)
+        /// 转换后的图像可以增加彩色框
+        /// </summary>
+        /// <param name="bitmap">源Bitmap</param>
+        /// <returns>对应的Mat对象</returns>
+        public static Mat BitmapToMat(Bitmap bitmap)
+        {
+            using (var ms = new MemoryStream())
+            {
+                bitmap.Save(ms, ImageFormat.Bmp);
+                ms.Position = 0;
+                return Mat.FromStream(ms, ImreadModes.Color);
+            }
+        }
+    }
+}

MvvmScaffoldFrame48.DLL/MvvmScaffoldFrame48.Dll.csproj

@@ -108,6 +108,7 @@
     <Compile Include="ImageAlgorithm\CPUDeepObjectDetectClass.cs" />
     <Compile Include="ImageAlgorithm\HikVisionAlgorithmRelated.cs" />
     <Compile Include="ImageAlgorithm\ImageAlgorithmTools.cs" />
+    <Compile Include="ImageAlgorithm\OpenCvImageAlgorihm.cs" />
     <Compile Include="LogTools\TxtLog.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="UserManager.cs" />
@@ -136,6 +137,12 @@
     <PackageReference Include="NModbus">
       <Version>3.0.81</Version>
     </PackageReference>
+    <PackageReference Include="OpenCvSharp4">
+      <Version>4.11.0.20250507</Version>
+    </PackageReference>
+    <PackageReference Include="OpenCvSharp4.Extensions">
+      <Version>4.11.0.20250507</Version>
+    </PackageReference>
     <PackageReference Include="SQLitePCLRaw.bundle_e_sqlite3">
       <Version>3.0.2</Version>
     </PackageReference>