Merge pull request #1367 from shimat/cs10

C#10 & suppress warnings

src/OpenCvSharp.Extensions/OpenCvSharp.Extensions.csproj

@@ -12,7 +12,7 @@
     <GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
     <GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
     <GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
-    <LangVersion>9</LangVersion>
+    <LangVersion>10</LangVersion>
     <Nullable>enable</Nullable>
     <PublishRepositoryUrl>true</PublishRepositoryUrl>
     <IncludeSymbols>true</IncludeSymbols>

src/OpenCvSharp.WpfExtensions/OpenCvSharp.WpfExtensions.csproj

@@ -5,7 +5,7 @@
   <PropertyGroup>
     <TargetFrameworks>net48;netcoreapp3.1;net6.0-windows</TargetFrameworks>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <LangVersion>9</LangVersion>
+    <LangVersion>10</LangVersion>
     <Nullable>enable</Nullable>
     <RepositoryUrl>https://github.com/shimat/opencvsharp.git</RepositoryUrl>
     <RepositoryType>git</RepositoryType>

src/OpenCvSharp/Cv2/Cv2_imgcodecs.cs

@@ -75,6 +75,8 @@ public static bool ImWrite(string fileName, Mat img, int[]? prms = null)
         /// <returns></returns>
         public static bool ImWrite(string fileName, Mat img, params ImageEncodingParam[] prms)
         {
+            if (prms is null)
+                throw new ArgumentNullException(nameof(prms));
             if (prms.Length <= 0) 
                 return ImWrite(fileName, img);
 
@@ -118,6 +120,8 @@ public static bool ImWrite(string fileName, IEnumerable<Mat> img, int[]? prms =
         /// <returns></returns>
         public static bool ImWrite(string fileName, IEnumerable<Mat> img, params ImageEncodingParam[] prms)
         {
+            if (prms is null)
+                throw new ArgumentNullException(nameof(prms));
             if (prms.Length <= 0)
                 return ImWrite(fileName, img);
 
@@ -237,6 +241,8 @@ public static bool ImEncode(string ext, InputArray img, out byte[] buf, int[]? p
         /// <param name="prms">Format-specific parameters.</param>
         public static void ImEncode(string ext, InputArray img, out byte[] buf, params ImageEncodingParam[] prms)
         {
+            if (prms is null)
+                throw new ArgumentNullException(nameof(prms));
             var p = new List<int>();
             foreach (var item in prms)
             {

src/OpenCvSharp/Internal/PInvoke/NativeMethods/NativeMethods.cs

@@ -212,10 +212,11 @@ public static bool IsMono()
         /// <returns></returns>
         public static bool IsWasm()
         {
-            #if NET6_0
+#if NET6_0
             return RuntimeInformation.OSArchitecture == Architecture.Wasm;
-            #endif
+#else
             return false;
+#endif
         }
 
         /// <summary>

src/OpenCvSharp/Internal/PInvoke/NativeMethods/NativeMethods_dnn_superres.cs

@@ -4,6 +4,7 @@
 
 #pragma warning disable 1591
 #pragma warning disable CA1401 // P/Invokes should not be visible
+#pragma warning disable CA2101 // Specify marshaling for P/Invoke string arguments
 #pragma warning disable IDE1006 // Naming style
 
 namespace OpenCvSharp.Internal

src/OpenCvSharp/Internal/PInvoke/NativeMethods/NativeMethods_flann.cs

@@ -5,6 +5,7 @@
 
 #pragma warning disable 1591
 #pragma warning disable CA1401 // P/Invokes should not be visible
+#pragma warning disable CA2101 // Specify marshaling for P/Invoke string arguments
 #pragma warning disable IDE1006 // Naming style
 
 namespace OpenCvSharp.Internal

src/OpenCvSharp/Internal/PInvoke/NativeMethods/NativeMethods_highgui.cs

@@ -4,6 +4,7 @@
 
 #pragma warning disable 1591
 #pragma warning disable CA1401 // P/Invokes should not be visible
+#pragma warning disable CA2101 // Specify marshaling for P/Invoke string arguments
 #pragma warning disable IDE1006 // Naming style
 
 namespace OpenCvSharp.Internal

src/OpenCvSharp/Internal/PInvoke/NativeMethods/NativeMethods_imgcodecs.cs

@@ -3,6 +3,7 @@
 using System.Runtime.InteropServices;
 
 #pragma warning disable 1591
+#pragma warning disable CA2101 // Specify marshaling for P/Invoke string arguments
 
 namespace OpenCvSharp.Internal
 {

src/OpenCvSharp/Internal/PInvoke/NativeMethods/NativeMethods_quality.cs

@@ -4,6 +4,7 @@
 
 #pragma warning disable 1591
 #pragma warning disable CA1401 // P/Invokes should not be visible
+#pragma warning disable CA2101 // Specify marshaling for P/Invoke string arguments
 #pragma warning disable IDE1006 // Naming style
 
 namespace OpenCvSharp.Internal

src/OpenCvSharp/Internal/PInvoke/NativeMethods/NativeMethods_videoio.cs

@@ -4,6 +4,7 @@
 
 #pragma warning disable 1591
 #pragma warning disable CA1401 // P/Invokes should not be visible
+#pragma warning disable CA2101 // Specify marshaling for P/Invoke string arguments
 #pragma warning disable IDE1006 // Naming style
 
 namespace OpenCvSharp.Internal

src/OpenCvSharp/Internal/PInvoke/NativeMethods/NativeMethods_xphoto.cs

@@ -5,6 +5,7 @@
 #pragma warning disable 1591
 #pragma warning disable CA1401 // P/Invokes should not be visible
 #pragma warning disable CA1707 // Underscore
+#pragma warning disable CA2101 // Specify marshaling for P/Invoke string arguments
 #pragma warning disable IDE1006 // Naming style
 
 namespace OpenCvSharp.Internal

src/OpenCvSharp/Internal/PInvoke/NativeMethods/core/NativeMethods_core.cs

@@ -5,6 +5,7 @@
 
 #pragma warning disable 1591
 #pragma warning disable CA1401 // P/Invokes should not be visible
+#pragma warning disable CA2101 // Specify marshaling for P/Invoke string arguments
 #pragma warning disable IDE1006 // Naming style
 
 namespace OpenCvSharp.Internal

src/OpenCvSharp/Internal/PInvoke/NativeMethods/core/NativeMethods_core_Algorithm.cs

@@ -4,6 +4,7 @@
 
 #pragma warning disable 1591
 #pragma warning disable CA1401 // P/Invokes should not be visible
+#pragma warning disable CA2101 // Specify marshaling for P/Invoke string arguments
 
 namespace OpenCvSharp.Internal
 {

src/OpenCvSharp/Internal/PInvoke/NativeMethods/core/NativeMethods_core_Classes.cs

@@ -5,6 +5,7 @@
 #pragma warning disable 1591
 #pragma warning disable CA1401 // P/Invokes should not be visible
 #pragma warning disable CA1720 // Identifiers should not contain type names
+#pragma warning disable CA2101 // Specify marshaling for P/Invoke string arguments
 #pragma warning disable IDE1006 // Naming style
 
 namespace OpenCvSharp.Internal

src/OpenCvSharp/Internal/PInvoke/NativeMethods/core/NativeMethods_core_FileNode.cs

@@ -5,6 +5,7 @@
 #pragma warning disable 1591
 #pragma warning disable CA1401 // P/Invokes should not be visible
 #pragma warning disable CA1720 // Identifiers should not contain type names
+#pragma warning disable CA2101 // Specify marshaling for P/Invoke string arguments
 
 namespace OpenCvSharp.Internal
 {

src/OpenCvSharp/Internal/PInvoke/NativeMethods/core/NativeMethods_core_FileNodeIterator.cs

@@ -4,6 +4,7 @@
 
 #pragma warning disable 1591
 #pragma warning disable CA1401 // P/Invokes should not be visible
+#pragma warning disable CA2101 // Specify marshaling for P/Invoke string arguments
 #pragma warning disable IDE1006 // Naming style
 
 namespace OpenCvSharp.Internal

src/OpenCvSharp/Internal/PInvoke/NativeMethods/core/NativeMethods_core_FileStorage.cs

@@ -5,6 +5,7 @@
 #pragma warning disable 1591
 #pragma warning disable CA1401 // P/Invokes should not be visible
 #pragma warning disable CA1720 // Identifiers should not contain type names
+#pragma warning disable CA2101 // Specify marshaling for P/Invoke string arguments
 #pragma warning disable IDE1006 // Naming style
 
 namespace OpenCvSharp.Internal

src/OpenCvSharp/Internal/PInvoke/NativeMethods/dnn/NativeMethods_dnn.cs

@@ -4,6 +4,7 @@
 
 #pragma warning disable 1591
 #pragma warning disable CA1401 // P/Invokes should not be visible
+#pragma warning disable CA2101 // Specify marshaling for P/Invoke string arguments
 #pragma warning disable IDE1006 // Naming style
 
 namespace OpenCvSharp.Internal

src/OpenCvSharp/Internal/PInvoke/NativeMethods/dnn/NativeMethods_dnn_Net.cs

@@ -4,6 +4,7 @@
 
 #pragma warning disable 1591
 #pragma warning disable CA1401 // P/Invokes should not be visible
+#pragma warning disable CA2101 // Specify marshaling for P/Invoke string arguments
 #pragma warning disable IDE1006 // Naming style
 
 namespace OpenCvSharp.Internal

src/OpenCvSharp/Internal/PInvoke/NativeMethods/face/NativeMethods_face_FaceRecognizer.cs

@@ -6,6 +6,7 @@
 #pragma warning disable 1591
 #pragma warning disable CA1401 // P/Invokes should not be visible
 #pragma warning disable CA1720 // Identifiers should not contain type names
+#pragma warning disable CA2101 // Specify marshaling for P/Invoke string arguments
 #pragma warning disable IDE1006 // Naming style
 
 namespace OpenCvSharp.Internal

src/OpenCvSharp/Internal/PInvoke/NativeMethods/face/NativeMethods_face_Facemark.cs

@@ -6,6 +6,7 @@
 #pragma warning disable 1591
 #pragma warning disable CA1401 // P/Invokes should not be visible
 #pragma warning disable CA1720 // Identifiers should not contain type names
+#pragma warning disable CA2101 // Specify marshaling for P/Invoke string arguments
 #pragma warning disable IDE1006 // Naming style
 
 namespace OpenCvSharp.Internal

src/OpenCvSharp/Internal/PInvoke/NativeMethods/features2d/NativeMethods_features2d_DescriptorMatcher.cs

@@ -5,6 +5,7 @@
 #pragma warning disable 1591
 #pragma warning disable CA1401 // P/Invokes should not be visible
 #pragma warning disable CA1720 // Identifiers should not contain type names
+#pragma warning disable CA2101 // Specify marshaling for P/Invoke string arguments
 #pragma warning disable IDE1006 // Naming style
 
 namespace OpenCvSharp.Internal

src/OpenCvSharp/Internal/PInvoke/NativeMethods/features2d/NativeMethods_features2d_Feature2D.cs

@@ -5,6 +5,7 @@
 #pragma warning disable 1591
 #pragma warning disable CA1401 // P/Invokes should not be visible
 #pragma warning disable CA1720 // Identifiers should not contain type names
+#pragma warning disable CA2101 // Specify marshaling for P/Invoke string arguments
 #pragma warning disable IDE1006 // Naming style
 
 namespace OpenCvSharp.Internal

src/OpenCvSharp/Internal/PInvoke/NativeMethods/imgproc/NativeMethods_imgproc.cs

@@ -6,6 +6,7 @@
 
 #pragma warning disable 1591
 #pragma warning disable CA1401 // P/Invokes should not be visible
+#pragma warning disable CA2101 // Specify marshaling for P/Invoke string arguments
 #pragma warning disable IDE1006 // Naming rules
 
 namespace OpenCvSharp.Internal

src/OpenCvSharp/Internal/PInvoke/NativeMethods/ml/NativeMethods_ml_ANN_MLP.cs

@@ -5,6 +5,7 @@
 #pragma warning disable 1591
 #pragma warning disable CA1401 // P/Invokes should not be visible
 #pragma warning disable CA1720 // Identifiers should not contain type names
+#pragma warning disable CA2101 // Specify marshaling for P/Invoke string arguments
 
 namespace OpenCvSharp.Internal
 {

src/OpenCvSharp/Internal/PInvoke/NativeMethods/ml/NativeMethods_ml_Boost.cs

@@ -4,6 +4,7 @@
 
 #pragma warning disable 1591
 #pragma warning disable CA1401 // P/Invokes should not be visible
+#pragma warning disable CA2101 // Specify marshaling for P/Invoke string arguments
 #pragma warning disable IDE1006 // Naming style
 
 namespace OpenCvSharp.Internal

src/OpenCvSharp/Internal/PInvoke/NativeMethods/ml/NativeMethods_ml_DTrees.cs

@@ -4,6 +4,7 @@
 
 #pragma warning disable 1591
 #pragma warning disable CA1401 // P/Invokes should not be visible
+#pragma warning disable CA2101 // Specify marshaling for P/Invoke string arguments
 #pragma warning disable IDE1006 // Naming style
 
 namespace OpenCvSharp.Internal

src/OpenCvSharp/Internal/PInvoke/NativeMethods/ml/NativeMethods_ml_EM.cs

@@ -5,6 +5,7 @@
 #pragma warning disable 1591
 #pragma warning disable CA1401 // P/Invokes should not be visible
 #pragma warning disable CA1720 // Identifiers should not contain type names
+#pragma warning disable CA2101 // Specify marshaling for P/Invoke string arguments
 #pragma warning disable IDE1006 // Naming style
 
 namespace OpenCvSharp.Internal

src/OpenCvSharp/Internal/PInvoke/NativeMethods/ml/NativeMethods_ml_KNearest.cs

@@ -4,6 +4,7 @@
 
 #pragma warning disable 1591
 #pragma warning disable CA1401 // P/Invokes should not be visible
+#pragma warning disable CA2101 // Specify marshaling for P/Invoke string arguments
 #pragma warning disable IDE1006 // Naming style
 
 namespace OpenCvSharp.Internal

src/OpenCvSharp/Internal/PInvoke/NativeMethods/ml/NativeMethods_ml_LogisticRegression.cs

@@ -4,6 +4,7 @@
 
 #pragma warning disable 1591
 #pragma warning disable CA1401 // P/Invokes should not be visible
+#pragma warning disable CA2101 // Specify marshaling for P/Invoke string arguments
 #pragma warning disable IDE1006 // Naming style
 
 namespace OpenCvSharp.Internal

src/OpenCvSharp/Internal/PInvoke/NativeMethods/ml/NativeMethods_ml_NormalBayesClassifier.cs

@@ -4,6 +4,7 @@
 
 #pragma warning disable 1591
 #pragma warning disable CA1401 // P/Invokes should not be visible
+#pragma warning disable CA2101 // Specify marshaling for P/Invoke string arguments
 #pragma warning disable IDE1006 // Naming style
 
 namespace OpenCvSharp.Internal

src/OpenCvSharp/Internal/PInvoke/NativeMethods/ml/NativeMethods_ml_RTrees.cs

@@ -4,6 +4,7 @@
 
 #pragma warning disable 1591
 #pragma warning disable CA1401 // P/Invokes should not be visible
+#pragma warning disable CA2101 // Specify marshaling for P/Invoke string arguments
 #pragma warning disable IDE1006 // Naming style
 
 namespace OpenCvSharp.Internal

src/OpenCvSharp/Internal/PInvoke/NativeMethods/ml/NativeMethods_ml_SVM.cs

@@ -5,6 +5,7 @@
 
 #pragma warning disable 1591
 #pragma warning disable CA1401 // P/Invokes should not be visible
+#pragma warning disable CA2101 // Specify marshaling for P/Invoke string arguments
 #pragma warning disable IDE1006 // Naming style
 
 namespace OpenCvSharp.Internal

src/OpenCvSharp/Internal/PInvoke/NativeMethods/objdetect/NativeMethods_objdetect_CascadeClassfier.cs

@@ -4,6 +4,7 @@
 
 #pragma warning disable 1591
 #pragma warning disable CA1401 // P/Invokes should not be visible
+#pragma warning disable CA2101 // Specify marshaling for P/Invoke string arguments
 #pragma warning disable IDE1006 // Naming style
 // ReSharper disable InconsistentNaming
 

src/OpenCvSharp/Internal/PInvoke/NativeMethods/objdetect/NativeMethods_objdetect_HOGDescriptor.cs

@@ -4,6 +4,7 @@
 
 #pragma warning disable 1591
 #pragma warning disable CA1401 // P/Invokes should not be visible
+#pragma warning disable CA2101 // Specify marshaling for P/Invoke string arguments
 #pragma warning disable IDE1006 // Naming style
 // ReSharper disable InconsistentNaming
 

src/OpenCvSharp/Internal/PInvoke/NativeMethods/photo/NativeMethods_photo_HDR.cs

@@ -23,22 +23,22 @@ static partial class NativeMethods
         public static extern ExceptionStatus photo_Ptr_CalibrateDebevec_get(IntPtr obj, out IntPtr returnValue);
 
         [Pure, DllImport(DllExtern, CallingConvention = CallingConvention.Cdecl, ExactSpelling = true)]
-        public static extern ExceptionStatus  photo_CalibrateDebevec_getLambda(IntPtr obj, out float returnValue);
+        public static extern ExceptionStatus photo_CalibrateDebevec_getLambda(IntPtr obj, out float returnValue);
 
         [Pure, DllImport(DllExtern, CallingConvention = CallingConvention.Cdecl, ExactSpelling = true)]
-        public static extern ExceptionStatus  photo_CalibrateDebevec_setLambda(IntPtr obj, float value);
+        public static extern ExceptionStatus photo_CalibrateDebevec_setLambda(IntPtr obj, float value);
 
         [Pure, DllImport(DllExtern, CallingConvention = CallingConvention.Cdecl, ExactSpelling = true)]
-        public static extern ExceptionStatus  photo_CalibrateDebevec_getSamples(IntPtr obj, out int returnValue);
+        public static extern ExceptionStatus photo_CalibrateDebevec_getSamples(IntPtr obj, out float returnValue);
 
         [Pure, DllImport(DllExtern, CallingConvention = CallingConvention.Cdecl, ExactSpelling = true)]
-        public static extern ExceptionStatus  photo_CalibrateDebevec_setSamples(IntPtr obj, int value);
+        public static extern ExceptionStatus photo_CalibrateDebevec_setSamples(IntPtr obj, float value);
 
         [Pure, DllImport(DllExtern, CallingConvention = CallingConvention.Cdecl, ExactSpelling = true)]
-        public static extern ExceptionStatus  photo_CalibrateDebevec_getRandom(IntPtr obj, out int returnValue);
+        public static extern ExceptionStatus photo_CalibrateDebevec_getRandom(IntPtr obj, out int returnValue);
 
         [Pure, DllImport(DllExtern, CallingConvention = CallingConvention.Cdecl, ExactSpelling = true)]
-        public static extern ExceptionStatus  photo_CalibrateDebevec_setRandom(IntPtr obj, int value);
+        public static extern ExceptionStatus photo_CalibrateDebevec_setRandom(IntPtr obj, int value);
 
         // CalibrateRobertson
 

src/OpenCvSharp/Internal/PInvoke/NativeMethods/superres/NativeMethods_superres_FrameSource.cs

@@ -4,6 +4,7 @@
 
 #pragma warning disable 1591
 #pragma warning disable CA1401 // P/Invokes should not be visible
+#pragma warning disable CA2101 // Specify marshaling for P/Invoke string arguments
 #pragma warning disable IDE1006 // Naming style
 
 namespace OpenCvSharp.Internal

src/OpenCvSharp/Internal/PInvoke/NativeMethods/text/NativeMethods_text_TextDetector.cs

@@ -4,6 +4,7 @@
 
 #pragma warning disable 1591
 #pragma warning disable CA1401 // P/Invokes should not be visible
+#pragma warning disable CA2101 // Specify marshaling for P/Invoke string arguments
 #pragma warning disable IDE1006 // Naming style
 
 namespace OpenCvSharp.Internal

src/OpenCvSharp/Internal/PInvoke/NativeMethods/ximgproc/NativeMethods_ximgproc_StructuredEdgeDetection.cs

@@ -6,6 +6,7 @@
 
 #pragma warning disable 1591
 #pragma warning disable CA1401 // P/Invokes should not be visible
+#pragma warning disable CA2101 // Specify marshaling for P/Invoke string arguments
 #pragma warning disable IDE1006 // Naming style
 
 namespace OpenCvSharp.Internal

src/OpenCvSharp/Internal/PInvoke/WindowsLibraryLoader.cs

@@ -187,7 +187,7 @@ public void LoadLibrary(string dllName, IEnumerable<string>? additionalPaths = n
 #endif
 
                     var errorMessage = new StringBuilder();
-                    errorMessage.Append($"Failed to find dll \"{dllName}\", for processor architecture {processArch.Architecture}.");
+                    errorMessage.AppendFormat(CultureInfo.InvariantCulture, $"Failed to find dll \"{dllName}\", for processor architecture {processArch.Architecture}.");
                     if (processArch.HasWarnings)
                     {
                         // include process detection warnings

src/OpenCvSharp/Internal/Util/ArrayAddress2.cs

@@ -72,7 +72,9 @@ public IntPtr[] GetPointer()
 
         /// <summary> 
         /// </summary>
+#pragma warning disable CA1024 // Use properties where appropriate
         public int GetDim1Length() => array.Length;
+#pragma warning restore CA1024 // Use properties where appropriate
 
         /// <summary> 
         /// </summary>