update to 4.7

shimat · shimat · commit a6de6863f1fe · 2023-01-14T05:58:35.000+09:00
diff --git a/CameraOpenCV/CameraOpenCV.csproj b/CameraOpenCV/CameraOpenCV.csproj
@@ -188,13 +188,13 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform">
-      <Version>6.2.13</Version>
+      <Version>6.2.14</Version>
     </PackageReference>
     <PackageReference Include="OpenCvSharp4">
-      <Version>4.6.0.20220608</Version>
+      <Version>4.7.0.20230112</Version>
     </PackageReference>
     <PackageReference Include="OpenCvSharp4.runtime.uwp">
-      <Version>4.6.0.20220608</Version>
+      <Version>4.7.0.20230112</Version>
     </PackageReference>
   </ItemGroup>
   <ItemGroup />
diff --git a/CameraOpenCV/Properties/AssemblyInfo.cs b/CameraOpenCV/Properties/AssemblyInfo.cs
@@ -1,5 +1,4 @@
 using System.Reflection;
-using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
 // General Information about an assembly is controlled through the following 
diff --git a/SampleBase/Interfaces/ITestManager.cs b/SampleBase/Interfaces/ITestManager.cs
@@ -1,5 +1,4 @@
-﻿using System;
-using System.Collections.Generic;
+﻿using System.Collections.Generic;
 
 namespace SampleBase.Interfaces
 {
diff --git a/SampleBase/MyProcess.cs b/SampleBase/MyProcess.cs
@@ -1,8 +1,4 @@
-﻿using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Linq;
-using System.Text;
+﻿using System.Diagnostics;
 
 namespace SampleBase
 {
diff --git a/SamplesCore.Windows/ISample.cs b/SamplesCore.Windows/ISample.cs
@@ -1,9 +1,4 @@
-﻿using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-
-namespace SamplesCore.Windows
+﻿namespace SamplesCore.Windows
 {
     interface ISample
     {
diff --git a/SamplesCore.Windows/SamplesCore.Windows.csproj b/SamplesCore.Windows/SamplesCore.Windows.csproj
@@ -19,7 +19,7 @@
 
   <ItemGroup>
     <PackageReference Include="OpenCvSharp4.runtime.win" Version="4.6.0.20220608" />
-    <PackageReference Include="OpenCvSharp4.WpfExtensions" Version="4.6.0.20220608" />
+    <PackageReference Include="OpenCvSharp4.WpfExtensions" Version="4.7.0.20230112" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/SamplesCore/Properties/AssemblyInfo.cs b/SamplesCore/Properties/AssemblyInfo.cs
@@ -1,5 +1,4 @@
 ﻿using System.Reflection;
-using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
 // General Information about an assembly is controlled through the following
diff --git a/SamplesCore/Samples/ArucoSample.cs b/SamplesCore/Samples/ArucoSample.cs
@@ -18,7 +18,7 @@ public override void RunTest()
 
             using var src = Cv2.ImRead(ImagePath.Aruco);
 
-            var detectorParameters = DetectorParameters.Create();
+            var detectorParameters = new DetectorParameters();
             detectorParameters.CornerRefinementMethod = CornerRefineMethod.Subpix;
             detectorParameters.CornerRefinementWinSize = 9;
 
diff --git a/SamplesCore/Samples/CaffeSample.cs b/SamplesCore/Samples/CaffeSample.cs
@@ -1,8 +1,7 @@
 ﻿using System;
 using System.IO;
 using System.Linq;
-using System.Net;
-using System.Threading.Tasks;
+using System.Net.Http;
 using OpenCvSharp;
 using OpenCvSharp.Dnn;
 using SampleBase;
@@ -14,6 +13,8 @@ namespace SamplesCore
     /// </summary>
     class CaffeSample : ConsoleTestBase
     {
+        private static readonly HttpClient httpClient = new() { Timeout = TimeSpan.FromMinutes(10) };
+
         public override void RunTest()
         {
             const string protoTxt = @"Data\Text\bvlc_googlenet.prototxt";
@@ -47,9 +48,14 @@ public override void RunTest()
 
         private static byte[] DownloadBytes(string url)
         {
-            var client = WebRequest.CreateHttp(url);
-            using var response = client.GetResponseAsync().GetAwaiter().GetResult();
-            using var responseStream = response.GetResponseStream();
+            using var httpRequest = new HttpRequestMessage(HttpMethod.Get, url);
+#if NETFRAMEWORK
+            using var response = httpClient.SendAsync(httpRequest).Result.EnsureSuccessStatusCode();
+            using var responseStream = response.Content.ReadAsStreamAsync().Result;
+#else
+            using var response = httpClient.Send(httpRequest).EnsureSuccessStatusCode();
+            using var responseStream = response.Content.ReadAsStream();
+#endif
             using var memory = new MemoryStream();
             responseStream.CopyTo(memory);
             return memory.ToArray();
@@ -78,4 +84,4 @@ private static void GetMaxClass(Mat probBlob, out int classId, out double classP
             classId = classNumber.X;
         }
     }
-}
+}
diff --git a/SamplesCore/Samples/CameraCaptureSample.cs b/SamplesCore/Samples/CameraCaptureSample.cs
@@ -1,6 +1,4 @@
-﻿using System;
-using System.Threading.Tasks;
-using OpenCvSharp;
+﻿using OpenCvSharp;
 using SampleBase;
 
 namespace SamplesCore
diff --git a/SamplesCore/Samples/DFT.cs b/SamplesCore/Samples/DFT.cs
@@ -1,5 +1,4 @@
-﻿using System;
-using OpenCvSharp;
+﻿using OpenCvSharp;
 using SampleBase;
 
 namespace SamplesCore
diff --git a/SamplesCore/Samples/FaceDetectionDNN.cs b/SamplesCore/Samples/FaceDetectionDNN.cs
@@ -1,5 +1,4 @@
-﻿using System;
-using OpenCvSharp;
+﻿using OpenCvSharp;
 using OpenCvSharp.Dnn;
 using SampleBase;
 
diff --git a/SamplesCore/Samples/HistSample.cs b/SamplesCore/Samples/HistSample.cs
@@ -1,5 +1,4 @@
-﻿using System;
-using OpenCvSharp;
+﻿using OpenCvSharp;
 using SampleBase;
 
 namespace SamplesCore
diff --git a/SamplesCore/Samples/MDS.cs b/SamplesCore/Samples/MDS.cs
@@ -1,7 +1,4 @@
 ﻿using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 using OpenCvSharp;
 using SampleBase;
 
diff --git a/SamplesCore/Samples/MatOperations.cs b/SamplesCore/Samples/MatOperations.cs
@@ -1,5 +1,4 @@
 ﻿using System;
-using System.Threading.Tasks;
 using OpenCvSharp;
 using SampleBase;
 
diff --git a/SamplesCore/Samples/MorphologySample.cs b/SamplesCore/Samples/MorphologySample.cs
@@ -1,6 +1,5 @@
 ﻿using OpenCvSharp;
 using SampleBase;
-using System.Threading.Tasks;
 
 namespace SamplesCore
 {
diff --git a/SamplesCore/Samples/OpenVinoFaceDetection.cs b/SamplesCore/Samples/OpenVinoFaceDetection.cs
@@ -1,5 +1,4 @@
-﻿using System.Collections.Generic;
-using OpenCvSharp;
+﻿using OpenCvSharp;
 using OpenCvSharp.Dnn;
 using SampleBase;
 
diff --git a/SamplesCore/Samples/SolveEquation.cs b/SamplesCore/Samples/SolveEquation.cs
@@ -1,6 +1,5 @@
 ﻿using System;
 using System.Collections.Generic;
-using System.Linq;
 using OpenCvSharp;
 using SampleBase;
 
diff --git a/SamplesCore/Samples/SuperResolutionSample.cs b/SamplesCore/Samples/SuperResolutionSample.cs
@@ -1,6 +1,4 @@
 ﻿using System;
-using System.Collections.Generic;
-using System.Linq;
 using OpenCvSharp;
 using SampleBase;
 
diff --git a/SamplesCore/Samples/WatershedSample.cs b/SamplesCore/Samples/WatershedSample.cs
@@ -1,8 +1,4 @@
 ﻿using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Text;
 using OpenCvSharp;
 using SampleBase;
 
diff --git a/SamplesCore/SamplesCore.csproj b/SamplesCore/SamplesCore.csproj
@@ -27,7 +27,7 @@
   </ItemGroup>
     
   <ItemGroup>
-    <PackageReference Include="OpenCvSharp4.Extensions" Version="4.6.0.20220608" />
+    <PackageReference Include="OpenCvSharp4.Extensions" Version="4.7.0.20230112" />
     <PackageReference Include="OpenCvSharp4.runtime.win" Version="4.6.0.20220608" />
   </ItemGroup>
     
diff --git a/SamplesLegacy/Properties/AssemblyInfo.cs b/SamplesLegacy/Properties/AssemblyInfo.cs
@@ -1,5 +1,4 @@
 ﻿using System.Reflection;
-using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
 // アセンブリに関する一般情報は以下の属性セットをとおして制御されます。
diff --git a/SamplesLegacy/Samples/ArucoSample.cs b/SamplesLegacy/Samples/ArucoSample.cs
@@ -18,7 +18,7 @@ public override void RunTest()
 
             using var src = Cv2.ImRead(ImagePath.Aruco);
 
-            var detectorParameters = DetectorParameters.Create();
+            var detectorParameters = new DetectorParameters();
             detectorParameters.CornerRefinementMethod = CornerRefineMethod.Subpix;
             detectorParameters.CornerRefinementWinSize = 9;
 
diff --git a/SamplesLegacy/Samples/CaffeSample.cs b/SamplesLegacy/Samples/CaffeSample.cs
@@ -2,7 +2,6 @@
 using System.IO;
 using System.Linq;
 using System.Net;
-using System.Threading.Tasks;
 using OpenCvSharp;
 using OpenCvSharp.Dnn;
 using SampleBase;
diff --git a/SamplesLegacy/Samples/CameraCaptureSample.cs b/SamplesLegacy/Samples/CameraCaptureSample.cs
@@ -1,6 +1,4 @@
-﻿using System;
-using System.Threading.Tasks;
-using OpenCvSharp;
+﻿using OpenCvSharp;
 using SampleBase;
 
 namespace SamplesLegacy
diff --git a/SamplesLegacy/Samples/DFT.cs b/SamplesLegacy/Samples/DFT.cs
@@ -1,5 +1,4 @@
-﻿using System;
-using OpenCvSharp;
+﻿using OpenCvSharp;
 using SampleBase;
 
 namespace SamplesLegacy
diff --git a/SamplesLegacy/Samples/FaceDetectionDNN.cs b/SamplesLegacy/Samples/FaceDetectionDNN.cs
@@ -1,5 +1,4 @@
-﻿using System;
-using OpenCvSharp;
+﻿using OpenCvSharp;
 using OpenCvSharp.Dnn;
 using SampleBase;
 
diff --git a/SamplesLegacy/Samples/HistSample.cs b/SamplesLegacy/Samples/HistSample.cs
@@ -1,5 +1,4 @@
-﻿using System;
-using OpenCvSharp;
+﻿using OpenCvSharp;
 using SampleBase;
 
 namespace SamplesLegacy
diff --git a/SamplesLegacy/Samples/MDS.cs b/SamplesLegacy/Samples/MDS.cs
@@ -1,7 +1,4 @@
 ﻿using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
 using OpenCvSharp;
 using SampleBase;
 
diff --git a/SamplesLegacy/Samples/MatOperations.cs b/SamplesLegacy/Samples/MatOperations.cs
@@ -1,5 +1,4 @@
 ﻿using System;
-using System.Threading.Tasks;
 using OpenCvSharp;
 using SampleBase;
 
diff --git a/SamplesLegacy/Samples/MorphologySample.cs b/SamplesLegacy/Samples/MorphologySample.cs
@@ -1,6 +1,5 @@
 ﻿using OpenCvSharp;
 using SampleBase;
-using System.Threading.Tasks;
 
 namespace SamplesLegacy
 {
diff --git a/SamplesLegacy/Samples/OpenVinoFaceDetection.cs b/SamplesLegacy/Samples/OpenVinoFaceDetection.cs
@@ -1,5 +1,4 @@
-﻿using System.Collections.Generic;
-using OpenCvSharp;
+﻿using OpenCvSharp;
 using OpenCvSharp.Dnn;
 using SampleBase;
 
diff --git a/SamplesLegacy/Samples/SolveEquation.cs b/SamplesLegacy/Samples/SolveEquation.cs
@@ -1,6 +1,5 @@
 ﻿using System;
 using System.Collections.Generic;
-using System.Linq;
 using OpenCvSharp;
 using SampleBase;
 
diff --git a/SamplesLegacy/Samples/SuperResolutionSample.cs b/SamplesLegacy/Samples/SuperResolutionSample.cs
@@ -1,6 +1,4 @@
 ﻿using System;
-using System.Collections.Generic;
-using System.Linq;
 using OpenCvSharp;
 using SampleBase;
 
diff --git a/SamplesLegacy/Samples/WatershedSample.cs b/SamplesLegacy/Samples/WatershedSample.cs
@@ -1,8 +1,4 @@
 ﻿using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Text;
 using OpenCvSharp;
 using SampleBase;
 
diff --git a/SamplesLegacy/SamplesLegacy.csproj b/SamplesLegacy/SamplesLegacy.csproj
@@ -38,7 +38,7 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="OpenCvSharp, Version=1.0.0.0, Culture=neutral, PublicKeyToken=6adad1e807fea099, processorArchitecture=MSIL">
-      <HintPath>..\packages\OpenCvSharp4.4.6.0.20220608\lib\net48\OpenCvSharp.dll</HintPath>
+      <HintPath>..\packages\OpenCvSharp4.4.7.0.20230112\lib\net48\OpenCvSharp.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Buffers, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
diff --git a/SamplesLegacy/packages.config b/SamplesLegacy/packages.config
@@ -1,6 +1,6 @@
 ﻿<?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="OpenCvSharp4" version="4.6.0.20220608" targetFramework="net48" />
+  <package id="OpenCvSharp4" version="4.7.0.20230112" targetFramework="net48" />
   <package id="OpenCvSharp4.runtime.win" version="4.6.0.20220608" targetFramework="net48" />
   <package id="System.Buffers" version="4.5.1" targetFramework="net48" />
   <package id="System.Memory" version="4.5.4" targetFramework="net48" />
diff --git a/SamplesVB/SamplesVB.vbproj b/SamplesVB/SamplesVB.vbproj
@@ -7,7 +7,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="OpenCvSharp4" Version="4.6.0.20220608" />
+    <PackageReference Include="OpenCvSharp4" Version="4.7.0.20230112" />
     <PackageReference Include="OpenCvSharp4.runtime.win" Version="4.6.0.20220608" />
   </ItemGroup>
 
diff --git a/VideoCaptureForm/Program.cs b/VideoCaptureForm/Program.cs
@@ -1,7 +1,4 @@
 ﻿using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
 using System.Windows.Forms;
 
 namespace VideoCaptureForm
diff --git a/VideoCaptureForm/Properties/AssemblyInfo.cs b/VideoCaptureForm/Properties/AssemblyInfo.cs
@@ -1,5 +1,4 @@
 ﻿using System.Reflection;
-using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
 // アセンブリに関する一般情報は以下の属性セットをとおして制御されます。
diff --git a/VideoCaptureForm/VideoCaptureForm.cs b/VideoCaptureForm/VideoCaptureForm.cs
@@ -1,12 +1,7 @@
 ﻿using System;
-using System.Collections.Generic;
 using System.ComponentModel;
-using System.Data;
 using System.Drawing;
-using System.Linq;
-using System.Text;
 using System.Threading;
-using System.Threading.Tasks;
 using System.Windows.Forms;
 using OpenCvSharp;
 using OpenCvSharp.Extensions;
diff --git a/VideoCaptureForm/VideoCaptureForm.csproj b/VideoCaptureForm/VideoCaptureForm.csproj
@@ -38,10 +38,10 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="OpenCvSharp, Version=1.0.0.0, Culture=neutral, PublicKeyToken=6adad1e807fea099, processorArchitecture=MSIL">
-      <HintPath>..\packages\OpenCvSharp4.4.6.0.20220608\lib\net48\OpenCvSharp.dll</HintPath>
+      <HintPath>..\packages\OpenCvSharp4.4.7.0.20230112\lib\net48\OpenCvSharp.dll</HintPath>
     </Reference>
     <Reference Include="OpenCvSharp.Extensions, Version=1.0.0.0, Culture=neutral, PublicKeyToken=6adad1e807fea099, processorArchitecture=MSIL">
-      <HintPath>..\packages\OpenCvSharp4.Extensions.4.6.0.20220608\lib\net48\OpenCvSharp.Extensions.dll</HintPath>
+      <HintPath>..\packages\OpenCvSharp4.Extensions.4.7.0.20230112\lib\net48\OpenCvSharp.Extensions.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Buffers, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
diff --git a/VideoCaptureForm/packages.config b/VideoCaptureForm/packages.config
@@ -1,7 +1,7 @@
 ﻿<?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="OpenCvSharp4" version="4.6.0.20220608" targetFramework="net48" />
-  <package id="OpenCvSharp4.Extensions" version="4.6.0.20220608" targetFramework="net48" />
+  <package id="OpenCvSharp4" version="4.7.0.20230112" targetFramework="net48" />
+  <package id="OpenCvSharp4.Extensions" version="4.7.0.20230112" targetFramework="net48" />
   <package id="OpenCvSharp4.runtime.win" version="4.6.0.20220608" targetFramework="net48" />
   <package id="System.Buffers" version="4.5.1" targetFramework="net472" />
   <package id="System.Drawing.Common" version="5.0.3" targetFramework="net472" />
diff --git a/VideoCaptureWPF/App.xaml.cs b/VideoCaptureWPF/App.xaml.cs
@@ -1,10 +1,4 @@
-﻿using System;
-using System.Collections.Generic;
-using System.Configuration;
-using System.Data;
-using System.Linq;
-using System.Threading.Tasks;
-using System.Windows;
+﻿using System.Windows;
 
 namespace VideoCaptureWPF
 {
diff --git a/VideoCaptureWPF/VideoCaptureWPF.csproj b/VideoCaptureWPF/VideoCaptureWPF.csproj

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`using System.Reflection;`
`2`		`-using System.Runtime.CompilerServices;`
`3`	`2`	`using System.Runtime.InteropServices;`
`4`	`3`
`5`	`4`	`// General Information about an assembly is controlled through the following`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`		`-using System;`
`2`		`-using System.Collections.Generic;`
	`1`	`+using System.Collections.Generic;`
`3`	`2`
`4`	`3`	`namespace SampleBase.Interfaces`
`5`	`4`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,4 @@`
`1`		`-using System;`
`2`		`-using System.Collections.Generic;`
`3`		`-using System.Diagnostics;`
`4`		`-using System.Linq;`
`5`		`-using System.Text;`
	`1`	`+using System.Diagnostics;`
`6`	`2`
`7`	`3`	`namespace SampleBase`
`8`	`4`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,9 +1,4 @@`
`1`		`-using System;`
`2`		`-using System.Collections.Generic;`
`3`		`-using System.Linq;`
`4`		`-using System.Text;`
`5`		`-`
`6`		`-namespace SamplesCore.Windows`
	`1`	`+namespace SamplesCore.Windows`
`7`	`2`	`{`
`8`	`3`	`interface ISample`
`9`	`4`	`{`