diff --git a/OpenCvSharp.sln.DotSettings b/OpenCvSharp.sln.DotSettings index a9a9541ca..63d9a7751 100644 --- a/OpenCvSharp.sln.DotSettings +++ b/OpenCvSharp.sln.DotSettings @@ -12,6 +12,8 @@ <Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /> <Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /> <Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /> + True + True <Policy><Descriptor Staticness="Static" AccessRightKinds="Private" Description="Static readonly fields (private)"><ElementKinds><Kind Name="READONLY_FIELD" /></ElementKinds></Descriptor><Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /></Policy> <Policy><Descriptor Staticness="Any" AccessRightKinds="Private" Description="Constant fields (private)"><ElementKinds><Kind Name="CONSTANT_FIELD" /></ElementKinds></Descriptor><Policy Inspect="True" Prefix="" Suffix="" Style="AaBb" /></Policy> <Policy><Descriptor Staticness="Instance" AccessRightKinds="Private" Description="Instance fields (private)"><ElementKinds><Kind Name="FIELD" /><Kind Name="READONLY_FIELD" /></ElementKinds></Descriptor><Policy Inspect="True" Prefix="" Suffix="" Style="aaBb" /></Policy> @@ -110,6 +112,7 @@ True True True + True True True True @@ -148,6 +151,7 @@ True True True + True True True diff --git a/src/OpenCvSharp/Cv2/Cv2_imgcodecs.cs b/src/OpenCvSharp/Cv2/Cv2_imgcodecs.cs index 622e56b99..ee065daa7 100644 --- a/src/OpenCvSharp/Cv2/Cv2_imgcodecs.cs +++ b/src/OpenCvSharp/Cv2/Cv2_imgcodecs.cs @@ -55,8 +55,7 @@ public static bool ImWrite(string fileName, Mat img, int[]? prms = null) throw new ArgumentNullException(nameof(fileName)); if (img is null) throw new ArgumentNullException(nameof(img)); - if (prms is null) - prms = Array.Empty(); + prms ??= []; NativeMethods.HandleException( NativeMethods.imgcodecs_imwrite(fileName, img.CvPtr, prms, prms.Length, out var ret)); @@ -100,7 +99,7 @@ public static bool ImWrite(string fileName, IEnumerable img, int[]? prms = throw new ArgumentNullException(nameof(fileName)); if (img is null) throw new ArgumentNullException(nameof(img)); - prms ??= Array.Empty(); + prms ??= []; using var imgVec = new VectorOfMat(img); NativeMethods.HandleException( @@ -218,8 +217,7 @@ public static bool ImEncode(string ext, InputArray img, out byte[] buf, int[]? p throw new ArgumentNullException(nameof(ext)); if (img is null) throw new ArgumentNullException(nameof(img)); - if (prms is null) - prms = Array.Empty(); + prms ??= []; img.ThrowIfDisposed(); using var bufVec = new VectorOfByte(); diff --git a/src/OpenCvSharp/Fundamentals/CvObject.cs b/src/OpenCvSharp/Fundamentals/CvObject.cs index 268e7d82a..128d70720 100644 --- a/src/OpenCvSharp/Fundamentals/CvObject.cs +++ b/src/OpenCvSharp/Fundamentals/CvObject.cs @@ -32,8 +32,5 @@ protected CvObject(IntPtr ptr) /// /// Native pointer of OpenCV structure /// - public IntPtr CvPtr - { - get { return ptr; } - } + public IntPtr CvPtr => ptr; } diff --git a/src/OpenCvSharp/Internal/PInvoke/ExceptionHandler.cs b/src/OpenCvSharp/Internal/PInvoke/ExceptionHandler.cs index fec662b84..3e18b947a 100644 --- a/src/OpenCvSharp/Internal/PInvoke/ExceptionHandler.cs +++ b/src/OpenCvSharp/Internal/PInvoke/ExceptionHandler.cs @@ -1,81 +1,79 @@ #if DOTNETCORE -using System; -using System.Threading; -namespace OpenCvSharp.Internal +namespace OpenCvSharp.Internal; + +/// +/// This static class defines one instance which than can be used by multiple threads to gather exception information from OpenCV +/// Implemented as a singleton +/// +public static class ExceptionHandler { + // ThreadLocal variables to save the exception for the current thread + private static readonly ThreadLocal exceptionHappened = new(false); + private static readonly ThreadLocal localStatus = new(); + private static readonly ThreadLocal localFuncName = new(); + private static readonly ThreadLocal localErrMsg = new(); + private static readonly ThreadLocal localFileName = new(); + private static readonly ThreadLocal localLine = new(); + /// - /// This static class defines one instance which than can be used by multiple threads to gather exception information from OpenCV - /// Implemented as a singleton + /// Callback function invoked by OpenCV when exception occurs + /// Stores the information locally for every thread /// - public static class ExceptionHandler - { - // ThreadLocal variables to save the exception for the current thread - private static readonly ThreadLocal exceptionHappened = new ThreadLocal(false); - private static readonly ThreadLocal localStatus = new ThreadLocal(); - private static readonly ThreadLocal localFuncName = new ThreadLocal(); - private static readonly ThreadLocal localErrMsg = new ThreadLocal(); - private static readonly ThreadLocal localFileName = new ThreadLocal(); - private static readonly ThreadLocal localLine = new ThreadLocal(); - - /// - /// Callback function invoked by OpenCV when exception occurs - /// Stores the information locally for every thread - /// - public static readonly CvErrorCallback ErrorHandlerCallback = - delegate (ErrorCode status, string funcName, string errMsg, string fileName, int line, IntPtr userData) - { - try - { - return 0; - } - finally - { - exceptionHappened.Value = true; - localStatus.Value = status; - localErrMsg.Value = errMsg; - localFileName.Value = fileName; - localLine.Value = line; - localFuncName.Value = funcName; - } - }; - - /// - /// Registers the callback function to OpenCV, so exception caught before the p/invoke boundary - /// - public static void RegisterExceptionCallback() + public static readonly CvErrorCallback ErrorHandlerCallback = + delegate (ErrorCode status, string funcName, string errMsg, string fileName, int line, IntPtr userData) { - IntPtr zero = IntPtr.Zero; - IntPtr ret = NativeMethods.redirectError(ErrorHandlerCallback, zero, ref zero); - } - - /// - /// Throws appropriate exception if one happened - /// - public static void ThrowPossibleException() - { - if (CheckForException()) + try { - throw new OpenCVException( - localStatus.Value, - localFuncName.Value ?? "", - localErrMsg.Value ?? "", - localFileName.Value ?? "", - localLine.Value); + return 0; } - } + finally + { + exceptionHappened.Value = true; + localStatus.Value = status; + localErrMsg.Value = errMsg; + localFileName.Value = fileName; + localLine.Value = line; + localFuncName.Value = funcName; + } + }; - /// - /// Returns a boolean which indicates if an exception occured for the current thread - /// Reading this value changes its state, so an exception is handled only once - /// - private static bool CheckForException() + /// + /// Registers the callback function to OpenCV, so exception caught before the p/invoke boundary + /// + public static void RegisterExceptionCallback() + { + IntPtr zero = IntPtr.Zero; + IntPtr ret = NativeMethods.redirectError(ErrorHandlerCallback, zero, ref zero); + } + + /// + /// Throws appropriate exception if one happened + /// + public static void ThrowPossibleException() + { + if (CheckForException()) { - var value = exceptionHappened.Value; - // reset exception value - exceptionHappened.Value = false; - return value; + throw new OpenCVException( + localStatus.Value, + localFuncName.Value ?? "", + localErrMsg.Value ?? "", + localFileName.Value ?? "", + localLine.Value); } } + + /// + /// Returns a boolean which indicates if an exception occured for the current thread + /// Reading this value changes its state, so an exception is handled only once + /// + private static bool CheckForException() + { + var value = exceptionHappened.Value; + // reset exception value + exceptionHappened.Value = false; + return value; + } } -#endif \ No newline at end of file + +#endif diff --git a/src/OpenCvSharp/Internal/PInvoke/NativeMethods/NativeMethods.cs b/src/OpenCvSharp/Internal/PInvoke/NativeMethods/NativeMethods.cs index aa4074188..dea202b3c 100644 --- a/src/OpenCvSharp/Internal/PInvoke/NativeMethods/NativeMethods.cs +++ b/src/OpenCvSharp/Internal/PInvoke/NativeMethods/NativeMethods.cs @@ -93,7 +93,7 @@ public static void LoadLibraries(IEnumerable? additionalPaths = null) return; } - var ap = (additionalPaths is null) ? Array.Empty() : additionalPaths.ToArray(); + var ap = (additionalPaths is null) ? [] : additionalPaths.ToArray(); /* if (Environment.Is64BitProcess) diff --git a/src/OpenCvSharp/Internal/PInvoke/NativeMethods/core/NativeMethods_core.cs b/src/OpenCvSharp/Internal/PInvoke/NativeMethods/core/NativeMethods_core.cs index 021ab54bb..6e2ba9a91 100644 --- a/src/OpenCvSharp/Internal/PInvoke/NativeMethods/core/NativeMethods_core.cs +++ b/src/OpenCvSharp/Internal/PInvoke/NativeMethods/core/NativeMethods_core.cs @@ -34,7 +34,7 @@ static partial class NativeMethods public static extern ExceptionStatus core_getBuildInformation(IntPtr buf); [Pure, DllImport(DllExtern, CallingConvention = CallingConvention.Cdecl, BestFitMapping = false, ThrowOnUnmappableChar = true, ExactSpelling = true)] - public static unsafe extern ExceptionStatus core_getVersionString(byte* buf, int maxLength); + public static extern unsafe ExceptionStatus core_getVersionString(byte* buf, int maxLength); [Pure, DllImport(DllExtern, CallingConvention = CallingConvention.Cdecl, ExactSpelling = true)] public static extern ExceptionStatus core_getVersionMajor(out int returnValue); [Pure, DllImport(DllExtern, CallingConvention = CallingConvention.Cdecl, ExactSpelling = true)] diff --git a/src/OpenCvSharp/Internal/PInvoke/NativeMethods/imgproc/NativeMethods_imgproc_LineSegmentDetector.cs b/src/OpenCvSharp/Internal/PInvoke/NativeMethods/imgproc/NativeMethods_imgproc_LineSegmentDetector.cs index 4a69cc9bc..e9fa7684e 100644 --- a/src/OpenCvSharp/Internal/PInvoke/NativeMethods/imgproc/NativeMethods_imgproc_LineSegmentDetector.cs +++ b/src/OpenCvSharp/Internal/PInvoke/NativeMethods/imgproc/NativeMethods_imgproc_LineSegmentDetector.cs @@ -10,15 +10,15 @@ namespace OpenCvSharp.Internal; static partial class NativeMethods { - [Pure, DllImport(DllExtern, CallingConvention = CallingConvention.Cdecl, ExactSpelling = true)] + [DllImport(DllExtern, CallingConvention = CallingConvention.Cdecl, ExactSpelling = true)] public static extern void imgproc_LineSegmentDetector_detect_OutputArray(IntPtr obj, IntPtr image, IntPtr lines, IntPtr width, IntPtr prec, IntPtr nfa); - [Pure, DllImport(DllExtern, CallingConvention = CallingConvention.Cdecl, ExactSpelling = true)] + [DllImport(DllExtern, CallingConvention = CallingConvention.Cdecl, ExactSpelling = true)] public static extern void imgproc_LineSegmentDetector_detect_vector(IntPtr obj, IntPtr image, IntPtr lines, IntPtr width, IntPtr prec, IntPtr nfa); - [Pure, DllImport(DllExtern, CallingConvention = CallingConvention.Cdecl, ExactSpelling = true)] + [DllImport(DllExtern, CallingConvention = CallingConvention.Cdecl, ExactSpelling = true)] public static extern void imgproc_LineSegmentDetector_drawSegments(IntPtr obj, IntPtr image, IntPtr lines); [Pure, DllImport(DllExtern, CallingConvention = CallingConvention.Cdecl, ExactSpelling = true)] @@ -30,7 +30,7 @@ public static extern IntPtr imgproc_createLineSegmentDetector( int refine, double scale, double sigma_scale, double quant, double ang_th, double log_eps, double density_th, int n_bins); - [Pure, DllImport(DllExtern, CallingConvention = CallingConvention.Cdecl, ExactSpelling = true)] + [DllImport(DllExtern, CallingConvention = CallingConvention.Cdecl, ExactSpelling = true)] public static extern void imgproc_Ptr_LineSegmentDetector_delete(IntPtr obj); [Pure, DllImport(DllExtern, CallingConvention = CallingConvention.Cdecl, ExactSpelling = true)] diff --git a/src/OpenCvSharp/Internal/PInvoke/WindowsLibraryLoader.cs b/src/OpenCvSharp/Internal/PInvoke/WindowsLibraryLoader.cs index e27211f07..e9b0034f5 100644 --- a/src/OpenCvSharp/Internal/PInvoke/WindowsLibraryLoader.cs +++ b/src/OpenCvSharp/Internal/PInvoke/WindowsLibraryLoader.cs @@ -23,7 +23,7 @@ public sealed class WindowsLibraryLoader private const string DllFileExtension = ".dll"; private const string DllDirectory = "dll"; - private readonly List loadedAssemblies = new(); + private readonly List loadedAssemblies = []; /// /// Map processor @@ -63,7 +63,7 @@ public sealed class WindowsLibraryLoader /// private WindowsLibraryLoader() { - AdditionalPaths = new List(); + AdditionalPaths = []; } /// @@ -114,7 +114,7 @@ public void LoadLibrary(string dllName, IEnumerable? additionalPaths = n if (!IsCurrentPlatformSupported()) return; - var additionalPathsArray = additionalPaths?.ToArray() ?? Array.Empty(); + var additionalPathsArray = additionalPaths?.ToArray() ?? []; // In .NET Core, process only when additional paths are specified. if (IsDotNetCore() && additionalPathsArray.Length == 0) @@ -187,7 +187,7 @@ public void LoadLibrary(string dllName, IEnumerable? additionalPaths = n if (processArch.HasWarnings) { // include process detection warnings - errorMessage.AppendLine().Append($"Warnings: ").AppendLine().Append("{processArch.WarningText()}"); + errorMessage.AppendLine().Append("Warnings: ").AppendLine().Append("{processArch.WarningText()}"); } throw new OpenCvSharpException(errorMessage.ToString()); @@ -202,7 +202,7 @@ public void LoadLibrary(string dllName, IEnumerable? additionalPaths = n } /// - /// Get's the current process architecture while keeping track of any assumptions or possible errors. + /// Gets the current process architecture while keeping track of any assumptions or possible errors. /// /// private ProcessArchitectureInfo GetProcessArchitecture() @@ -214,7 +214,7 @@ private ProcessArchitectureInfo GetProcessArchitecture() if (!string.IsNullOrEmpty(processArchitecture)) { // Sanity check - processInfo.Architecture = processArchitecture!; + processInfo.Architecture = processArchitecture; } else { @@ -360,7 +360,7 @@ private class ProcessArchitectureInfo public ProcessArchitectureInfo() { Architecture = ""; - Warnings = new List(); + Warnings = []; } public bool HasWarnings => Warnings.Count > 0; diff --git a/src/OpenCvSharp/Internal/Vectors/VectorOfByte.cs b/src/OpenCvSharp/Internal/Vectors/VectorOfByte.cs index f8cc38d56..c449aae4a 100644 --- a/src/OpenCvSharp/Internal/Vectors/VectorOfByte.cs +++ b/src/OpenCvSharp/Internal/Vectors/VectorOfByte.cs @@ -81,7 +81,7 @@ public byte[] ToArray() var size = Size; if (size == 0) { - return Array.Empty(); + return []; } var dst = new byte[size]; Marshal.Copy(ElemPtr, dst, 0, dst.Length); diff --git a/src/OpenCvSharp/Internal/Vectors/VectorOfDMatch.cs b/src/OpenCvSharp/Internal/Vectors/VectorOfDMatch.cs index 9bb31e40e..ab58f00a9 100644 --- a/src/OpenCvSharp/Internal/Vectors/VectorOfDMatch.cs +++ b/src/OpenCvSharp/Internal/Vectors/VectorOfDMatch.cs @@ -82,7 +82,7 @@ public DMatch[] ToArray() var size = Size; if (size == 0) { - return Array.Empty(); + return []; } var dst = new DMatch[size]; using (var dstPtr = new ArrayAddress1(dst)) diff --git a/src/OpenCvSharp/Internal/Vectors/VectorOfDTreesNode.cs b/src/OpenCvSharp/Internal/Vectors/VectorOfDTreesNode.cs index 25fe7c90f..8310963a0 100644 --- a/src/OpenCvSharp/Internal/Vectors/VectorOfDTreesNode.cs +++ b/src/OpenCvSharp/Internal/Vectors/VectorOfDTreesNode.cs @@ -60,7 +60,7 @@ public DTrees.Node[] ToArray() var size = Size; if (size == 0) { - return Array.Empty(); + return []; } var dst = new DTrees.Node[size]; using (var dstPtr = new ArrayAddress1(dst)) diff --git a/src/OpenCvSharp/Internal/Vectors/VectorOfDTreesSplit.cs b/src/OpenCvSharp/Internal/Vectors/VectorOfDTreesSplit.cs index 5d3e57263..234709bf5 100644 --- a/src/OpenCvSharp/Internal/Vectors/VectorOfDTreesSplit.cs +++ b/src/OpenCvSharp/Internal/Vectors/VectorOfDTreesSplit.cs @@ -60,7 +60,7 @@ public DTrees.Split[] ToArray() var size = Size; if (size == 0) { - return Array.Empty(); + return []; } var dst = new DTrees.Split[size]; using (var dstPtr = new ArrayAddress1(dst)) diff --git a/src/OpenCvSharp/Internal/Vectors/VectorOfDouble.cs b/src/OpenCvSharp/Internal/Vectors/VectorOfDouble.cs index 19dc10afd..a547b5f5f 100644 --- a/src/OpenCvSharp/Internal/Vectors/VectorOfDouble.cs +++ b/src/OpenCvSharp/Internal/Vectors/VectorOfDouble.cs @@ -81,7 +81,7 @@ public double[] ToArray() var size = Size; if (size == 0) { - return Array.Empty(); + return []; } var dst = new double[size]; Marshal.Copy(ElemPtr, dst, 0, dst.Length); diff --git a/src/OpenCvSharp/Internal/Vectors/VectorOfFloat.cs b/src/OpenCvSharp/Internal/Vectors/VectorOfFloat.cs index 7b9f5e737..f5dd2c56e 100644 --- a/src/OpenCvSharp/Internal/Vectors/VectorOfFloat.cs +++ b/src/OpenCvSharp/Internal/Vectors/VectorOfFloat.cs @@ -81,7 +81,7 @@ public float[] ToArray() var size = Size; if (size == 0) { - return Array.Empty(); + return []; } var dst = new float[size]; Marshal.Copy(ElemPtr, dst, 0, dst.Length); diff --git a/src/OpenCvSharp/Internal/Vectors/VectorOfImageFeatures.cs b/src/OpenCvSharp/Internal/Vectors/VectorOfImageFeatures.cs index 1132aad5b..8b47f1fc0 100644 --- a/src/OpenCvSharp/Internal/Vectors/VectorOfImageFeatures.cs +++ b/src/OpenCvSharp/Internal/Vectors/VectorOfImageFeatures.cs @@ -44,7 +44,7 @@ public ImageFeatures[] ToArray() { var size = Size; if (size == 0) - return Array.Empty(); + return []; VectorOfKeyPoint[]? keypointsVecs = null; Mat[]? descriptors = null; @@ -53,7 +53,7 @@ public ImageFeatures[] ToArray() var nativeResult = new WImageFeatures[size]; keypointsVecs = new VectorOfKeyPoint[size]; descriptors = new Mat[size]; - for (int i = 0; i < size; i++) + for (var i = 0; i < size; i++) { keypointsVecs[i] = new VectorOfKeyPoint(); descriptors[i] = new Mat(); diff --git a/src/OpenCvSharp/Internal/Vectors/VectorOfInt32.cs b/src/OpenCvSharp/Internal/Vectors/VectorOfInt32.cs index 8f0a5480d..55e642879 100644 --- a/src/OpenCvSharp/Internal/Vectors/VectorOfInt32.cs +++ b/src/OpenCvSharp/Internal/Vectors/VectorOfInt32.cs @@ -81,7 +81,7 @@ public int[] ToArray() var size = Size; if (size == 0) { - return Array.Empty(); + return []; } var dst = new int[size]; Marshal.Copy(ElemPtr, dst, 0, dst.Length); diff --git a/src/OpenCvSharp/Internal/Vectors/VectorOfKeyPoint.cs b/src/OpenCvSharp/Internal/Vectors/VectorOfKeyPoint.cs index 822ac58e1..84ba9027b 100644 --- a/src/OpenCvSharp/Internal/Vectors/VectorOfKeyPoint.cs +++ b/src/OpenCvSharp/Internal/Vectors/VectorOfKeyPoint.cs @@ -82,7 +82,7 @@ public KeyPoint[] ToArray() var size = Size; if (size == 0) { - return Array.Empty(); + return []; } var dst = new KeyPoint[size]; using (var dstPtr = new ArrayAddress1(dst)) diff --git a/src/OpenCvSharp/Internal/Vectors/VectorOfMat.cs b/src/OpenCvSharp/Internal/Vectors/VectorOfMat.cs index e3b56f577..d2056e8b8 100644 --- a/src/OpenCvSharp/Internal/Vectors/VectorOfMat.cs +++ b/src/OpenCvSharp/Internal/Vectors/VectorOfMat.cs @@ -100,7 +100,7 @@ public T[] ToArray() { var size = Size; if (size == 0) - return Array.Empty(); + return []; var dst = new T[size]; var dstPtr = new IntPtr[size]; diff --git a/src/OpenCvSharp/Internal/Vectors/VectorOfPoint.cs b/src/OpenCvSharp/Internal/Vectors/VectorOfPoint.cs index 11664830e..218ff18d8 100644 --- a/src/OpenCvSharp/Internal/Vectors/VectorOfPoint.cs +++ b/src/OpenCvSharp/Internal/Vectors/VectorOfPoint.cs @@ -82,7 +82,7 @@ public Point[] ToArray() var size = Size; if (size == 0) { - return Array.Empty(); + return []; } var dst = new Point[size]; using (var dstPtr = new ArrayAddress1(dst)) diff --git a/src/OpenCvSharp/Internal/Vectors/VectorOfPoint2d.cs b/src/OpenCvSharp/Internal/Vectors/VectorOfPoint2d.cs index e97c9fde7..ab135d527 100644 --- a/src/OpenCvSharp/Internal/Vectors/VectorOfPoint2d.cs +++ b/src/OpenCvSharp/Internal/Vectors/VectorOfPoint2d.cs @@ -60,7 +60,7 @@ public Point2d[] ToArray() var size = Size; if (size == 0) { - return Array.Empty(); + return []; } var dst = new Point2d[size]; using (var dstPtr = new ArrayAddress1(dst)) diff --git a/src/OpenCvSharp/Internal/Vectors/VectorOfPoint2f.cs b/src/OpenCvSharp/Internal/Vectors/VectorOfPoint2f.cs index b76622f5f..8d53cb07d 100644 --- a/src/OpenCvSharp/Internal/Vectors/VectorOfPoint2f.cs +++ b/src/OpenCvSharp/Internal/Vectors/VectorOfPoint2f.cs @@ -83,7 +83,7 @@ public Point2f[] ToArray() var size = Size; if (size == 0) { - return Array.Empty(); + return []; } var dst = new Point2f[size]; using (var dstPtr = new ArrayAddress1(dst)) diff --git a/src/OpenCvSharp/Internal/Vectors/VectorOfPoint3f.cs b/src/OpenCvSharp/Internal/Vectors/VectorOfPoint3f.cs index 77fea9c5b..8c187dcf6 100644 --- a/src/OpenCvSharp/Internal/Vectors/VectorOfPoint3f.cs +++ b/src/OpenCvSharp/Internal/Vectors/VectorOfPoint3f.cs @@ -83,7 +83,7 @@ public Point3f[] ToArray() var size = Size; if (size == 0) { - return Array.Empty(); + return []; } var dst = new Point3f[size]; using (var dstPtr = new ArrayAddress1(dst)) diff --git a/src/OpenCvSharp/Internal/Vectors/VectorOfRect.cs b/src/OpenCvSharp/Internal/Vectors/VectorOfRect.cs index fff5c52c0..d5daec889 100644 --- a/src/OpenCvSharp/Internal/Vectors/VectorOfRect.cs +++ b/src/OpenCvSharp/Internal/Vectors/VectorOfRect.cs @@ -82,7 +82,7 @@ public Rect[] ToArray() var size = Size; if (size == 0) { - return Array.Empty(); + return []; } var dst = new Rect[size]; using (var dstPtr = new ArrayAddress1(dst)) diff --git a/src/OpenCvSharp/Internal/Vectors/VectorOfRect2d.cs b/src/OpenCvSharp/Internal/Vectors/VectorOfRect2d.cs index 5aebc0179..89c1e40b2 100644 --- a/src/OpenCvSharp/Internal/Vectors/VectorOfRect2d.cs +++ b/src/OpenCvSharp/Internal/Vectors/VectorOfRect2d.cs @@ -84,7 +84,7 @@ public Rect2d[] ToArray() var size = Size; if (size == 0) { - return Array.Empty(); + return []; } var dst = new Rect2d[size]; using (var dstPtr = new ArrayAddress1(dst)) diff --git a/src/OpenCvSharp/Internal/Vectors/VectorOfRotatedRect.cs b/src/OpenCvSharp/Internal/Vectors/VectorOfRotatedRect.cs index 50579884a..5b01fbde3 100644 --- a/src/OpenCvSharp/Internal/Vectors/VectorOfRotatedRect.cs +++ b/src/OpenCvSharp/Internal/Vectors/VectorOfRotatedRect.cs @@ -83,7 +83,7 @@ public RotatedRect[] ToArray() { var size = Size; if (size == 0) - return Array.Empty(); + return []; var dst = new RotatedRect[size]; using (var dstPtr = new ArrayAddress1(dst)) diff --git a/src/OpenCvSharp/Internal/Vectors/VectorOfString.cs b/src/OpenCvSharp/Internal/Vectors/VectorOfString.cs index c1d65dd4a..0653da4bd 100644 --- a/src/OpenCvSharp/Internal/Vectors/VectorOfString.cs +++ b/src/OpenCvSharp/Internal/Vectors/VectorOfString.cs @@ -55,7 +55,7 @@ public string[] ToArray() { var size = Size; if (size == 0) - return Array.Empty(); + return []; var ret = new string[size]; var cStringPointers = new IntPtr[size]; diff --git a/src/OpenCvSharp/Internal/Vectors/VectorOfVec2f.cs b/src/OpenCvSharp/Internal/Vectors/VectorOfVec2f.cs index b5585be67..c3338106c 100644 --- a/src/OpenCvSharp/Internal/Vectors/VectorOfVec2f.cs +++ b/src/OpenCvSharp/Internal/Vectors/VectorOfVec2f.cs @@ -74,7 +74,7 @@ public T[] ToArray() where T : unmanaged var arySize = Size; if (arySize == 0) { - return Array.Empty(); + return []; } else { diff --git a/src/OpenCvSharp/Internal/Vectors/VectorOfVec3f.cs b/src/OpenCvSharp/Internal/Vectors/VectorOfVec3f.cs index 646e72291..51edf4490 100644 --- a/src/OpenCvSharp/Internal/Vectors/VectorOfVec3f.cs +++ b/src/OpenCvSharp/Internal/Vectors/VectorOfVec3f.cs @@ -74,7 +74,7 @@ public T[] ToArray() where T : unmanaged var arySize = Size; if (arySize == 0) { - return Array.Empty(); + return []; } var dst = new T[arySize]; using (var dstPtr = new ArrayAddress1(dst)) diff --git a/src/OpenCvSharp/Internal/Vectors/VectorOfVec4f.cs b/src/OpenCvSharp/Internal/Vectors/VectorOfVec4f.cs index f9fdee667..ecbddd655 100644 --- a/src/OpenCvSharp/Internal/Vectors/VectorOfVec4f.cs +++ b/src/OpenCvSharp/Internal/Vectors/VectorOfVec4f.cs @@ -86,7 +86,7 @@ public T[] ToArray() where T : unmanaged var arySize = Size; if (arySize == 0) { - return Array.Empty(); + return []; } var dst = new T[arySize]; using (var dstPtr = new ArrayAddress1(dst)) diff --git a/src/OpenCvSharp/Internal/Vectors/VectorOfVec4i.cs b/src/OpenCvSharp/Internal/Vectors/VectorOfVec4i.cs index 5caaae943..e8e8da4e8 100644 --- a/src/OpenCvSharp/Internal/Vectors/VectorOfVec4i.cs +++ b/src/OpenCvSharp/Internal/Vectors/VectorOfVec4i.cs @@ -86,7 +86,7 @@ public T[] ToArray() where T : unmanaged var arySize = Size; if (arySize == 0) { - return Array.Empty(); + return []; } var dst = new T[arySize]; using (var dstPtr = new ArrayAddress1(dst)) diff --git a/src/OpenCvSharp/Internal/Vectors/VectorOfVec6f.cs b/src/OpenCvSharp/Internal/Vectors/VectorOfVec6f.cs index 1d14fb16c..397164ef3 100644 --- a/src/OpenCvSharp/Internal/Vectors/VectorOfVec6f.cs +++ b/src/OpenCvSharp/Internal/Vectors/VectorOfVec6f.cs @@ -74,7 +74,7 @@ public T[] ToArray() where T : unmanaged var arySize = Size; if (arySize == 0) { - return Array.Empty(); + return []; } var dst = new T[arySize]; using (var dstPtr = new ArrayAddress1(dst)) diff --git a/src/OpenCvSharp/Internal/Vectors/VectorOfVectorByte.cs b/src/OpenCvSharp/Internal/Vectors/VectorOfVectorByte.cs index 7a0f2893b..3ec9f2299 100644 --- a/src/OpenCvSharp/Internal/Vectors/VectorOfVectorByte.cs +++ b/src/OpenCvSharp/Internal/Vectors/VectorOfVectorByte.cs @@ -58,7 +58,7 @@ public byte[][] ToArray() { var size1 = GetSize1(); if (size1 == 0) - return Array.Empty(); + return []; var size2 = GetSize2(); var ret = new byte[size1][]; diff --git a/src/OpenCvSharp/Internal/Vectors/VectorOfVectorDMatch.cs b/src/OpenCvSharp/Internal/Vectors/VectorOfVectorDMatch.cs index f6e9e3987..83cec9d7b 100644 --- a/src/OpenCvSharp/Internal/Vectors/VectorOfVectorDMatch.cs +++ b/src/OpenCvSharp/Internal/Vectors/VectorOfVectorDMatch.cs @@ -58,7 +58,7 @@ public DMatch[][] ToArray() { var size1 = GetSize1(); if (size1 == 0) - return Array.Empty(); + return []; var size2 = GetSize2(); var ret = new DMatch[size1][]; diff --git a/src/OpenCvSharp/Internal/Vectors/VectorOfVectorDouble.cs b/src/OpenCvSharp/Internal/Vectors/VectorOfVectorDouble.cs index 48cda2302..7213b74c4 100644 --- a/src/OpenCvSharp/Internal/Vectors/VectorOfVectorDouble.cs +++ b/src/OpenCvSharp/Internal/Vectors/VectorOfVectorDouble.cs @@ -58,7 +58,7 @@ public double[][] ToArray() { var size1 = GetSize1(); if (size1 == 0) - return Array.Empty(); + return []; var size2 = GetSize2(); var ret = new double[size1][]; diff --git a/src/OpenCvSharp/Internal/Vectors/VectorOfVectorInt32.cs b/src/OpenCvSharp/Internal/Vectors/VectorOfVectorInt32.cs index 15d99b75c..6ab52dde2 100644 --- a/src/OpenCvSharp/Internal/Vectors/VectorOfVectorInt32.cs +++ b/src/OpenCvSharp/Internal/Vectors/VectorOfVectorInt32.cs @@ -58,7 +58,7 @@ public int[][] ToArray() { var size1 = GetSize1(); if (size1 == 0) - return Array.Empty(); + return []; var size2 = GetSize2(); var ret = new int[size1][]; diff --git a/src/OpenCvSharp/Internal/Vectors/VectorOfVectorKeyPoint.cs b/src/OpenCvSharp/Internal/Vectors/VectorOfVectorKeyPoint.cs index da316ed4f..bd068803f 100644 --- a/src/OpenCvSharp/Internal/Vectors/VectorOfVectorKeyPoint.cs +++ b/src/OpenCvSharp/Internal/Vectors/VectorOfVectorKeyPoint.cs @@ -72,7 +72,7 @@ public KeyPoint[][] ToArray() { var size1 = GetSize1(); if (size1 == 0) - return Array.Empty(); + return []; var size2 = GetSize2(); var ret = new KeyPoint[size1][]; diff --git a/src/OpenCvSharp/Internal/Vectors/VectorOfVectorPoint.cs b/src/OpenCvSharp/Internal/Vectors/VectorOfVectorPoint.cs index 30ce4fd7e..3c0ed219e 100644 --- a/src/OpenCvSharp/Internal/Vectors/VectorOfVectorPoint.cs +++ b/src/OpenCvSharp/Internal/Vectors/VectorOfVectorPoint.cs @@ -69,7 +69,7 @@ public Point[][] ToArray() { var size1 = GetSize1(); if (size1 == 0) - return Array.Empty(); + return []; var size2 = GetSize2(); var ret = new Point[size1][]; diff --git a/src/OpenCvSharp/Internal/Vectors/VectorOfVectorPoint2f.cs b/src/OpenCvSharp/Internal/Vectors/VectorOfVectorPoint2f.cs index d2aceb030..c018417cf 100644 --- a/src/OpenCvSharp/Internal/Vectors/VectorOfVectorPoint2f.cs +++ b/src/OpenCvSharp/Internal/Vectors/VectorOfVectorPoint2f.cs @@ -59,7 +59,7 @@ public Point2f[][] ToArray() { var size1 = GetSize1(); if (size1 == 0) - return Array.Empty(); + return []; var size2 = GetSize2(); var ret = new Point2f[size1][]; diff --git a/src/OpenCvSharp/Modules/bgsegm/BackgroundSubtractorGMG.cs b/src/OpenCvSharp/Modules/bgsegm/BackgroundSubtractorGMG.cs index 9ebe28603..023e5115c 100644 --- a/src/OpenCvSharp/Modules/bgsegm/BackgroundSubtractorGMG.cs +++ b/src/OpenCvSharp/Modules/bgsegm/BackgroundSubtractorGMG.cs @@ -269,12 +269,8 @@ public double MaxVal #endregion - internal class Ptr : OpenCvSharp.Ptr + internal class Ptr(IntPtr ptr) : OpenCvSharp.Ptr(ptr) { - public Ptr(IntPtr ptr) : base(ptr) - { - } - public override IntPtr Get() { NativeMethods.HandleException( diff --git a/src/OpenCvSharp/Modules/bgsegm/BackgroundSubtractorMOG.cs b/src/OpenCvSharp/Modules/bgsegm/BackgroundSubtractorMOG.cs index 7a9440e85..33c609c81 100644 --- a/src/OpenCvSharp/Modules/bgsegm/BackgroundSubtractorMOG.cs +++ b/src/OpenCvSharp/Modules/bgsegm/BackgroundSubtractorMOG.cs @@ -134,12 +134,8 @@ public double NoiseSigma } } - internal class Ptr : OpenCvSharp.Ptr + internal class Ptr(IntPtr ptr) : OpenCvSharp.Ptr(ptr) { - public Ptr(IntPtr ptr) : base(ptr) - { - } - public override IntPtr Get() { NativeMethods.HandleException( diff --git a/src/OpenCvSharp/Modules/calib3d/StereoBM.cs b/src/OpenCvSharp/Modules/calib3d/StereoBM.cs index 6d58c2df4..1b4cff75f 100644 --- a/src/OpenCvSharp/Modules/calib3d/StereoBM.cs +++ b/src/OpenCvSharp/Modules/calib3d/StereoBM.cs @@ -226,12 +226,8 @@ public Rect ROI2 #endregion - internal class Ptr : OpenCvSharp.Ptr + internal class Ptr(IntPtr ptr) : OpenCvSharp.Ptr(ptr) { - public Ptr(IntPtr ptr) : base(ptr) - { - } - public override IntPtr Get() { NativeMethods.HandleException( diff --git a/src/OpenCvSharp/Modules/calib3d/StereoSGBM.cs b/src/OpenCvSharp/Modules/calib3d/StereoSGBM.cs index a558da4f9..a6fdbb00d 100644 --- a/src/OpenCvSharp/Modules/calib3d/StereoSGBM.cs +++ b/src/OpenCvSharp/Modules/calib3d/StereoSGBM.cs @@ -198,12 +198,8 @@ public StereoSGBMMode Mode #endregion - internal class Ptr : OpenCvSharp.Ptr + internal class Ptr(IntPtr ptr) : OpenCvSharp.Ptr(ptr) { - public Ptr(IntPtr ptr) : base(ptr) - { - } - public override IntPtr Get() { NativeMethods.HandleException( diff --git a/src/OpenCvSharp/Modules/calib3d/UsacParams.cs b/src/OpenCvSharp/Modules/calib3d/UsacParams.cs index 9fcbb3486..e1c35de57 100644 --- a/src/OpenCvSharp/Modules/calib3d/UsacParams.cs +++ b/src/OpenCvSharp/Modules/calib3d/UsacParams.cs @@ -3,7 +3,7 @@ namespace OpenCvSharp; #pragma warning disable CS1591 -public class UsacParams +public record UsacParams { #pragma warning disable CA1805 public double Confidence { get; set; } = 0.99; @@ -18,7 +18,7 @@ public class UsacParams public ScoreMethod Score { get; set; } = ScoreMethod.MSAC; public double Threshold { get; set; } = 1.5; - public WUsacParams ToNativeStruct() => new WUsacParams + public WUsacParams ToNativeStruct() => new() { Confidence = Confidence, IsParallel = IsParallel ? 1 : 0, @@ -51,7 +51,11 @@ public struct WUsacParams public double Threshold; } -public enum SamplingMethod : int +// ReSharper disable InconsistentNaming +// ReSharper disable UnusedMember.Global +// ReSharper disable IdentifierTypo + +public enum SamplingMethod { UNIFORM, PROGRESSIVE_NAPSAC, @@ -59,7 +63,7 @@ public enum SamplingMethod : int PROSAC } -public enum LocalOptimMethod : int +public enum LocalOptimMethod { NULL, INNER_LO, @@ -68,7 +72,7 @@ public enum LocalOptimMethod : int SIGMA } -public enum ScoreMethod : int +public enum ScoreMethod { RANSAC, MSAC, @@ -76,7 +80,7 @@ public enum ScoreMethod : int LMEDS } -public enum NeighborSearchMethod : int +public enum NeighborSearchMethod { FLANN_KNN, GRID, diff --git a/src/OpenCvSharp/Modules/core/FileNodeIterator.cs b/src/OpenCvSharp/Modules/core/FileNodeIterator.cs index 356ed594f..6e865efa2 100644 --- a/src/OpenCvSharp/Modules/core/FileNodeIterator.cs +++ b/src/OpenCvSharp/Modules/core/FileNodeIterator.cs @@ -73,14 +73,11 @@ public FileNode Current } object IEnumerator.Current => Current; - + /// /// IEnumerable<T>.Reset /// - public void Reset() - { - throw new NotImplementedException(); - } + public void Reset() => throw new NotImplementedException(); /// /// iterator++ diff --git a/src/OpenCvSharp/Modules/core/InputArray.cs b/src/OpenCvSharp/Modules/core/InputArray.cs index b756667ef..763bcc518 100644 --- a/src/OpenCvSharp/Modules/core/InputArray.cs +++ b/src/OpenCvSharp/Modules/core/InputArray.cs @@ -300,50 +300,35 @@ protected override void DisposeUnmanaged() /// /// /// - public static InputArray Create(Mat mat) - { - return new(mat); - } + public static InputArray Create(Mat mat) => new(mat); /// /// Creates a proxy class of the specified Mat /// /// /// - public static InputArray Create(UMat mat) - { - return new(mat); - } + public static InputArray Create(UMat mat) => new(mat); /// /// Creates a proxy class of the specified MatExpr /// /// /// - public static InputArray Create(MatExpr expr) - { - return new(expr); - } + public static InputArray Create(MatExpr expr) => new(expr); /// /// Creates a proxy class of the specified Scalar /// /// /// - public static InputArray Create(Scalar val) - { - return new(val); - } + public static InputArray Create(Scalar val) => new(val); /// /// Creates a proxy class of the specified double /// /// /// - public static InputArray Create(double val) - { - return new(val); - } + public static InputArray Create(double val) => new(val); #if ENABLED_CUDA /// @@ -362,10 +347,7 @@ public static InputArray Create(GpuMat mat) /// /// /// - public static InputArray Create(IEnumerable matVector) - { - return new(matVector); - } + public static InputArray Create(IEnumerable matVector) => new(matVector); /// /// Creates a proxy class of the specified list @@ -493,10 +475,10 @@ public static InputArray Create(IVec vec) Vec3f v => new InputArray(new[] { v.Item0, v.Item1, v.Item2 }), Vec4f v => new InputArray(new[] { v.Item0, v.Item1, v.Item2, v.Item3 }), Vec6f v => new InputArray(new[] { v.Item0, v.Item1, v.Item2, v.Item3, v.Item4, v.Item5 }), - Vec2d v => new InputArray(new[] { v.Item0, v.Item1}), - Vec3d v => new InputArray(new[] { v.Item0, v.Item1, v.Item2}), - Vec4d v => new InputArray(new[] { v.Item0, v.Item1, v.Item2, v.Item3}), - Vec6d v => new InputArray(new[] { v.Item0, v.Item1, v.Item2, v.Item3, v.Item4, v.Item5}), + Vec2d v => new InputArray([v.Item0, v.Item1]), + Vec3d v => new InputArray([v.Item0, v.Item1, v.Item2]), + Vec4d v => new InputArray([v.Item0, v.Item1, v.Item2, v.Item3]), + Vec6d v => new InputArray([v.Item0, v.Item1, v.Item2, v.Item3, v.Item4, v.Item5]), #pragma warning restore CA2000 _ => throw new ArgumentException($"Not supported type: '{vec.GetType().Name}'", nameof(vec)) }; @@ -509,11 +491,7 @@ public static InputArray Create(IVec vec) /// private static MatType EstimateType(Type t) { -#if NET40 - if (!t.IsValueType) -#else if (!t.GetTypeInfo().IsValueType) -#endif throw new ArgumentException("Reference type is not supported."); // Primitive types @@ -637,30 +615,15 @@ private static MatType EstimateType(Type t) #pragma warning disable 1591 #pragma warning disable CA2225 - public static implicit operator InputArray(Mat mat) - { - return Create(mat); - } - - public static implicit operator InputArray(UMat mat) - { - return Create(mat); - } - - public static implicit operator InputArray(MatExpr expr) - { - return Create(expr); - } - - public static implicit operator InputArray(Scalar val) - { - return Create(val); - } - - public static implicit operator InputArray(double val) - { - return Create(val); - } + public static implicit operator InputArray(Mat mat) => Create(mat); + + public static implicit operator InputArray(UMat mat) => Create(mat); + + public static implicit operator InputArray(MatExpr expr) => Create(expr); + + public static implicit operator InputArray(Scalar val) => Create(val); + + public static implicit operator InputArray(double val) => Create(val); #if ENABLED_CUDA public static implicit operator InputArray(GpuMat mat) @@ -669,40 +632,34 @@ public static implicit operator InputArray(GpuMat mat) } #endif - public static explicit operator InputArray(List mats) - { - return Create(mats); - } - - public static explicit operator InputArray(Mat[] mats) - { - return Create(mats); - } - - public static implicit operator InputArray(Vec2b vec) { return Create(vec); } - public static implicit operator InputArray(Vec3b vec) { return Create(vec); } - public static implicit operator InputArray(Vec4b vec) { return Create(vec); } - public static implicit operator InputArray(Vec6b vec) { return Create(vec); } - public static implicit operator InputArray(Vec2s vec) { return Create(vec); } - public static implicit operator InputArray(Vec3s vec) { return Create(vec); } - public static implicit operator InputArray(Vec4s vec) { return Create(vec); } - public static implicit operator InputArray(Vec6s vec) { return Create(vec); } - public static implicit operator InputArray(Vec2w vec) { return Create(vec); } - public static implicit operator InputArray(Vec3w vec) { return Create(vec); } - public static implicit operator InputArray(Vec4w vec) { return Create(vec); } - public static implicit operator InputArray(Vec6w vec) { return Create(vec); } - public static implicit operator InputArray(Vec2i vec) { return Create(vec); } - public static implicit operator InputArray(Vec3i vec) { return Create(vec); } - public static implicit operator InputArray(Vec4i vec) { return Create(vec); } - public static implicit operator InputArray(Vec6i vec) { return Create(vec); } - public static implicit operator InputArray(Vec2f vec) { return Create(vec); } - public static implicit operator InputArray(Vec3f vec) { return Create(vec); } - public static implicit operator InputArray(Vec4f vec) { return Create(vec); } - public static implicit operator InputArray(Vec6f vec) { return Create(vec); } - public static implicit operator InputArray(Vec2d vec) { return Create(vec); } - public static implicit operator InputArray(Vec3d vec) { return Create(vec); } - public static implicit operator InputArray(Vec4d vec) { return Create(vec); } - public static implicit operator InputArray(Vec6d vec) { return Create(vec); } + public static explicit operator InputArray(List mats) => Create(mats); + + public static explicit operator InputArray(Mat[] mats) => Create(mats); + + public static implicit operator InputArray(Vec2b vec) => Create(vec); + public static implicit operator InputArray(Vec3b vec) => Create(vec); + public static implicit operator InputArray(Vec4b vec) => Create(vec); + public static implicit operator InputArray(Vec6b vec) => Create(vec); + public static implicit operator InputArray(Vec2s vec) => Create(vec); + public static implicit operator InputArray(Vec3s vec) => Create(vec); + public static implicit operator InputArray(Vec4s vec) => Create(vec); + public static implicit operator InputArray(Vec6s vec) => Create(vec); + public static implicit operator InputArray(Vec2w vec) => Create(vec); + public static implicit operator InputArray(Vec3w vec) => Create(vec); + public static implicit operator InputArray(Vec4w vec) => Create(vec); + public static implicit operator InputArray(Vec6w vec) => Create(vec); + public static implicit operator InputArray(Vec2i vec) => Create(vec); + public static implicit operator InputArray(Vec3i vec) => Create(vec); + public static implicit operator InputArray(Vec4i vec) => Create(vec); + public static implicit operator InputArray(Vec6i vec) => Create(vec); + public static implicit operator InputArray(Vec2f vec) => Create(vec); + public static implicit operator InputArray(Vec3f vec) => Create(vec); + public static implicit operator InputArray(Vec4f vec) => Create(vec); + public static implicit operator InputArray(Vec6f vec) => Create(vec); + public static implicit operator InputArray(Vec2d vec) => Create(vec); + public static implicit operator InputArray(Vec3d vec) => Create(vec); + public static implicit operator InputArray(Vec4d vec) => Create(vec); + public static implicit operator InputArray(Vec6d vec) => Create(vec); #pragma warning restore CA2225 #pragma warning restore 1591 diff --git a/src/OpenCvSharp/Modules/core/Mat/Mat.cs b/src/OpenCvSharp/Modules/core/Mat/Mat.cs index 4034352d0..cabb7a014 100644 --- a/src/OpenCvSharp/Modules/core/Mat/Mat.cs +++ b/src/OpenCvSharp/Modules/core/Mat/Mat.cs @@ -423,7 +423,7 @@ protected Mat(IEnumerable sizes, MatType type, Array data, IEnumerableArray of ndims-1 steps in case of a multi-dimensional array (the last step is always set to the element size). /// If not specified, the matrix is assumed to be continuous. public static Mat FromPixelData(IEnumerable sizes, MatType type, Array data, IEnumerable? steps = null) - => new Mat(sizes, type, data, steps); + => new (sizes, type, data, steps); /// /// constructs n-dimensional matrix @@ -519,10 +519,8 @@ public static Mat ImDecode(byte[] imageBytes, ImreadModes mode = ImreadModes.Col /// The input slice of bytes. /// The same flags as in imread /// - public static Mat ImDecode(ReadOnlySpan span, ImreadModes mode = ImreadModes.Color) - { - return Cv2.ImDecode(span, mode); - } + public static Mat ImDecode(ReadOnlySpan span, ImreadModes mode = ImreadModes.Color) + => Cv2.ImDecode(span, mode); /// /// Creates the Mat instance from image data (using cv::decode) @@ -586,10 +584,8 @@ public static MatExpr Zeros(int rows, int cols, MatType type) /// Alternative to the matrix size specification Size(cols, rows) . /// Created matrix type. /// - public static MatExpr Zeros(Size size, MatType type) - { - return Zeros(size.Height, size.Width, type); - } + public static MatExpr Zeros(Size size, MatType type) + => Zeros(size.Height, size.Width, type); /// /// Returns a zero array of the specified size and type. @@ -629,10 +625,8 @@ public static MatExpr Ones(int rows, int cols, MatType type) /// Alternative to the matrix size specification Size(cols, rows) . /// Created matrix type. /// - public static MatExpr Ones(Size size, MatType type) - { - return Ones(size.Height, size.Width, type); - } + public static MatExpr Ones(Size size, MatType type) + => Ones(size.Height, size.Width, type); /// /// Returns an array of all 1’s of the specified size and type. @@ -657,10 +651,8 @@ public static MatExpr Ones(MatType type, params int[] sizes) /// Alternative to the matrix size specification Size(cols, rows) . /// Created matrix type. /// - public static MatExpr Eye(Size size, MatType type) - { - return Eye(size.Height, size.Width, type); - } + public static MatExpr Eye(Size size, MatType type) + => Eye(size.Height, size.Width, type); /// /// Returns an identity matrix of the specified size and type. @@ -723,10 +715,8 @@ public static Mat FromArray(TElem[,] arr) /// /// Source array data to be copied to this public static Mat FromArray(IEnumerable enumerable) - where TElem : unmanaged - { - return FromArray(enumerable.ToArray()); - } + where TElem : unmanaged => + FromArray(enumerable.ToArray()); #endregion @@ -1305,7 +1295,7 @@ public MatExpr GreaterThanOrEqual(double d) /// Start and end column of the extracted submatrix. /// The upper boundary is not included. To select all the columns, use Range.All(). /// - public Mat this[OpenCvSharp.Range rowRange, OpenCvSharp.Range colRange] + public Mat this[Range rowRange, Range colRange] { get => SubMat(rowRange, colRange); set @@ -1432,10 +1422,8 @@ public Mat ColRange(int startCol, int endCol) /// /// /// - public Mat ColRange(OpenCvSharp.Range range) - { - return ColRange(range.Start, range.End); - } + public Mat ColRange(Range range) + => ColRange(range.Start, range.End); #if NETCOREAPP3_1_OR_GREATER || NETSTANDARD2_1 /// @@ -1483,10 +1471,8 @@ public Mat RowRange(int startRow, int endRow) /// /// /// - public Mat RowRange(OpenCvSharp.Range range) - { - return RowRange(range.Start, range.End); - } + public Mat RowRange(Range range) + => RowRange(range.Start, range.End); #if NETCOREAPP3_1_OR_GREATER || NETSTANDARD2_1 /// @@ -2487,10 +2473,8 @@ public Mat SubMat(int rowStart, int rowEnd, int colStart, int colEnd) /// Start and end column of the extracted submatrix. The upper boundary is not included. /// To select all the columns, use Range::all(). /// - public Mat SubMat(OpenCvSharp.Range rowRange, OpenCvSharp.Range colRange) - { - return SubMat(rowRange.Start, rowRange.End, colRange.Start, colRange.End); - } + public Mat SubMat(Range rowRange, Range colRange) + => SubMat(rowRange.Start, rowRange.End, colRange.Start, colRange.End); #if NETCOREAPP3_1_OR_GREATER || NETSTANDARD2_1 /// @@ -2514,10 +2498,8 @@ public Mat SubMat(System.Range rowRange, System.Range colRange) /// /// Extracted submatrix specified as a rectangle. /// - public Mat SubMat(Rect roi) - { - return SubMat(roi.Y, roi.Y + roi.Height, roi.X, roi.X + roi.Width); - } + public Mat SubMat(Rect roi) + => SubMat(roi.Y, roi.Y + roi.Height, roi.X, roi.X + roi.Width); /// /// Extracts a rectangular submatrix. @@ -3470,50 +3452,50 @@ public void Set(int[] idx, T value) where T : struct private static readonly IReadOnlyDictionary acceptableTypesMap = new Dictionary { - {typeof(byte), new[]{MatType.CV_8SC1, MatType.CV_8UC1}}, - {typeof(sbyte), new[]{MatType.CV_8SC1, MatType.CV_8UC1}}, - {typeof(short), new[]{MatType.CV_16SC1, MatType.CV_16UC1}}, - {typeof(ushort), new[]{MatType.CV_16SC1, MatType.CV_16UC1}}, - {typeof(int), new[]{MatType.CV_32SC1}}, - {typeof(float), new[]{MatType.CV_32FC1}}, - {typeof(double), new[]{MatType.CV_64FC1}}, - {typeof(Point), new[]{MatType.CV_32SC2}}, - {typeof(Point2f), new[]{MatType.CV_32FC2}}, - {typeof(Point2d), new[]{MatType.CV_64FC2}}, - {typeof(Point3i), new[]{MatType.CV_32SC3}}, - {typeof(Point3f), new[]{MatType.CV_32FC3}}, - {typeof(Point3d), new[]{MatType.CV_64FC3}}, - {typeof(Size), new[]{MatType.CV_32SC2}}, - {typeof(Size2f), new[]{MatType.CV_32FC2}}, - {typeof(Size2d), new[]{MatType.CV_64FC2}}, - {typeof(Rect), new[]{MatType.CV_32SC4}}, - {typeof(Rect2f), new[]{MatType.CV_32FC4}}, - {typeof(Rect2d), new[]{MatType.CV_64FC4}}, + {typeof(byte), [MatType.CV_8SC1, MatType.CV_8UC1] }, + {typeof(sbyte), [MatType.CV_8SC1, MatType.CV_8UC1] }, + {typeof(short), [MatType.CV_16SC1, MatType.CV_16UC1] }, + {typeof(ushort), [MatType.CV_16SC1, MatType.CV_16UC1] }, + {typeof(int), [MatType.CV_32SC1] }, + {typeof(float), [MatType.CV_32FC1] }, + {typeof(double), [MatType.CV_64FC1] }, + {typeof(Point), [MatType.CV_32SC2] }, + {typeof(Point2f), [MatType.CV_32FC2] }, + {typeof(Point2d), [MatType.CV_64FC2] }, + {typeof(Point3i), [MatType.CV_32SC3] }, + {typeof(Point3f), [MatType.CV_32FC3] }, + {typeof(Point3d), [MatType.CV_64FC3] }, + {typeof(Size), [MatType.CV_32SC2] }, + {typeof(Size2f), [MatType.CV_32FC2] }, + {typeof(Size2d), [MatType.CV_64FC2] }, + {typeof(Rect), [MatType.CV_32SC4] }, + {typeof(Rect2f), [MatType.CV_32FC4] }, + {typeof(Rect2d), [MatType.CV_64FC4] }, //{typeof(DMatch), new[]{MatType.CV_32FC4}}, - {typeof(Vec2b), new[]{MatType.CV_8UC2}}, - {typeof(Vec2s), new[]{MatType.CV_16SC2}}, - {typeof(Vec2w), new[]{MatType.CV_16UC2}}, - {typeof(Vec2i), new[]{MatType.CV_32SC2}}, - {typeof(Vec2f), new[]{MatType.CV_32FC2}}, - {typeof(Vec2d), new[]{MatType.CV_64FC2}}, - {typeof(Vec3b), new[]{MatType.CV_8UC3}}, - {typeof(Vec3s), new[]{MatType.CV_16SC3}}, - {typeof(Vec3w), new[]{MatType.CV_16UC3}}, - {typeof(Vec3i), new[]{MatType.CV_32SC3}}, - {typeof(Vec3f), new[]{MatType.CV_32FC3}}, - {typeof(Vec3d), new[]{MatType.CV_64FC3}}, - {typeof(Vec4b), new[]{MatType.CV_8UC4}}, - {typeof(Vec4s), new[]{MatType.CV_16SC4}}, - {typeof(Vec4w), new[]{MatType.CV_16UC4}}, - {typeof(Vec4i), new[]{MatType.CV_32SC4}}, - {typeof(Vec4f), new[]{MatType.CV_32FC4}}, - {typeof(Vec4d), new[]{MatType.CV_64FC4}}, - {typeof(Vec6b), new[]{MatType.CV_8UC(6)}}, - {typeof(Vec6s), new[]{MatType.CV_16SC(6)}}, - {typeof(Vec6w), new[]{MatType.CV_16UC(6)}}, - {typeof(Vec6i), new[]{MatType.CV_32SC(6)}}, - {typeof(Vec6f), new[]{MatType.CV_32FC(6)}}, - {typeof(Vec6d), new[]{MatType.CV_64FC(6)}}, + {typeof(Vec2b), [MatType.CV_8UC2] }, + {typeof(Vec2s), [MatType.CV_16SC2] }, + {typeof(Vec2w), [MatType.CV_16UC2] }, + {typeof(Vec2i), [MatType.CV_32SC2] }, + {typeof(Vec2f), [MatType.CV_32FC2] }, + {typeof(Vec2d), [MatType.CV_64FC2] }, + {typeof(Vec3b), [MatType.CV_8UC3] }, + {typeof(Vec3s), [MatType.CV_16SC3] }, + {typeof(Vec3w), [MatType.CV_16UC3] }, + {typeof(Vec3i), [MatType.CV_32SC3] }, + {typeof(Vec3f), [MatType.CV_32FC3] }, + {typeof(Vec3d), [MatType.CV_64FC3] }, + {typeof(Vec4b), [MatType.CV_8UC4] }, + {typeof(Vec4s), [MatType.CV_16SC4] }, + {typeof(Vec4w), [MatType.CV_16UC4] }, + {typeof(Vec4i), [MatType.CV_32SC4] }, + {typeof(Vec4f), [MatType.CV_32FC4] }, + {typeof(Vec4d), [MatType.CV_64FC4] }, + {typeof(Vec6b), [MatType.CV_8UC(6)] }, + {typeof(Vec6s), [MatType.CV_16SC(6)] }, + {typeof(Vec6w), [MatType.CV_16UC(6)] }, + {typeof(Vec6i), [MatType.CV_32SC(6)] }, + {typeof(Vec6f), [MatType.CV_32FC(6)] }, + {typeof(Vec6d), [MatType.CV_64FC(6)] }, }; private void CheckArgumentsForConvert(Array data) @@ -3672,10 +3654,8 @@ public bool SetRectangularArray(T[,] data) /// Encodes an image into a memory buffer. /// Format-specific parameters. /// - public byte[] ToBytes(string ext = ".png", int[]? prms = null) - { - return ImEncode(ext, prms); - } + public byte[] ToBytes(string ext = ".png", int[]? prms = null) + => ImEncode(ext, prms); /// /// Encodes an image into a memory buffer. @@ -3683,10 +3663,8 @@ public byte[] ToBytes(string ext = ".png", int[]? prms = null) /// Encodes an image into a memory buffer. /// Format-specific parameters. /// - public byte[] ToBytes(string ext = ".png", params ImageEncodingParam[] prms) - { - return ImEncode(ext, prms); - } + public byte[] ToBytes(string ext = ".png", params ImageEncodingParam[] prms) + => ImEncode(ext, prms); /// /// Converts Mat to System.IO.MemoryStream diff --git a/src/OpenCvSharp/Modules/core/Mat/MatOfT.cs b/src/OpenCvSharp/Modules/core/Mat/MatOfT.cs index 8179bd930..3f2e5716e 100644 --- a/src/OpenCvSharp/Modules/core/Mat/MatOfT.cs +++ b/src/OpenCvSharp/Modules/core/Mat/MatOfT.cs @@ -42,7 +42,7 @@ internal Mat(IntPtr ptr) /// /// #pragma warning disable CA1000 // Do not declare static members on generic types - public static new Mat FromNativePointer(IntPtr ptr) + public new static Mat FromNativePointer(IntPtr ptr) #pragma warning restore CA1000 => new(ptr); @@ -401,7 +401,7 @@ public IEnumerator GetEnumerator() public TElem[] ToArray() { if (Rows == 0 || Cols == 0) - return Array.Empty(); + return []; if (!GetArray(out TElem[] array)) throw new OpenCvSharpException("Failed to copy pixel data into managed array"); diff --git a/src/OpenCvSharp/Modules/core/MatExprRowColIndexer.cs b/src/OpenCvSharp/Modules/core/MatExprRowColIndexer.cs index d53d174d1..ab6f665db 100644 --- a/src/OpenCvSharp/Modules/core/MatExprRowColIndexer.cs +++ b/src/OpenCvSharp/Modules/core/MatExprRowColIndexer.cs @@ -15,7 +15,7 @@ public abstract class MatExprRowColIndexer /// /// /// - protected internal MatExprRowColIndexer(MatExpr parent) + internal protected MatExprRowColIndexer(MatExpr parent) { Parent = parent; } diff --git a/src/OpenCvSharp/Modules/core/RNG_MT19937.cs b/src/OpenCvSharp/Modules/core/RNG_MT19937.cs index e6ff2e3d5..4163af78d 100644 --- a/src/OpenCvSharp/Modules/core/RNG_MT19937.cs +++ b/src/OpenCvSharp/Modules/core/RNG_MT19937.cs @@ -126,7 +126,7 @@ public void Seed(uint s) public uint Next() { /* mag01[x] = x * MATRIX_A for x=0,1 */ - uint[] mag01 = { 0x0U, /*MATRIX_A*/ 0x9908b0dfU }; + uint[] mag01 = [0x0U, /*MATRIX_A*/ 0x9908b0dfU]; const uint upperMask = 0x80000000U; const uint lowerMask = 0x7fffffffU; diff --git a/src/OpenCvSharp/Modules/core/Struct/Range.cs b/src/OpenCvSharp/Modules/core/Struct/Range.cs index 7e7a69c5d..a1767d2b1 100644 --- a/src/OpenCvSharp/Modules/core/Struct/Range.cs +++ b/src/OpenCvSharp/Modules/core/Struct/Range.cs @@ -24,5 +24,5 @@ public readonly record struct Range(int Start, int End) /// /// /// - public static Range All => new Range(int.MinValue, int.MaxValue); + public static Range All => new(int.MinValue, int.MaxValue); } diff --git a/src/OpenCvSharp/Modules/core/Struct/Scalar.cs b/src/OpenCvSharp/Modules/core/Struct/Scalar.cs index 34ce6e464..204903e1e 100644 --- a/src/OpenCvSharp/Modules/core/Struct/Scalar.cs +++ b/src/OpenCvSharp/Modules/core/Struct/Scalar.cs @@ -39,9 +39,8 @@ public record struct Scalar(double Val0, double Val1, double Val2, double Val3) /// public double this[int i] { - get - { - return i switch + get => + i switch { 0 => Val0, 1 => Val1, @@ -49,7 +48,6 @@ public double this[int i] 3 => Val3, _ => throw new ArgumentOutOfRangeException(nameof(i)), }; - } set { switch (i) diff --git a/src/OpenCvSharp/Modules/core/Struct/Vec/IVec.cs b/src/OpenCvSharp/Modules/core/Struct/Vec/IVec.cs index 4cf496bad..6a21f61f6 100644 --- a/src/OpenCvSharp/Modules/core/Struct/Vec/IVec.cs +++ b/src/OpenCvSharp/Modules/core/Struct/Vec/IVec.cs @@ -5,8 +5,7 @@ namespace OpenCvSharp; /// /// Vec empty interface /// -public interface IVec -{ } +public interface IVec; /// /// Vec** interface diff --git a/src/OpenCvSharp/Modules/core/Struct/Vec/Vec2b.cs b/src/OpenCvSharp/Modules/core/Struct/Vec/Vec2b.cs index d96f0633f..5e43b6dca 100644 --- a/src/OpenCvSharp/Modules/core/Struct/Vec/Vec2b.cs +++ b/src/OpenCvSharp/Modules/core/Struct/Vec/Vec2b.cs @@ -100,15 +100,13 @@ public Vec2b(byte item0, byte item1) /// public byte this[int i] { - readonly get - { - return i switch + readonly get => + i switch { 0 => Item0, 1 => Item1, _ => throw new ArgumentOutOfRangeException(nameof(i)) }; - } set { switch (i) @@ -133,14 +131,12 @@ readonly get #pragma warning restore 1591 /// - public readonly bool Equals(Vec2b other) - { - return Item0 == other.Item0 && - Item1 == other.Item1; - } + public readonly bool Equals(Vec2b other) => + Item0 == other.Item0 && + Item1 == other.Item1; /// - public override readonly bool Equals(object? obj) + public readonly override bool Equals(object? obj) { if (obj is null) return false; return obj is Vec2b v && Equals(v); @@ -151,23 +147,17 @@ public override readonly bool Equals(object? obj) /// /// /// - public static bool operator ==(Vec2b a, Vec2b b) - { - return a.Equals(b); - } + public static bool operator ==(Vec2b a, Vec2b b) => a.Equals(b); /// /// /// /// /// - public static bool operator !=(Vec2b a, Vec2b b) - { - return !a.Equals(b); - } - + public static bool operator !=(Vec2b a, Vec2b b) => !a.Equals(b); + /// - public override readonly int GetHashCode() + public readonly override int GetHashCode() { #if DOTNET_FRAMEWORK || NETSTANDARD2_0 unchecked @@ -180,8 +170,5 @@ public override readonly int GetHashCode() } /// - public override readonly string ToString() - { - return $"{nameof(Vec2b)} ({Item0}, {Item1})"; - } + public readonly override string ToString() => $"{nameof(Vec2b)} ({Item0}, {Item1})"; } diff --git a/src/OpenCvSharp/Modules/core/Struct/Vec/Vec2d.cs b/src/OpenCvSharp/Modules/core/Struct/Vec/Vec2d.cs index d70219729..1e716487d 100644 --- a/src/OpenCvSharp/Modules/core/Struct/Vec/Vec2d.cs +++ b/src/OpenCvSharp/Modules/core/Struct/Vec/Vec2d.cs @@ -91,15 +91,13 @@ public Vec2d(double item0, double item1) /// public double this[int i] { - readonly get - { - return i switch + readonly get => + i switch { 0 => Item0, 1 => Item1, _ => throw new ArgumentOutOfRangeException(nameof(i)) }; - } set { switch (i) @@ -114,17 +112,14 @@ readonly get #endregion /// - public readonly bool Equals(Vec2d other) - { - return Item0.Equals(other.Item0) && Item1.Equals(other.Item1); - } + public readonly bool Equals(Vec2d other) => Item0.Equals(other.Item0) && Item1.Equals(other.Item1); /// /// /// /// /// - public override readonly bool Equals(object? obj) + public readonly override bool Equals(object? obj) { if (obj is null) return false; return obj is Vec2d v && Equals(v); @@ -135,23 +130,17 @@ public override readonly bool Equals(object? obj) /// /// /// - public static bool operator ==(Vec2d a, Vec2d b) - { - return a.Equals(b); - } + public static bool operator ==(Vec2d a, Vec2d b) => a.Equals(b); /// /// /// /// /// - public static bool operator !=(Vec2d a, Vec2d b) - { - return !(a == b); - } + public static bool operator !=(Vec2d a, Vec2d b) => !(a == b); /// - public override readonly int GetHashCode() + public readonly override int GetHashCode() { #if DOTNET_FRAMEWORK || NETSTANDARD2_0 unchecked @@ -164,8 +153,5 @@ public override readonly int GetHashCode() } /// - public override readonly string ToString() - { - return $"{nameof(Vec2d)} ({Item0}, {Item1})"; - } + public readonly override string ToString() => $"{nameof(Vec2d)} ({Item0}, {Item1})"; } diff --git a/src/OpenCvSharp/Modules/core/Struct/Vec/Vec2f.cs b/src/OpenCvSharp/Modules/core/Struct/Vec/Vec2f.cs index 359a8653d..0f7f2c7d3 100644 --- a/src/OpenCvSharp/Modules/core/Struct/Vec/Vec2f.cs +++ b/src/OpenCvSharp/Modules/core/Struct/Vec/Vec2f.cs @@ -92,15 +92,13 @@ public Vec2f(float item0, float item1) /// public float this[int i] { - readonly get - { - return i switch + readonly get => + i switch { 0 => Item0, 1 => Item1, _ => throw new ArgumentOutOfRangeException(nameof(i)) }; - } set { switch (i) @@ -122,13 +120,10 @@ readonly get #pragma warning restore 1591 /// - public readonly bool Equals(Vec2f other) - { - return Item0.Equals(other.Item0) && Item1.Equals(other.Item1); - } + public readonly bool Equals(Vec2f other) => Item0.Equals(other.Item0) && Item1.Equals(other.Item1); /// - public override readonly bool Equals(object? obj) + public readonly override bool Equals(object? obj) { if (obj is null) return false; return obj is Vec2f v && Equals(v); @@ -139,23 +134,17 @@ public override readonly bool Equals(object? obj) /// /// /// - public static bool operator ==(Vec2f a, Vec2f b) - { - return a.Equals(b); - } + public static bool operator ==(Vec2f a, Vec2f b) => a.Equals(b); /// /// /// /// /// - public static bool operator !=(Vec2f a, Vec2f b) - { - return !(a == b); - } + public static bool operator !=(Vec2f a, Vec2f b) => !(a == b); /// - public override readonly int GetHashCode() + public readonly override int GetHashCode() { #if DOTNET_FRAMEWORK || NETSTANDARD2_0 unchecked @@ -168,8 +157,5 @@ public override readonly int GetHashCode() } /// - public override readonly string ToString() - { - return $"{nameof(Vec2f)} ({Item0}, {Item1})"; - } + public readonly override string ToString() => $"{nameof(Vec2f)} ({Item0}, {Item1})"; } diff --git a/src/OpenCvSharp/Modules/core/Struct/Vec/Vec2i.cs b/src/OpenCvSharp/Modules/core/Struct/Vec/Vec2i.cs index 33dea557a..7e6f20b98 100644 --- a/src/OpenCvSharp/Modules/core/Struct/Vec/Vec2i.cs +++ b/src/OpenCvSharp/Modules/core/Struct/Vec/Vec2i.cs @@ -93,15 +93,13 @@ public Vec2i(int item0, int item1) /// public int this[int i] { - readonly get - { - return i switch + readonly get => + i switch { 0 => Item0, 1 => Item1, _ => throw new ArgumentOutOfRangeException(nameof(i)) }; - } set { switch (i) @@ -123,14 +121,12 @@ readonly get #pragma warning restore 1591 /// - public readonly bool Equals(Vec2i other) - { - return Item0 == other.Item0 && - Item1 == other.Item1; - } + public readonly bool Equals(Vec2i other) => + Item0 == other.Item0 && + Item1 == other.Item1; /// - public override readonly bool Equals(object? obj) + public readonly override bool Equals(object? obj) { if (obj is null) return false; return obj is Vec2i v && Equals(v); @@ -141,23 +137,17 @@ public override readonly bool Equals(object? obj) /// /// /// - public static bool operator ==(Vec2i a, Vec2i b) - { - return a.Equals(b); - } + public static bool operator ==(Vec2i a, Vec2i b) => a.Equals(b); /// /// /// /// /// - public static bool operator !=(Vec2i a, Vec2i b) - { - return !a.Equals(b); - } + public static bool operator !=(Vec2i a, Vec2i b) => !a.Equals(b); /// - public override readonly int GetHashCode() + public readonly override int GetHashCode() { #if DOTNET_FRAMEWORK || NETSTANDARD2_0 unchecked @@ -170,8 +160,5 @@ public override readonly int GetHashCode() } /// - public override readonly string ToString() - { - return $"{nameof(Vec2i)} ({Item0}, {Item1})"; - } + public readonly override string ToString() => $"{nameof(Vec2i)} ({Item0}, {Item1})"; } diff --git a/src/OpenCvSharp/Modules/core/Struct/Vec/Vec2s.cs b/src/OpenCvSharp/Modules/core/Struct/Vec/Vec2s.cs index 09de7197b..ab67d0fa5 100644 --- a/src/OpenCvSharp/Modules/core/Struct/Vec/Vec2s.cs +++ b/src/OpenCvSharp/Modules/core/Struct/Vec/Vec2s.cs @@ -93,15 +93,13 @@ public Vec2s(short item0, short item1) /// public short this[int i] { - readonly get - { - return i switch + readonly get => + i switch { 0 => Item0, 1 => Item1, _ => throw new ArgumentOutOfRangeException(nameof(i)) }; - } set { switch (i) @@ -125,13 +123,10 @@ readonly get #pragma warning restore 1591 /// - public readonly bool Equals(Vec2s other) - { - return Item0 == other.Item0 && Item1 == other.Item1; - } + public readonly bool Equals(Vec2s other) => Item0 == other.Item0 && Item1 == other.Item1; /// - public override readonly bool Equals(object? obj) + public readonly override bool Equals(object? obj) { if (obj is null) return false; return obj is Vec2s v && Equals(v); @@ -142,23 +137,17 @@ public override readonly bool Equals(object? obj) /// /// /// - public static bool operator ==(Vec2s a, Vec2s b) - { - return a.Equals(b); - } + public static bool operator ==(Vec2s a, Vec2s b) => a.Equals(b); /// /// /// /// /// - public static bool operator !=(Vec2s a, Vec2s b) - { - return !a.Equals(b); - } + public static bool operator !=(Vec2s a, Vec2s b) => !a.Equals(b); /// - public override readonly int GetHashCode() + public readonly override int GetHashCode() { #if DOTNET_FRAMEWORK || NETSTANDARD2_0 unchecked @@ -171,8 +160,5 @@ public override readonly int GetHashCode() } /// - public override readonly string ToString() - { - return $"{nameof(Vec2s)} ({Item0}, {Item1})"; - } + public readonly override string ToString() => $"{nameof(Vec2s)} ({Item0}, {Item1})"; } diff --git a/src/OpenCvSharp/Modules/core/Struct/Vec/Vec2w.cs b/src/OpenCvSharp/Modules/core/Struct/Vec/Vec2w.cs index 77f863cc9..284ab61cb 100644 --- a/src/OpenCvSharp/Modules/core/Struct/Vec/Vec2w.cs +++ b/src/OpenCvSharp/Modules/core/Struct/Vec/Vec2w.cs @@ -93,15 +93,13 @@ public Vec2w(ushort item0, ushort item1) /// public ushort this[int i] { - readonly get - { - return i switch + readonly get => + i switch { 0 => Item0, 1 => Item1, _ => throw new ArgumentOutOfRangeException(nameof(i)) }; - } set { switch (i) @@ -126,13 +124,10 @@ readonly get #pragma warning restore 1591 /// - public readonly bool Equals(Vec2w other) - { - return Item0 == other.Item0 && Item1 == other.Item1; - } + public readonly bool Equals(Vec2w other) => Item0 == other.Item0 && Item1 == other.Item1; /// - public override readonly bool Equals(object? obj) + public readonly override bool Equals(object? obj) { if (obj is null) return false; return obj is Vec2w w && Equals(w); @@ -143,23 +138,17 @@ public override readonly bool Equals(object? obj) /// /// /// - public static bool operator ==(Vec2w a, Vec2w b) - { - return a.Equals(b); - } + public static bool operator ==(Vec2w a, Vec2w b) => a.Equals(b); /// /// /// /// /// - public static bool operator !=(Vec2w a, Vec2w b) - { - return !a.Equals(b); - } + public static bool operator !=(Vec2w a, Vec2w b) => !a.Equals(b); /// - public override readonly int GetHashCode() + public readonly override int GetHashCode() { #if DOTNET_FRAMEWORK || NETSTANDARD2_0 unchecked @@ -172,8 +161,5 @@ public override readonly int GetHashCode() } /// - public override readonly string ToString() - { - return $"{nameof(Vec2w)} ({Item0}, {Item1})"; - } + public readonly override string ToString() => $"{nameof(Vec2w)} ({Item0}, {Item1})"; } diff --git a/src/OpenCvSharp/Modules/core/Struct/Vec/Vec3b.cs b/src/OpenCvSharp/Modules/core/Struct/Vec/Vec3b.cs index 11ba84bf3..8de6ab418 100644 --- a/src/OpenCvSharp/Modules/core/Struct/Vec/Vec3b.cs +++ b/src/OpenCvSharp/Modules/core/Struct/Vec/Vec3b.cs @@ -105,16 +105,14 @@ public Vec3b(byte item0, byte item1, byte item2) /// public byte this[int i] { - readonly get - { - return i switch + readonly get => + i switch { 0 => Item0, 1 => Item1, 2 => Item2, _ => throw new ArgumentOutOfRangeException(nameof(i)) }; - } set { switch (i) @@ -140,15 +138,13 @@ readonly get #pragma warning restore 1591 /// - public readonly bool Equals(Vec3b other) - { - return Item0 == other.Item0 && - Item1 == other.Item1 && - Item2 == other.Item2; - } + public readonly bool Equals(Vec3b other) => + Item0 == other.Item0 && + Item1 == other.Item1 && + Item2 == other.Item2; /// - public override readonly bool Equals(object? obj) + public readonly override bool Equals(object? obj) { if (obj is null) return false; return obj is Vec3b b && Equals(b); @@ -159,23 +155,17 @@ public override readonly bool Equals(object? obj) /// /// /// - public static bool operator ==(Vec3b a, Vec3b b) - { - return a.Equals(b); - } + public static bool operator ==(Vec3b a, Vec3b b) => a.Equals(b); /// /// /// /// /// - public static bool operator !=(Vec3b a, Vec3b b) - { - return !(a == b); - } + public static bool operator !=(Vec3b a, Vec3b b) => !(a == b); /// - public override readonly int GetHashCode() + public readonly override int GetHashCode() { #if DOTNET_FRAMEWORK || NETSTANDARD2_0 unchecked @@ -191,8 +181,5 @@ public override readonly int GetHashCode() } /// - public override readonly string ToString() - { - return $"{nameof(Vec3b)} ({Item0}, {Item1}, {Item2})"; - } + public readonly override string ToString() => $"{nameof(Vec3b)} ({Item0}, {Item1}, {Item2})"; } diff --git a/src/OpenCvSharp/Modules/core/Struct/Vec/Vec3d.cs b/src/OpenCvSharp/Modules/core/Struct/Vec/Vec3d.cs index 8fdce7de0..ebe66f923 100644 --- a/src/OpenCvSharp/Modules/core/Struct/Vec/Vec3d.cs +++ b/src/OpenCvSharp/Modules/core/Struct/Vec/Vec3d.cs @@ -104,16 +104,14 @@ public Vec3d(double item0, double item1, double item2) /// public double this[int i] { - readonly get - { - return i switch + readonly get => + i switch { 0 => Item0, 1 => Item1, 2 => Item2, _ => throw new ArgumentOutOfRangeException(nameof(i)) }; - } set { switch (i) @@ -129,13 +127,10 @@ readonly get #endregion /// - public readonly bool Equals(Vec3d other) - { - return Item0.Equals(other.Item0) && Item1.Equals(other.Item1) && Item2.Equals(other.Item2); - } + public readonly bool Equals(Vec3d other) => Item0.Equals(other.Item0) && Item1.Equals(other.Item1) && Item2.Equals(other.Item2); /// - public override readonly bool Equals(object? obj) + public readonly override bool Equals(object? obj) { if (obj is null) return false; return obj is Vec3d v && Equals(v); @@ -146,23 +141,17 @@ public override readonly bool Equals(object? obj) /// /// /// - public static bool operator ==(Vec3d a, Vec3d b) - { - return a.Equals(b); - } + public static bool operator ==(Vec3d a, Vec3d b) => a.Equals(b); /// /// /// /// /// - public static bool operator !=(Vec3d a, Vec3d b) - { - return !(a == b); - } + public static bool operator !=(Vec3d a, Vec3d b) => !(a == b); /// - public override readonly int GetHashCode() + public readonly override int GetHashCode() { #if DOTNET_FRAMEWORK || NETSTANDARD2_0 unchecked @@ -178,8 +167,5 @@ public override readonly int GetHashCode() } /// - public override readonly string ToString() - { - return $"{nameof(Vec3d)} ({Item0}, {Item1}, {Item2})"; - } + public readonly override string ToString() => $"{nameof(Vec3d)} ({Item0}, {Item1}, {Item2})"; } diff --git a/src/OpenCvSharp/Modules/core/Struct/Vec/Vec3f.cs b/src/OpenCvSharp/Modules/core/Struct/Vec/Vec3f.cs index 0e59d68e5..e4f068589 100644 --- a/src/OpenCvSharp/Modules/core/Struct/Vec/Vec3f.cs +++ b/src/OpenCvSharp/Modules/core/Struct/Vec/Vec3f.cs @@ -104,16 +104,14 @@ public Vec3f(float item0, float item1, float item2) /// public float this[int i] { - readonly get - { - return i switch + readonly get => + i switch { 0 => Item0, 1 => Item1, 2 => Item2, _ => throw new ArgumentOutOfRangeException(nameof(i)) }; - } set { switch (i) @@ -136,13 +134,10 @@ readonly get #pragma warning restore 1591 /// - public readonly bool Equals(Vec3f other) - { - return Item0.Equals(other.Item0) && Item1.Equals(other.Item1) && Item2.Equals(other.Item2); - } + public readonly bool Equals(Vec3f other) => Item0.Equals(other.Item0) && Item1.Equals(other.Item1) && Item2.Equals(other.Item2); /// - public override readonly bool Equals(object? obj) + public readonly override bool Equals(object? obj) { if (obj is null) return false; return obj is Vec3f v && Equals(v); @@ -153,23 +148,17 @@ public override readonly bool Equals(object? obj) /// /// /// - public static bool operator ==(Vec3f a, Vec3f b) - { - return a.Equals(b); - } + public static bool operator ==(Vec3f a, Vec3f b) => a.Equals(b); /// /// /// /// /// - public static bool operator !=(Vec3f a, Vec3f b) - { - return !(a == b); - } + public static bool operator !=(Vec3f a, Vec3f b) => !(a == b); /// - public override readonly int GetHashCode() + public readonly override int GetHashCode() { #if DOTNET_FRAMEWORK || NETSTANDARD2_0 unchecked @@ -185,8 +174,5 @@ public override readonly int GetHashCode() } /// - public override readonly string ToString() - { - return $"{nameof(Vec3f)} ({Item0}, {Item1}, {Item2})"; - } + public readonly override string ToString() => $"{nameof(Vec3f)} ({Item0}, {Item1}, {Item2})"; } diff --git a/src/OpenCvSharp/Modules/core/Struct/Vec/Vec3i.cs b/src/OpenCvSharp/Modules/core/Struct/Vec/Vec3i.cs index 92c73b415..6a1ae0d34 100644 --- a/src/OpenCvSharp/Modules/core/Struct/Vec/Vec3i.cs +++ b/src/OpenCvSharp/Modules/core/Struct/Vec/Vec3i.cs @@ -106,16 +106,14 @@ public Vec3i(int item0, int item1, int item2) /// public int this[int i] { - readonly get - { - return i switch + readonly get => + i switch { 0 => Item0, 1 => Item1, 2 => Item2, _ => throw new ArgumentOutOfRangeException(nameof(i)) }; - } set { switch (i) @@ -138,15 +136,13 @@ readonly get #pragma warning restore 1591 /// - public readonly bool Equals(Vec3i other) - { - return Item0 == other.Item0 && - Item1 == other.Item1 && - Item2 == other.Item2; - } + public readonly bool Equals(Vec3i other) => + Item0 == other.Item0 && + Item1 == other.Item1 && + Item2 == other.Item2; /// - public override readonly bool Equals(object? obj) + public readonly override bool Equals(object? obj) { if (obj is null) return false; return obj is Vec3i v && Equals(v); @@ -157,23 +153,17 @@ public override readonly bool Equals(object? obj) /// /// /// - public static bool operator ==(Vec3i a, Vec3i b) - { - return a.Equals(b); - } + public static bool operator ==(Vec3i a, Vec3i b) => a.Equals(b); /// /// /// /// /// - public static bool operator !=(Vec3i a, Vec3i b) - { - return !a.Equals(b); - } + public static bool operator !=(Vec3i a, Vec3i b) => !a.Equals(b); /// - public override readonly int GetHashCode() + public readonly override int GetHashCode() { #if DOTNET_FRAMEWORK || NETSTANDARD2_0 unchecked @@ -189,8 +179,5 @@ public override readonly int GetHashCode() } /// - public override readonly string ToString() - { - return $"{nameof(Vec3i)} ({Item0}, {Item1}, {Item2})"; - } + public readonly override string ToString() => $"{nameof(Vec3i)} ({Item0}, {Item1}, {Item2})"; } diff --git a/src/OpenCvSharp/Modules/core/Struct/Vec/Vec3s.cs b/src/OpenCvSharp/Modules/core/Struct/Vec/Vec3s.cs index 3c2fa5093..1aec6c785 100644 --- a/src/OpenCvSharp/Modules/core/Struct/Vec/Vec3s.cs +++ b/src/OpenCvSharp/Modules/core/Struct/Vec/Vec3s.cs @@ -105,16 +105,14 @@ public Vec3s(short item0, short item1, short item2) /// public short this[int i] { - readonly get - { - return i switch + readonly get => + i switch { 0 => Item0, 1 => Item1, 2 => Item2, _ => throw new ArgumentOutOfRangeException(nameof(i)) }; - } set { switch (i) @@ -140,15 +138,13 @@ readonly get #pragma warning restore 1591 /// - public readonly bool Equals(Vec3s other) - { - return Item0 == other.Item0 && - Item1 == other.Item1 && - Item2 == other.Item2; - } + public readonly bool Equals(Vec3s other) => + Item0 == other.Item0 && + Item1 == other.Item1 && + Item2 == other.Item2; /// - public override readonly bool Equals(object? obj) + public readonly override bool Equals(object? obj) { if (obj is null) return false; return obj is Vec3s v && Equals(v); @@ -159,23 +155,17 @@ public override readonly bool Equals(object? obj) /// /// /// - public static bool operator ==(Vec3s a, Vec3s b) - { - return a.Equals(b); - } + public static bool operator ==(Vec3s a, Vec3s b) => a.Equals(b); /// /// /// /// /// - public static bool operator !=(Vec3s a, Vec3s b) - { - return !a.Equals(b); - } + public static bool operator !=(Vec3s a, Vec3s b) => !a.Equals(b); /// - public override readonly int GetHashCode() + public readonly override int GetHashCode() { #if DOTNET_FRAMEWORK || NETSTANDARD2_0 unchecked @@ -191,8 +181,5 @@ public override readonly int GetHashCode() } /// - public override readonly string ToString() - { - return $"{nameof(Vec3s)} ({Item0}, {Item1}, {Item2})"; - } + public readonly override string ToString() => $"{nameof(Vec3s)} ({Item0}, {Item1}, {Item2})"; } diff --git a/src/OpenCvSharp/Modules/core/Struct/Vec/Vec3w.cs b/src/OpenCvSharp/Modules/core/Struct/Vec/Vec3w.cs index d4934a454..0dfd4ca3e 100644 --- a/src/OpenCvSharp/Modules/core/Struct/Vec/Vec3w.cs +++ b/src/OpenCvSharp/Modules/core/Struct/Vec/Vec3w.cs @@ -106,16 +106,14 @@ public Vec3w(ushort item0, ushort item1, ushort item2) /// public ushort this[int i] { - readonly get - { - return i switch + readonly get => + i switch { 0 => Item0, 1 => Item1, 2 => Item2, _ => throw new ArgumentOutOfRangeException(nameof(i)) }; - } set { switch (i) @@ -141,15 +139,13 @@ readonly get #pragma warning restore 1591 /// - public readonly bool Equals(Vec3w other) - { - return Item0 == other.Item0 && - Item1 == other.Item1 && - Item2 == other.Item2; - } + public readonly bool Equals(Vec3w other) => + Item0 == other.Item0 && + Item1 == other.Item1 && + Item2 == other.Item2; /// - public override readonly bool Equals(object? obj) + public readonly override bool Equals(object? obj) { if (obj is null) return false; return obj is Vec3w v && Equals(v); @@ -160,23 +156,17 @@ public override readonly bool Equals(object? obj) /// /// /// - public static bool operator ==(Vec3w a, Vec3w b) - { - return a.Equals(b); - } + public static bool operator ==(Vec3w a, Vec3w b) => a.Equals(b); /// /// /// /// /// - public static bool operator !=(Vec3w a, Vec3w b) - { - return !a.Equals(b); - } + public static bool operator !=(Vec3w a, Vec3w b) => !a.Equals(b); /// - public override readonly int GetHashCode() + public readonly override int GetHashCode() { #if DOTNET_FRAMEWORK || NETSTANDARD2_0 unchecked @@ -192,8 +182,5 @@ public override readonly int GetHashCode() } /// - public override readonly string ToString() - { - return $"{nameof(Vec3w)} ({Item0}, {Item1}, {Item2})"; - } + public readonly override string ToString() => $"{nameof(Vec3w)} ({Item0}, {Item1}, {Item2})"; } diff --git a/src/OpenCvSharp/Modules/core/Struct/Vec/Vec4b.cs b/src/OpenCvSharp/Modules/core/Struct/Vec/Vec4b.cs index 6ab4311e1..49ec3c9d8 100644 --- a/src/OpenCvSharp/Modules/core/Struct/Vec/Vec4b.cs +++ b/src/OpenCvSharp/Modules/core/Struct/Vec/Vec4b.cs @@ -117,9 +117,8 @@ public Vec4b(byte item0, byte item1, byte item2, byte item3) /// public byte this[int i] { - readonly get - { - return i switch + readonly get => + i switch { 0 => Item0, 1 => Item1, @@ -127,7 +126,6 @@ readonly get 3 => Item3, _ => throw new ArgumentOutOfRangeException(nameof(i)) }; - } set { switch (i) @@ -154,16 +152,14 @@ readonly get #pragma warning restore 1591 /// - public readonly bool Equals(Vec4b other) - { - return Item0 == other.Item0 && - Item1 == other.Item1 && - Item2 == other.Item2 && - Item3 == other.Item3; - } + public readonly bool Equals(Vec4b other) => + Item0 == other.Item0 && + Item1 == other.Item1 && + Item2 == other.Item2 && + Item3 == other.Item3; /// - public override readonly bool Equals(object? obj) + public readonly override bool Equals(object? obj) { if (obj is null) return false; return obj is Vec4b v && Equals(v); @@ -174,23 +170,17 @@ public override readonly bool Equals(object? obj) /// /// /// - public static bool operator ==(Vec4b a, Vec4b b) - { - return a.Equals(b); - } + public static bool operator ==(Vec4b a, Vec4b b) => a.Equals(b); /// /// /// /// /// - public static bool operator !=(Vec4b a, Vec4b b) - { - return !(a == b); - } + public static bool operator !=(Vec4b a, Vec4b b) => !(a == b); /// - public override readonly int GetHashCode() + public readonly override int GetHashCode() { #if DOTNET_FRAMEWORK || NETSTANDARD2_0 unchecked @@ -207,8 +197,5 @@ public override readonly int GetHashCode() } /// - public override readonly string ToString() - { - return $"{nameof(Vec4b)} ({Item0}, {Item1}, {Item2}, {Item3})"; - } + public readonly override string ToString() => $"{nameof(Vec4b)} ({Item0}, {Item1}, {Item2}, {Item3})"; } diff --git a/src/OpenCvSharp/Modules/core/Struct/Vec/Vec4d.cs b/src/OpenCvSharp/Modules/core/Struct/Vec/Vec4d.cs index b0474c590..fadee7752 100644 --- a/src/OpenCvSharp/Modules/core/Struct/Vec/Vec4d.cs +++ b/src/OpenCvSharp/Modules/core/Struct/Vec/Vec4d.cs @@ -116,9 +116,8 @@ public Vec4d(double item0, double item1, double item2, double item3) /// public double this[int i] { - readonly get - { - return i switch + readonly get => + i switch { 0 => Item0, 1 => Item1, @@ -126,7 +125,6 @@ readonly get 3 => Item3, _ => throw new ArgumentOutOfRangeException(nameof(i)) }; - } set { switch (i) @@ -143,16 +141,14 @@ readonly get #endregion /// - public readonly bool Equals(Vec4d other) - { - return Item0.Equals(other.Item0) && - Item1.Equals(other.Item1) && - Item2.Equals(other.Item2) && - Item3.Equals(other.Item3); - } + public readonly bool Equals(Vec4d other) => + Item0.Equals(other.Item0) && + Item1.Equals(other.Item1) && + Item2.Equals(other.Item2) && + Item3.Equals(other.Item3); /// - public override readonly bool Equals(object? obj) + public readonly override bool Equals(object? obj) { if (obj is null) return false; return obj is Vec4d v && Equals(v); @@ -163,23 +159,17 @@ public override readonly bool Equals(object? obj) /// /// /// - public static bool operator ==(Vec4d a, Vec4d b) - { - return a.Equals(b); - } + public static bool operator ==(Vec4d a, Vec4d b) => a.Equals(b); /// /// /// /// /// - public static bool operator !=(Vec4d a, Vec4d b) - { - return !(a == b); - } + public static bool operator !=(Vec4d a, Vec4d b) => !(a == b); /// - public override readonly int GetHashCode() + public readonly override int GetHashCode() { #if DOTNET_FRAMEWORK || NETSTANDARD2_0 unchecked @@ -196,8 +186,5 @@ public override readonly int GetHashCode() } /// - public override readonly string ToString() - { - return $"{nameof(Vec4d)} ({Item0}, {Item1}, {Item2}, {Item3})"; - } + public readonly override string ToString() => $"{nameof(Vec4d)} ({Item0}, {Item1}, {Item2}, {Item3})"; } diff --git a/src/OpenCvSharp/Modules/core/Struct/Vec/Vec4f.cs b/src/OpenCvSharp/Modules/core/Struct/Vec/Vec4f.cs index 75e87e08b..98572995a 100644 --- a/src/OpenCvSharp/Modules/core/Struct/Vec/Vec4f.cs +++ b/src/OpenCvSharp/Modules/core/Struct/Vec/Vec4f.cs @@ -117,9 +117,8 @@ public Vec4f(float item0, float item1, float item2, float item3) /// public float this[int i] { - readonly get - { - return i switch + readonly get => + i switch { 0 => Item0, 1 => Item1, @@ -127,7 +126,6 @@ readonly get 3 => Item3, _ => throw new ArgumentOutOfRangeException(nameof(i)) }; - } set { switch (i) @@ -151,16 +149,14 @@ readonly get #pragma warning restore 1591 /// - public readonly bool Equals(Vec4f other) - { - return Item0.Equals(other.Item0) && - Item1.Equals(other.Item1) && - Item2.Equals(other.Item2) && - Item3.Equals(other.Item3); - } + public readonly bool Equals(Vec4f other) => + Item0.Equals(other.Item0) && + Item1.Equals(other.Item1) && + Item2.Equals(other.Item2) && + Item3.Equals(other.Item3); /// - public override readonly bool Equals(object? obj) + public readonly override bool Equals(object? obj) { if (obj is null) return false; return obj is Vec4f v && Equals(v); @@ -171,23 +167,17 @@ public override readonly bool Equals(object? obj) /// /// /// - public static bool operator ==(Vec4f a, Vec4f b) - { - return a.Equals(b); - } + public static bool operator ==(Vec4f a, Vec4f b) => a.Equals(b); /// /// /// /// /// - public static bool operator !=(Vec4f a, Vec4f b) - { - return !(a == b); - } + public static bool operator !=(Vec4f a, Vec4f b) => !(a == b); /// - public override readonly int GetHashCode() + public readonly override int GetHashCode() { #if DOTNET_FRAMEWORK || NETSTANDARD2_0 unchecked @@ -204,8 +194,5 @@ public override readonly int GetHashCode() } /// - public override readonly string ToString() - { - return $"{nameof(Vec4f)} ({Item0}, {Item1}, {Item2}, {Item3})"; - } + public readonly override string ToString() => $"{nameof(Vec4f)} ({Item0}, {Item1}, {Item2}, {Item3})"; } diff --git a/src/OpenCvSharp/Modules/core/Struct/Vec/Vec4i.cs b/src/OpenCvSharp/Modules/core/Struct/Vec/Vec4i.cs index 2df781c5d..a935c1cb3 100644 --- a/src/OpenCvSharp/Modules/core/Struct/Vec/Vec4i.cs +++ b/src/OpenCvSharp/Modules/core/Struct/Vec/Vec4i.cs @@ -118,9 +118,8 @@ public Vec4i(int item0, int item1, int item2, int item3) /// public int this[int i] { - readonly get - { - return i switch + readonly get => + i switch { 0 => Item0, 1 => Item1, @@ -128,7 +127,6 @@ readonly get 3 => Item3, _ => throw new ArgumentOutOfRangeException(nameof(i)) }; - } set { switch (i) @@ -152,16 +150,14 @@ readonly get #pragma warning restore 1591 /// - public readonly bool Equals(Vec4i other) - { - return Item0 == other.Item0 && - Item1 == other.Item1 && - Item2 == other.Item2 && - Item3 == other.Item3; - } + public readonly bool Equals(Vec4i other) => + Item0 == other.Item0 && + Item1 == other.Item1 && + Item2 == other.Item2 && + Item3 == other.Item3; /// - public override readonly bool Equals(object? obj) + public readonly override bool Equals(object? obj) { if (obj is null) return false; return obj is Vec4i v && Equals(v); @@ -172,23 +168,17 @@ public override readonly bool Equals(object? obj) /// /// /// - public static bool operator ==(Vec4i a, Vec4i b) - { - return a.Equals(b); - } + public static bool operator ==(Vec4i a, Vec4i b) => a.Equals(b); /// /// /// /// /// - public static bool operator !=(Vec4i a, Vec4i b) - { - return !a.Equals(b); - } + public static bool operator !=(Vec4i a, Vec4i b) => !a.Equals(b); /// - public override readonly int GetHashCode() + public readonly override int GetHashCode() { #if DOTNET_FRAMEWORK || NETSTANDARD2_0 unchecked @@ -205,8 +195,5 @@ public override readonly int GetHashCode() } /// - public override readonly string ToString() - { - return $"{nameof(Vec4i)} ({Item0}, {Item1}, {Item2}, {Item3})"; - } + public readonly override string ToString() => $"{nameof(Vec4i)} ({Item0}, {Item1}, {Item2}, {Item3})"; } diff --git a/src/OpenCvSharp/Modules/core/Struct/Vec/Vec4s.cs b/src/OpenCvSharp/Modules/core/Struct/Vec/Vec4s.cs index dc7f8d417..b5da3ead7 100644 --- a/src/OpenCvSharp/Modules/core/Struct/Vec/Vec4s.cs +++ b/src/OpenCvSharp/Modules/core/Struct/Vec/Vec4s.cs @@ -118,9 +118,8 @@ public Vec4s(short item0, short item1, short item2, short item3) /// public short this[int i] { - readonly get - { - return i switch + readonly get => + i switch { 0 => Item0, 1 => Item1, @@ -128,7 +127,6 @@ readonly get 3 => Item3, _ => throw new ArgumentOutOfRangeException(nameof(i)) }; - } set { switch (i) @@ -156,16 +154,14 @@ readonly get /// - public readonly bool Equals(Vec4s other) - { - return Item0 == other.Item0 && - Item1 == other.Item1 && - Item2 == other.Item2 && - Item3 == other.Item3; - } + public readonly bool Equals(Vec4s other) => + Item0 == other.Item0 && + Item1 == other.Item1 && + Item2 == other.Item2 && + Item3 == other.Item3; /// - public override readonly bool Equals(object? obj) + public readonly override bool Equals(object? obj) { if (obj is null) return false; return obj is Vec4s v && Equals(v); @@ -176,23 +172,17 @@ public override readonly bool Equals(object? obj) /// /// /// - public static bool operator ==(Vec4s a, Vec4s b) - { - return a.Equals(b); - } + public static bool operator ==(Vec4s a, Vec4s b) => a.Equals(b); /// /// /// /// /// - public static bool operator !=(Vec4s a, Vec4s b) - { - return !a.Equals(b); - } + public static bool operator !=(Vec4s a, Vec4s b) => !a.Equals(b); /// - public override readonly int GetHashCode() + public readonly override int GetHashCode() { #if DOTNET_FRAMEWORK || NETSTANDARD2_0 unchecked @@ -209,8 +199,5 @@ public override readonly int GetHashCode() } /// - public override readonly string ToString() - { - return $"{nameof(Vec4s)} ({Item0}, {Item1}, {Item2}, {Item3})"; - } + public readonly override string ToString() => $"{nameof(Vec4s)} ({Item0}, {Item1}, {Item2}, {Item3})"; } diff --git a/src/OpenCvSharp/Modules/core/Struct/Vec/Vec4w.cs b/src/OpenCvSharp/Modules/core/Struct/Vec/Vec4w.cs index 573decb1a..7603aba36 100644 --- a/src/OpenCvSharp/Modules/core/Struct/Vec/Vec4w.cs +++ b/src/OpenCvSharp/Modules/core/Struct/Vec/Vec4w.cs @@ -118,9 +118,8 @@ public Vec4w(ushort item0, ushort item1, ushort item2, ushort item3) /// public ushort this[int i] { - readonly get - { - return i switch + readonly get => + i switch { 0 => Item0, 1 => Item1, @@ -128,7 +127,6 @@ readonly get 3 => Item3, _ => throw new ArgumentOutOfRangeException(nameof(i)) }; - } set { switch (i) @@ -155,16 +153,14 @@ readonly get #pragma warning restore 1591 /// - public readonly bool Equals(Vec4w other) - { - return Item0 == other.Item0 && - Item1 == other.Item1 && - Item2 == other.Item2 && - Item3 == other.Item3; - } + public readonly bool Equals(Vec4w other) => + Item0 == other.Item0 && + Item1 == other.Item1 && + Item2 == other.Item2 && + Item3 == other.Item3; /// - public override readonly bool Equals(object? obj) + public readonly override bool Equals(object? obj) { if (obj is null) return false; return obj is Vec4w v && Equals(v); @@ -175,23 +171,17 @@ public override readonly bool Equals(object? obj) /// /// /// - public static bool operator ==(Vec4w a, Vec4w b) - { - return a.Equals(b); - } + public static bool operator ==(Vec4w a, Vec4w b) => a.Equals(b); /// /// /// /// /// - public static bool operator !=(Vec4w a, Vec4w b) - { - return !a.Equals(b); - } + public static bool operator !=(Vec4w a, Vec4w b) => !a.Equals(b); /// - public override readonly int GetHashCode() + public readonly override int GetHashCode() { #if DOTNET_FRAMEWORK || NETSTANDARD2_0 unchecked @@ -208,8 +198,5 @@ public override readonly int GetHashCode() } /// - public override readonly string ToString() - { - return $"{nameof(Vec4w)} ({Item0}, {Item1}, {Item2}, {Item3})"; - } + public readonly override string ToString() => $"{nameof(Vec4w)} ({Item0}, {Item1}, {Item2}, {Item3})"; } diff --git a/src/OpenCvSharp/Modules/core/Struct/Vec/Vec6b.cs b/src/OpenCvSharp/Modules/core/Struct/Vec/Vec6b.cs index b3fda6ebd..8171fdfac 100644 --- a/src/OpenCvSharp/Modules/core/Struct/Vec/Vec6b.cs +++ b/src/OpenCvSharp/Modules/core/Struct/Vec/Vec6b.cs @@ -141,9 +141,8 @@ public Vec6b(byte item0, byte item1, byte item2, byte item3, byte item4, byte it /// public byte this[int i] { - readonly get - { - return i switch + readonly get => + i switch { 0 => Item0, 1 => Item1, @@ -153,7 +152,6 @@ readonly get 5 => Item5, _ => throw new ArgumentOutOfRangeException(nameof(i)) }; - } set { switch (i) @@ -182,18 +180,16 @@ readonly get #pragma warning restore 1591 /// - public readonly bool Equals(Vec6b other) - { - return Item0 == other.Item0 && - Item1 == other.Item1 && - Item2 == other.Item2 && - Item3 == other.Item3 && - Item4 == other.Item4 && - Item5 == other.Item5; - } + public readonly bool Equals(Vec6b other) => + Item0 == other.Item0 && + Item1 == other.Item1 && + Item2 == other.Item2 && + Item3 == other.Item3 && + Item4 == other.Item4 && + Item5 == other.Item5; /// - public override readonly bool Equals(object? obj) + public readonly override bool Equals(object? obj) { if (obj is null) return false; return obj is Vec6b v && Equals(v); @@ -204,23 +200,17 @@ public override readonly bool Equals(object? obj) /// /// /// - public static bool operator ==(Vec6b a, Vec6b b) - { - return a.Equals(b); - } + public static bool operator ==(Vec6b a, Vec6b b) => a.Equals(b); /// /// /// /// /// - public static bool operator !=(Vec6b a, Vec6b b) - { - return !(a == b); - } + public static bool operator !=(Vec6b a, Vec6b b) => !(a == b); /// - public override readonly int GetHashCode() + public readonly override int GetHashCode() { #if DOTNET_FRAMEWORK || NETSTANDARD2_0 unchecked @@ -239,8 +229,6 @@ public override readonly int GetHashCode() } /// - public override readonly string ToString() - { - return $"{nameof(Vec6b)} ({Item0}, {Item1}, {Item2}, {Item3}, {Item4}, {Item5})"; - } + public readonly override string ToString() + => $"{nameof(Vec6b)} ({Item0}, {Item1}, {Item2}, {Item3}, {Item4}, {Item5})"; } diff --git a/src/OpenCvSharp/Modules/core/Struct/Vec/Vec6d.cs b/src/OpenCvSharp/Modules/core/Struct/Vec/Vec6d.cs index f83602a36..b78b8b3ff 100644 --- a/src/OpenCvSharp/Modules/core/Struct/Vec/Vec6d.cs +++ b/src/OpenCvSharp/Modules/core/Struct/Vec/Vec6d.cs @@ -140,9 +140,8 @@ public Vec6d(double item0, double item1, double item2, double item3, double item /// public double this[int i] { - readonly get - { - return i switch + readonly get => + i switch { 0 => Item0, 1 => Item1, @@ -152,7 +151,6 @@ readonly get 5 => Item5, _ => throw new ArgumentOutOfRangeException(nameof(i)) }; - } set { switch (i) @@ -171,18 +169,16 @@ readonly get #endregion /// - public readonly bool Equals(Vec6d other) - { - return Item0.Equals(other.Item0) && - Item1.Equals(other.Item1) && - Item2.Equals(other.Item2) && - Item3.Equals(other.Item3) && - Item4.Equals(other.Item4) && - Item5.Equals(other.Item5); - } + public readonly bool Equals(Vec6d other) => + Item0.Equals(other.Item0) && + Item1.Equals(other.Item1) && + Item2.Equals(other.Item2) && + Item3.Equals(other.Item3) && + Item4.Equals(other.Item4) && + Item5.Equals(other.Item5); /// - public override readonly bool Equals(object? obj) + public readonly override bool Equals(object? obj) { if (obj is null) return false; return obj is Vec6d v && Equals(v); @@ -193,23 +189,17 @@ public override readonly bool Equals(object? obj) /// /// /// - public static bool operator ==(Vec6d a, Vec6d b) - { - return a.Equals(b); - } + public static bool operator ==(Vec6d a, Vec6d b) => a.Equals(b); /// /// /// /// /// - public static bool operator !=(Vec6d a, Vec6d b) - { - return !(a == b); - } + public static bool operator !=(Vec6d a, Vec6d b) => !(a == b); /// - public override readonly int GetHashCode() + public readonly override int GetHashCode() { #if DOTNET_FRAMEWORK || NETSTANDARD2_0 unchecked @@ -228,8 +218,5 @@ public override readonly int GetHashCode() } /// - public override readonly string ToString() - { - return $"{nameof(Vec6d)} ({Item0}, {Item1}, {Item2}, {Item3}, {Item4}, {Item5})"; - } + public readonly override string ToString() => $"{nameof(Vec6d)} ({Item0}, {Item1}, {Item2}, {Item3}, {Item4}, {Item5})"; } diff --git a/src/OpenCvSharp/Modules/core/Struct/Vec/Vec6f.cs b/src/OpenCvSharp/Modules/core/Struct/Vec/Vec6f.cs index c8987c734..5ceb4edbf 100644 --- a/src/OpenCvSharp/Modules/core/Struct/Vec/Vec6f.cs +++ b/src/OpenCvSharp/Modules/core/Struct/Vec/Vec6f.cs @@ -141,9 +141,8 @@ public Vec6f(float item0, float item1, float item2, float item3, float item4, fl /// public float this[int i] { - readonly get - { - return i switch + readonly get => + i switch { 0 => Item0, 1 => Item1, @@ -153,7 +152,6 @@ readonly get 5 => Item5, _ => throw new ArgumentOutOfRangeException(nameof(i)) }; - } set { switch (i) @@ -179,18 +177,16 @@ readonly get #pragma warning restore 1591 /// - public readonly bool Equals(Vec6f other) - { - return Item0.Equals(other.Item0) && - Item1.Equals(other.Item1) && - Item2.Equals(other.Item2) && - Item3.Equals(other.Item3) && - Item4.Equals(other.Item4) && - Item5.Equals(other.Item5); - } + public readonly bool Equals(Vec6f other) => + Item0.Equals(other.Item0) && + Item1.Equals(other.Item1) && + Item2.Equals(other.Item2) && + Item3.Equals(other.Item3) && + Item4.Equals(other.Item4) && + Item5.Equals(other.Item5); /// - public override readonly bool Equals(object? obj) + public readonly override bool Equals(object? obj) { if (obj is null) return false; return obj is Vec6f v && Equals(v); @@ -201,23 +197,17 @@ public override readonly bool Equals(object? obj) /// /// /// - public static bool operator ==(Vec6f a, Vec6f b) - { - return a.Equals(b); - } + public static bool operator ==(Vec6f a, Vec6f b) => a.Equals(b); /// /// /// /// /// - public static bool operator !=(Vec6f a, Vec6f b) - { - return !a.Equals(b); - } + public static bool operator !=(Vec6f a, Vec6f b) => !a.Equals(b); /// - public override readonly int GetHashCode() + public readonly override int GetHashCode() { #if DOTNET_FRAMEWORK || NETSTANDARD2_0 unchecked @@ -236,8 +226,5 @@ public override readonly int GetHashCode() } /// - public override readonly string ToString() - { - return $"{nameof(Vec6f)} ({Item0}, {Item1}, {Item2}, {Item3}, {Item4}, {Item5})"; - } + public readonly override string ToString() => $"{nameof(Vec6f)} ({Item0}, {Item1}, {Item2}, {Item3}, {Item4}, {Item5})"; } diff --git a/src/OpenCvSharp/Modules/core/Struct/Vec/Vec6i.cs b/src/OpenCvSharp/Modules/core/Struct/Vec/Vec6i.cs index 7a925c720..008066543 100644 --- a/src/OpenCvSharp/Modules/core/Struct/Vec/Vec6i.cs +++ b/src/OpenCvSharp/Modules/core/Struct/Vec/Vec6i.cs @@ -142,9 +142,8 @@ public Vec6i(int item0, int item1, int item2, int item3, int item4, int item5) /// public int this[int i] { - readonly get - { - return i switch + readonly get => + i switch { 0 => Item0, 1 => Item1, @@ -154,7 +153,6 @@ readonly get 5 => Item5, _ => throw new ArgumentOutOfRangeException(nameof(i)) }; - } set { switch (i) @@ -180,18 +178,16 @@ readonly get #pragma warning restore 1591 /// - public readonly bool Equals(Vec6i other) - { - return Item0 == other.Item0 && - Item1 == other.Item1 && - Item2 == other.Item2 && - Item3 == other.Item3 && - Item4 == other.Item4 && - Item5 == other.Item5; - } + public readonly bool Equals(Vec6i other) => + Item0 == other.Item0 && + Item1 == other.Item1 && + Item2 == other.Item2 && + Item3 == other.Item3 && + Item4 == other.Item4 && + Item5 == other.Item5; /// - public override readonly bool Equals(object? obj) + public readonly override bool Equals(object? obj) { if (obj is null) return false; return obj is Vec6i v && Equals(v); @@ -202,23 +198,17 @@ public override readonly bool Equals(object? obj) /// /// /// - public static bool operator ==(Vec6i a, Vec6i b) - { - return a.Equals(b); - } + public static bool operator ==(Vec6i a, Vec6i b) => a.Equals(b); /// /// /// /// /// - public static bool operator !=(Vec6i a, Vec6i b) - { - return !a.Equals(b); - } + public static bool operator !=(Vec6i a, Vec6i b) => !a.Equals(b); /// - public override readonly int GetHashCode() + public readonly override int GetHashCode() { #if DOTNET_FRAMEWORK || NETSTANDARD2_0 unchecked @@ -237,8 +227,5 @@ public override readonly int GetHashCode() } /// - public override readonly string ToString() - { - return $"{nameof(Vec6i)} ({Item0}, {Item1}, {Item2}, {Item3}, {Item4}, {Item5})"; - } + public readonly override string ToString() => $"{nameof(Vec6i)} ({Item0}, {Item1}, {Item2}, {Item3}, {Item4}, {Item5})"; } diff --git a/src/OpenCvSharp/Modules/core/Struct/Vec/Vec6s.cs b/src/OpenCvSharp/Modules/core/Struct/Vec/Vec6s.cs index e2ac3610a..4ad68e974 100644 --- a/src/OpenCvSharp/Modules/core/Struct/Vec/Vec6s.cs +++ b/src/OpenCvSharp/Modules/core/Struct/Vec/Vec6s.cs @@ -142,9 +142,8 @@ public Vec6s(short item0, short item1, short item2, short item3, short item4, sh /// public short this[int i] { - readonly get - { - return i switch + readonly get => + i switch { 0 => Item0, 1 => Item1, @@ -154,7 +153,6 @@ readonly get 5 => Item5, _ => throw new ArgumentOutOfRangeException(nameof(i)) }; - } set { switch (i) @@ -183,18 +181,16 @@ readonly get #pragma warning restore 1591 /// - public readonly bool Equals(Vec6s other) - { - return Item0 == other.Item0 && - Item1 == other.Item1 && - Item2 == other.Item2 && - Item3 == other.Item3 && - Item4 == other.Item4 && - Item5 == other.Item5; - } + public readonly bool Equals(Vec6s other) => + Item0 == other.Item0 && + Item1 == other.Item1 && + Item2 == other.Item2 && + Item3 == other.Item3 && + Item4 == other.Item4 && + Item5 == other.Item5; /// - public override readonly bool Equals(object? obj) + public readonly override bool Equals(object? obj) { if (obj is null) return false; return obj is Vec6s v && Equals(v); @@ -205,23 +201,17 @@ public override readonly bool Equals(object? obj) /// /// /// - public static bool operator ==(Vec6s a, Vec6s b) - { - return a.Equals(b); - } + public static bool operator ==(Vec6s a, Vec6s b) => a.Equals(b); /// /// /// /// /// - public static bool operator !=(Vec6s a, Vec6s b) - { - return !a.Equals(b); - } + public static bool operator !=(Vec6s a, Vec6s b) => !a.Equals(b); /// - public override readonly int GetHashCode() + public readonly override int GetHashCode() { #if DOTNET_FRAMEWORK || NETSTANDARD2_0 unchecked @@ -240,8 +230,6 @@ public override readonly int GetHashCode() } /// - public override readonly string ToString() - { - return $"{nameof(Vec6s)} ({Item0}, {Item1}, {Item2}, {Item3}, {Item4}, {Item5})"; - } + public readonly override string ToString() + => $"{nameof(Vec6s)} ({Item0}, {Item1}, {Item2}, {Item3}, {Item4}, {Item5})"; } diff --git a/src/OpenCvSharp/Modules/core/Struct/Vec/Vec6w.cs b/src/OpenCvSharp/Modules/core/Struct/Vec/Vec6w.cs index 2e8ec8cd2..cb4bba6fc 100644 --- a/src/OpenCvSharp/Modules/core/Struct/Vec/Vec6w.cs +++ b/src/OpenCvSharp/Modules/core/Struct/Vec/Vec6w.cs @@ -142,9 +142,8 @@ public Vec6w(ushort item0, ushort item1, ushort item2, ushort item3, ushort item /// public ushort this[int i] { - readonly get - { - return i switch + readonly get => + i switch { 0 => Item0, 1 => Item1, @@ -154,7 +153,6 @@ readonly get 5 => Item5, _ => throw new ArgumentOutOfRangeException(nameof(i)) }; - } set { switch(i) @@ -183,18 +181,16 @@ readonly get #pragma warning restore 1591 /// - public readonly bool Equals(Vec6w other) - { - return Item0 == other.Item0 && - Item1 == other.Item1 && - Item2 == other.Item2 && - Item3 == other.Item3 && - Item4 == other.Item4 && - Item5 == other.Item5; - } - + public readonly bool Equals(Vec6w other) => + Item0 == other.Item0 && + Item1 == other.Item1 && + Item2 == other.Item2 && + Item3 == other.Item3 && + Item4 == other.Item4 && + Item5 == other.Item5; + /// - public override readonly bool Equals(object? obj) + public readonly override bool Equals(object? obj) { if (obj is null) return false; return obj is Vec6w v && Equals(v); @@ -205,23 +201,17 @@ public override readonly bool Equals(object? obj) /// /// /// - public static bool operator ==(Vec6w a, Vec6w b) - { - return a.Equals(b); - } + public static bool operator ==(Vec6w a, Vec6w b) => a.Equals(b); /// /// /// /// /// - public static bool operator !=(Vec6w a, Vec6w b) - { - return !a.Equals(b); - } + public static bool operator !=(Vec6w a, Vec6w b) => !a.Equals(b); /// - public override readonly int GetHashCode() + public readonly override int GetHashCode() { #if DOTNET_FRAMEWORK || NETSTANDARD2_0 unchecked @@ -240,8 +230,6 @@ public override readonly int GetHashCode() } /// - public override readonly string ToString() - { - return $"{nameof(Vec6w)} ({Item0}, {Item1}, {Item2}, {Item3}, {Item4}, {Item5})"; - } + public readonly override string ToString() + => $"{nameof(Vec6w)} ({Item0}, {Item1}, {Item2}, {Item3}, {Item4}, {Item5})"; } diff --git a/src/OpenCvSharp/Modules/dnn/CvDnn.cs b/src/OpenCvSharp/Modules/dnn/CvDnn.cs index e654a1fe7..f9889d0cc 100644 --- a/src/OpenCvSharp/Modules/dnn/CvDnn.cs +++ b/src/OpenCvSharp/Modules/dnn/CvDnn.cs @@ -342,7 +342,7 @@ public static void ShrinkCaffeModel(string src, string dst, IEnumerable? if (dst is null) throw new ArgumentNullException(nameof(dst)); - var layersTypesArray = layersTypes as string[] ?? layersTypes?.ToArray() ?? Array.Empty(); + var layersTypesArray = layersTypes as string[] ?? layersTypes?.ToArray() ?? []; NativeMethods.HandleException( NativeMethods.dnn_shrinkCaffeModel(src, dst, layersTypesArray, layersTypesArray.Length)); } diff --git a/src/OpenCvSharp/Modules/face/FaceRecognizer/EigenFaceRecognizer.cs b/src/OpenCvSharp/Modules/face/FaceRecognizer/EigenFaceRecognizer.cs index 9cb4b9d66..9e6860fc5 100644 --- a/src/OpenCvSharp/Modules/face/FaceRecognizer/EigenFaceRecognizer.cs +++ b/src/OpenCvSharp/Modules/face/FaceRecognizer/EigenFaceRecognizer.cs @@ -66,12 +66,8 @@ public static EigenFaceRecognizer Create(int numComponents = 0, double threshold return detector; } - internal class Ptr : OpenCvSharp.Ptr + internal class Ptr(IntPtr ptr) : OpenCvSharp.Ptr(ptr) { - public Ptr(IntPtr ptr) : base(ptr) - { - } - public override IntPtr Get() { NativeMethods.HandleException( diff --git a/src/OpenCvSharp/Modules/face/FaceRecognizer/FisherFaceRecognizer.cs b/src/OpenCvSharp/Modules/face/FaceRecognizer/FisherFaceRecognizer.cs index 71b122d3f..c52b9d009 100644 --- a/src/OpenCvSharp/Modules/face/FaceRecognizer/FisherFaceRecognizer.cs +++ b/src/OpenCvSharp/Modules/face/FaceRecognizer/FisherFaceRecognizer.cs @@ -66,12 +66,8 @@ public static FisherFaceRecognizer Create(int numComponents = 0, double threshol return detector; } - internal class Ptr : OpenCvSharp.Ptr + internal class Ptr(IntPtr ptr) : OpenCvSharp.Ptr(ptr) { - public Ptr(IntPtr ptr) : base(ptr) - { - } - public override IntPtr Get() { NativeMethods.HandleException( diff --git a/src/OpenCvSharp/Modules/face/FaceRecognizer/LBPHFaceRecognizer.cs b/src/OpenCvSharp/Modules/face/FaceRecognizer/LBPHFaceRecognizer.cs index 7f422406f..35a33b172 100644 --- a/src/OpenCvSharp/Modules/face/FaceRecognizer/LBPHFaceRecognizer.cs +++ b/src/OpenCvSharp/Modules/face/FaceRecognizer/LBPHFaceRecognizer.cs @@ -229,12 +229,8 @@ public virtual Mat GetLabels() #endregion - internal class Ptr : OpenCvSharp.Ptr + internal class Ptr(IntPtr ptr) : OpenCvSharp.Ptr(ptr) { - public Ptr(IntPtr ptr) : base(ptr) - { - } - public override IntPtr Get() { NativeMethods.HandleException( diff --git a/src/OpenCvSharp/Modules/face/Facemark/FacemarkAAM.cs b/src/OpenCvSharp/Modules/face/Facemark/FacemarkAAM.cs index 6400fe8dd..b6595d701 100644 --- a/src/OpenCvSharp/Modules/face/Facemark/FacemarkAAM.cs +++ b/src/OpenCvSharp/Modules/face/Facemark/FacemarkAAM.cs @@ -250,12 +250,8 @@ public void Write(FileStorage fs) } } - internal class Ptr : OpenCvSharp.Ptr + internal class Ptr(IntPtr ptr) : OpenCvSharp.Ptr(ptr) { - public Ptr(IntPtr ptr) : base(ptr) - { - } - public override IntPtr Get() { NativeMethods.HandleException( diff --git a/src/OpenCvSharp/Modules/face/Facemark/FacemarkLBF.cs b/src/OpenCvSharp/Modules/face/Facemark/FacemarkLBF.cs index a31a43a28..88225a467 100644 --- a/src/OpenCvSharp/Modules/face/Facemark/FacemarkLBF.cs +++ b/src/OpenCvSharp/Modules/face/Facemark/FacemarkLBF.cs @@ -328,11 +328,7 @@ public uint Seed /// /// /// -#if NET40 - public int[] FeatsM -#else public IReadOnlyList FeatsM -#endif { get { @@ -354,11 +350,7 @@ public IReadOnlyList FeatsM /// /// /// -#if NET40 - public double[] RadiusM -#else public IReadOnlyList RadiusM -#endif { get { @@ -380,11 +372,7 @@ public IReadOnlyList RadiusM /// /// index of facemark points on pupils of left and right eye /// -#if NET40 - public int[] Pupils0 -#else public IReadOnlyList Pupils0 -#endif { get { @@ -406,11 +394,7 @@ public IReadOnlyList Pupils0 /// /// index of facemark points on pupils of left and right eye /// -#if NET40 - public int[] Pupils1 -#else public IReadOnlyList Pupils1 -#endif { get { @@ -477,12 +461,8 @@ public void Write(FileStorage fs) } } - internal class Ptr : OpenCvSharp.Ptr + internal class Ptr(IntPtr ptr) : OpenCvSharp.Ptr(ptr) { - public Ptr(IntPtr ptr) : base(ptr) - { - } - public override IntPtr Get() { NativeMethods.HandleException( diff --git a/src/OpenCvSharp/Modules/features2d/AKAZE.cs b/src/OpenCvSharp/Modules/features2d/AKAZE.cs index e9b8eabf9..600fd9fdf 100644 --- a/src/OpenCvSharp/Modules/features2d/AKAZE.cs +++ b/src/OpenCvSharp/Modules/features2d/AKAZE.cs @@ -223,12 +223,8 @@ public KAZEDiffusivityType DiffusivityType } } - internal class Ptr : OpenCvSharp.Ptr + internal class Ptr(IntPtr ptr) : OpenCvSharp.Ptr(ptr) { - public Ptr(IntPtr ptr) : base(ptr) - { - } - public override IntPtr Get() { NativeMethods.HandleException( diff --git a/src/OpenCvSharp/Modules/features2d/AgastFeatureDetector.cs b/src/OpenCvSharp/Modules/features2d/AgastFeatureDetector.cs index 8ea88d01c..881453190 100644 --- a/src/OpenCvSharp/Modules/features2d/AgastFeatureDetector.cs +++ b/src/OpenCvSharp/Modules/features2d/AgastFeatureDetector.cs @@ -115,12 +115,8 @@ public DetectorType Type } } - internal class Ptr : OpenCvSharp.Ptr + internal class Ptr(IntPtr ptr) : OpenCvSharp.Ptr(ptr) { - public Ptr(IntPtr ptr) : base(ptr) - { - } - public override IntPtr Get() { NativeMethods.HandleException( diff --git a/src/OpenCvSharp/Modules/features2d/BFMatcher.cs b/src/OpenCvSharp/Modules/features2d/BFMatcher.cs index 56fa55ed4..7c23f4c8f 100644 --- a/src/OpenCvSharp/Modules/features2d/BFMatcher.cs +++ b/src/OpenCvSharp/Modules/features2d/BFMatcher.cs @@ -93,12 +93,8 @@ public override bool IsMaskSupported() return ret != 0; } - internal new class Ptr : OpenCvSharp.Ptr + internal new class Ptr(IntPtr ptr) : OpenCvSharp.Ptr(ptr) { - public Ptr(IntPtr ptr) : base(ptr) - { - } - public override IntPtr Get() { NativeMethods.HandleException( diff --git a/src/OpenCvSharp/Modules/features2d/BRISK.cs b/src/OpenCvSharp/Modules/features2d/BRISK.cs index 14307dace..93cf5bb6d 100644 --- a/src/OpenCvSharp/Modules/features2d/BRISK.cs +++ b/src/OpenCvSharp/Modules/features2d/BRISK.cs @@ -127,12 +127,8 @@ protected override void DisposeManaged() base.DisposeManaged(); } - internal class Ptr : OpenCvSharp.Ptr + internal class Ptr(IntPtr ptr) : OpenCvSharp.Ptr(ptr) { - public Ptr(IntPtr ptr) : base(ptr) - { - } - public override IntPtr Get() { NativeMethods.HandleException( diff --git a/src/OpenCvSharp/Modules/features2d/DescriptorMatcher.cs b/src/OpenCvSharp/Modules/features2d/DescriptorMatcher.cs index 1ca6130bb..c51a6622f 100644 --- a/src/OpenCvSharp/Modules/features2d/DescriptorMatcher.cs +++ b/src/OpenCvSharp/Modules/features2d/DescriptorMatcher.cs @@ -384,12 +384,8 @@ public DMatch[][] RadiusMatch(Mat queryDescriptors, float maxDistance, Mat[]? ma #endregion - internal class Ptr : OpenCvSharp.Ptr + internal class Ptr(IntPtr ptr) : OpenCvSharp.Ptr(ptr) { - public Ptr(IntPtr ptr) : base(ptr) - { - } - public override IntPtr Get() { NativeMethods.HandleException( diff --git a/src/OpenCvSharp/Modules/features2d/Enum/AKAZEDescriptorType.cs b/src/OpenCvSharp/Modules/features2d/Enum/AKAZEDescriptorType.cs index 500535e06..7f7d8db72 100644 --- a/src/OpenCvSharp/Modules/features2d/Enum/AKAZEDescriptorType.cs +++ b/src/OpenCvSharp/Modules/features2d/Enum/AKAZEDescriptorType.cs @@ -1,4 +1,6 @@ -#pragma warning disable CA1008 // Enums should have zero value +// ReSharper disable InconsistentNaming +// ReSharper disable IdentifierTypo +#pragma warning disable CA1008 // Enums should have zero value namespace OpenCvSharp; diff --git a/src/OpenCvSharp/Modules/features2d/FastFeatureDetector.cs b/src/OpenCvSharp/Modules/features2d/FastFeatureDetector.cs index a713225c5..278c69053 100644 --- a/src/OpenCvSharp/Modules/features2d/FastFeatureDetector.cs +++ b/src/OpenCvSharp/Modules/features2d/FastFeatureDetector.cs @@ -106,12 +106,8 @@ public int Type } } - internal class Ptr : OpenCvSharp.Ptr + internal class Ptr(IntPtr ptr) : OpenCvSharp.Ptr(ptr) { - public Ptr(IntPtr ptr) : base(ptr) - { - } - public override IntPtr Get() { NativeMethods.HandleException( diff --git a/src/OpenCvSharp/Modules/features2d/FlannBasedMatcher.cs b/src/OpenCvSharp/Modules/features2d/FlannBasedMatcher.cs index 7edd2b9e8..6a9b4bf77 100644 --- a/src/OpenCvSharp/Modules/features2d/FlannBasedMatcher.cs +++ b/src/OpenCvSharp/Modules/features2d/FlannBasedMatcher.cs @@ -153,12 +153,8 @@ public override void Train() GC.KeepAlive(this); } - internal new class Ptr : OpenCvSharp.Ptr + internal new class Ptr(IntPtr ptr) : OpenCvSharp.Ptr(ptr) { - public Ptr(IntPtr ptr) : base(ptr) - { - } - public override IntPtr Get() { NativeMethods.HandleException( diff --git a/src/OpenCvSharp/Modules/features2d/GFTTDetector.cs b/src/OpenCvSharp/Modules/features2d/GFTTDetector.cs index 0d1b85686..daeb691d5 100644 --- a/src/OpenCvSharp/Modules/features2d/GFTTDetector.cs +++ b/src/OpenCvSharp/Modules/features2d/GFTTDetector.cs @@ -188,12 +188,8 @@ public double K } } - internal class Ptr : OpenCvSharp.Ptr + internal class Ptr(IntPtr ptr) : OpenCvSharp.Ptr(ptr) { - public Ptr(IntPtr ptr) : base(ptr) - { - } - public override IntPtr Get() { NativeMethods.HandleException( diff --git a/src/OpenCvSharp/Modules/features2d/KAZE.cs b/src/OpenCvSharp/Modules/features2d/KAZE.cs index a8612f1bd..e1ded5dc0 100644 --- a/src/OpenCvSharp/Modules/features2d/KAZE.cs +++ b/src/OpenCvSharp/Modules/features2d/KAZE.cs @@ -186,12 +186,8 @@ public bool Upright } } - internal class Ptr : OpenCvSharp.Ptr + internal class Ptr(IntPtr ptr) : OpenCvSharp.Ptr(ptr) { - public Ptr(IntPtr ptr) : base(ptr) - { - } - public override IntPtr Get() { NativeMethods.HandleException( diff --git a/src/OpenCvSharp/Modules/features2d/MSER.cs b/src/OpenCvSharp/Modules/features2d/MSER.cs index 436b88ee1..91a9eb4d1 100644 --- a/src/OpenCvSharp/Modules/features2d/MSER.cs +++ b/src/OpenCvSharp/Modules/features2d/MSER.cs @@ -184,12 +184,8 @@ public virtual void DetectRegions( #endregion - internal class Ptr : OpenCvSharp.Ptr + internal class Ptr(IntPtr ptr) : OpenCvSharp.Ptr(ptr) { - public Ptr(IntPtr ptr) : base(ptr) - { - } - public override IntPtr Get() { NativeMethods.HandleException( diff --git a/src/OpenCvSharp/Modules/features2d/ORB.cs b/src/OpenCvSharp/Modules/features2d/ORB.cs index 2c492cddc..ce27b9c08 100644 --- a/src/OpenCvSharp/Modules/features2d/ORB.cs +++ b/src/OpenCvSharp/Modules/features2d/ORB.cs @@ -278,12 +278,8 @@ public int FastThreshold } } - internal class Ptr : OpenCvSharp.Ptr + internal class Ptr(IntPtr ptr) : OpenCvSharp.Ptr(ptr) { - public Ptr(IntPtr ptr) : base(ptr) - { - } - public override IntPtr Get() { NativeMethods.HandleException( diff --git a/src/OpenCvSharp/Modules/features2d/SIFT.cs b/src/OpenCvSharp/Modules/features2d/SIFT.cs index 1125f671c..8e8bbb367 100644 --- a/src/OpenCvSharp/Modules/features2d/SIFT.cs +++ b/src/OpenCvSharp/Modules/features2d/SIFT.cs @@ -53,12 +53,8 @@ protected override void DisposeManaged() base.DisposeManaged(); } - internal class Ptr : OpenCvSharp.Ptr + internal class Ptr(IntPtr ptr) : OpenCvSharp.Ptr(ptr) { - public Ptr(IntPtr ptr) : base(ptr) - { - } - public override IntPtr Get() { NativeMethods.HandleException( diff --git a/src/OpenCvSharp/Modules/features2d/SimpleBlobDetector.cs b/src/OpenCvSharp/Modules/features2d/SimpleBlobDetector.cs index 9c67d8e12..2d491efc2 100644 --- a/src/OpenCvSharp/Modules/features2d/SimpleBlobDetector.cs +++ b/src/OpenCvSharp/Modules/features2d/SimpleBlobDetector.cs @@ -208,8 +208,7 @@ protected SimpleBlobDetector(IntPtr p) /// public static SimpleBlobDetector Create(Params? parameters = null) { - if (parameters is null) - parameters = new Params(); + parameters ??= new Params(); NativeMethods.HandleException( NativeMethods.features2d_SimpleBlobDetector_create(ref parameters.Data, out var ptr)); return new SimpleBlobDetector(ptr); @@ -225,12 +224,8 @@ protected override void DisposeManaged() base.DisposeManaged(); } - internal class Ptr : OpenCvSharp.Ptr + internal class Ptr(IntPtr ptr) : OpenCvSharp.Ptr(ptr) { - public Ptr(IntPtr ptr) : base(ptr) - { - } - public override IntPtr Get() { NativeMethods.HandleException( diff --git a/src/OpenCvSharp/Modules/flann/IndexParams/AutotunedIndexParams.cs b/src/OpenCvSharp/Modules/flann/IndexParams/AutotunedIndexParams.cs index 195118f07..db1e84b3d 100644 --- a/src/OpenCvSharp/Modules/flann/IndexParams/AutotunedIndexParams.cs +++ b/src/OpenCvSharp/Modules/flann/IndexParams/AutotunedIndexParams.cs @@ -40,12 +40,8 @@ protected AutotunedIndexParams(OpenCvSharp.Ptr ptrObj) { } - internal new class Ptr : OpenCvSharp.Ptr + internal new class Ptr(IntPtr ptr) : OpenCvSharp.Ptr(ptr) { - public Ptr(IntPtr ptr) : base(ptr) - { - } - public override IntPtr Get() { NativeMethods.HandleException( diff --git a/src/OpenCvSharp/Modules/flann/IndexParams/CompositeIndexParams.cs b/src/OpenCvSharp/Modules/flann/IndexParams/CompositeIndexParams.cs index 3111fdd79..9bed06dca 100644 --- a/src/OpenCvSharp/Modules/flann/IndexParams/CompositeIndexParams.cs +++ b/src/OpenCvSharp/Modules/flann/IndexParams/CompositeIndexParams.cs @@ -36,12 +36,8 @@ protected CompositeIndexParams(OpenCvSharp.Ptr ptrObj) { } - internal new class Ptr : OpenCvSharp.Ptr + internal new class Ptr(IntPtr ptr) : OpenCvSharp.Ptr(ptr) { - public Ptr(IntPtr ptr) : base(ptr) - { - } - public override IntPtr Get() { NativeMethods.HandleException( diff --git a/src/OpenCvSharp/Modules/flann/IndexParams/IndexParams.cs b/src/OpenCvSharp/Modules/flann/IndexParams/IndexParams.cs index 8bf57cbe6..b30032f12 100644 --- a/src/OpenCvSharp/Modules/flann/IndexParams/IndexParams.cs +++ b/src/OpenCvSharp/Modules/flann/IndexParams/IndexParams.cs @@ -157,12 +157,8 @@ public void SetAlgorithm(int value) #endregion #endregion - internal class Ptr : OpenCvSharp.Ptr + internal class Ptr(IntPtr ptr) : OpenCvSharp.Ptr(ptr) { - public Ptr(IntPtr ptr) : base(ptr) - { - } - public override IntPtr Get() { NativeMethods.HandleException( diff --git a/src/OpenCvSharp/Modules/flann/IndexParams/KDTreeIndexParams.cs b/src/OpenCvSharp/Modules/flann/IndexParams/KDTreeIndexParams.cs index 7c7e38e3b..7714ed7ba 100644 --- a/src/OpenCvSharp/Modules/flann/IndexParams/KDTreeIndexParams.cs +++ b/src/OpenCvSharp/Modules/flann/IndexParams/KDTreeIndexParams.cs @@ -34,12 +34,8 @@ protected KDTreeIndexParams(OpenCvSharp.Ptr ptrObj) { } - internal new class Ptr : OpenCvSharp.Ptr + internal new class Ptr(IntPtr ptr) : OpenCvSharp.Ptr(ptr) { - public Ptr(IntPtr ptr) : base(ptr) - { - } - public override IntPtr Get() { NativeMethods.HandleException( diff --git a/src/OpenCvSharp/Modules/flann/IndexParams/KMeansIndexParams.cs b/src/OpenCvSharp/Modules/flann/IndexParams/KMeansIndexParams.cs index 72aceb5ef..a261fb044 100644 --- a/src/OpenCvSharp/Modules/flann/IndexParams/KMeansIndexParams.cs +++ b/src/OpenCvSharp/Modules/flann/IndexParams/KMeansIndexParams.cs @@ -34,12 +34,8 @@ protected KMeansIndexParams(OpenCvSharp.Ptr ptrObj) { } - internal new class Ptr : OpenCvSharp.Ptr + internal new class Ptr(IntPtr ptr) : OpenCvSharp.Ptr(ptr) { - public Ptr(IntPtr ptr) : base(ptr) - { - } - public override IntPtr Get() { NativeMethods.HandleException( diff --git a/src/OpenCvSharp/Modules/flann/IndexParams/LinearIndexParams.cs b/src/OpenCvSharp/Modules/flann/IndexParams/LinearIndexParams.cs index af3fa6a71..db598394c 100644 --- a/src/OpenCvSharp/Modules/flann/IndexParams/LinearIndexParams.cs +++ b/src/OpenCvSharp/Modules/flann/IndexParams/LinearIndexParams.cs @@ -30,12 +30,8 @@ protected LinearIndexParams(OpenCvSharp.Ptr ptrObj) { } - internal new class Ptr : OpenCvSharp.Ptr + internal new class Ptr(IntPtr ptr) : OpenCvSharp.Ptr(ptr) { - public Ptr(IntPtr ptr) : base(ptr) - { - } - public override IntPtr Get() { NativeMethods.HandleException( diff --git a/src/OpenCvSharp/Modules/flann/IndexParams/LshIndexParams.cs b/src/OpenCvSharp/Modules/flann/IndexParams/LshIndexParams.cs index b82c8c2d4..cb2e2d752 100644 --- a/src/OpenCvSharp/Modules/flann/IndexParams/LshIndexParams.cs +++ b/src/OpenCvSharp/Modules/flann/IndexParams/LshIndexParams.cs @@ -33,12 +33,8 @@ protected LshIndexParams(OpenCvSharp.Ptr ptrObj) { } - internal new class Ptr : OpenCvSharp.Ptr + internal new class Ptr(IntPtr ptr) : OpenCvSharp.Ptr(ptr) { - public Ptr(IntPtr ptr) : base(ptr) - { - } - public override IntPtr Get() { NativeMethods.HandleException( diff --git a/src/OpenCvSharp/Modules/flann/IndexParams/SavedIndexParams.cs b/src/OpenCvSharp/Modules/flann/IndexParams/SavedIndexParams.cs index bedbd34f8..4dfd57882 100644 --- a/src/OpenCvSharp/Modules/flann/IndexParams/SavedIndexParams.cs +++ b/src/OpenCvSharp/Modules/flann/IndexParams/SavedIndexParams.cs @@ -34,12 +34,8 @@ protected SavedIndexParams(OpenCvSharp.Ptr ptrObj) { } - internal new class Ptr : OpenCvSharp.Ptr + internal new class Ptr(IntPtr ptr) : OpenCvSharp.Ptr(ptr) { - public Ptr(IntPtr ptr) : base(ptr) - { - } - public override IntPtr Get() { NativeMethods.HandleException( diff --git a/src/OpenCvSharp/Modules/flann/IndexParams/SearchParams.cs b/src/OpenCvSharp/Modules/flann/IndexParams/SearchParams.cs index 1e7204df2..2da6f523b 100644 --- a/src/OpenCvSharp/Modules/flann/IndexParams/SearchParams.cs +++ b/src/OpenCvSharp/Modules/flann/IndexParams/SearchParams.cs @@ -33,12 +33,8 @@ protected SearchParams(OpenCvSharp.Ptr ptrObj) { } - internal new class Ptr : OpenCvSharp.Ptr + internal new class Ptr(IntPtr ptr) : OpenCvSharp.Ptr(ptr) { - public Ptr(IntPtr ptr) : base(ptr) - { - } - public override IntPtr Get() { NativeMethods.HandleException( diff --git a/src/OpenCvSharp/Modules/highgui/Window.cs b/src/OpenCvSharp/Modules/highgui/Window.cs index 4c68e2287..d7d47e694 100644 --- a/src/OpenCvSharp/Modules/highgui/Window.cs +++ b/src/OpenCvSharp/Modules/highgui/Window.cs @@ -13,7 +13,7 @@ public class Window : DisposableObject { #region Field - internal static Dictionary Windows = new Dictionary(); + internal static Dictionary Windows = new(); private static uint windowCount; private string name; diff --git a/src/OpenCvSharp/Modules/img_hash/AverageHash.cs b/src/OpenCvSharp/Modules/img_hash/AverageHash.cs index 2be57805e..65a7d7810 100644 --- a/src/OpenCvSharp/Modules/img_hash/AverageHash.cs +++ b/src/OpenCvSharp/Modules/img_hash/AverageHash.cs @@ -56,12 +56,8 @@ public override void Compute(InputArray inputArr, OutputArray outputArr) base.Compute(inputArr, outputArr); }*/ - internal class Ptr : OpenCvSharp.Ptr + internal class Ptr(IntPtr ptr) : OpenCvSharp.Ptr(ptr) { - public Ptr(IntPtr ptr) : base(ptr) - { - } - public override IntPtr Get() { NativeMethods.HandleException( diff --git a/src/OpenCvSharp/Modules/img_hash/BlockMeanHash.cs b/src/OpenCvSharp/Modules/img_hash/BlockMeanHash.cs index 21ee49858..dbd2dc42c 100644 --- a/src/OpenCvSharp/Modules/img_hash/BlockMeanHash.cs +++ b/src/OpenCvSharp/Modules/img_hash/BlockMeanHash.cs @@ -85,12 +85,8 @@ public override void Compute(InputArray inputArr, OutputArray outputArr) base.Compute(inputArr, outputArr); }*/ - internal class Ptr : OpenCvSharp.Ptr + internal class Ptr(IntPtr ptr) : OpenCvSharp.Ptr(ptr) { - public Ptr(IntPtr ptr) : base(ptr) - { - } - public override IntPtr Get() { NativeMethods.HandleException( diff --git a/src/OpenCvSharp/Modules/img_hash/ColorMomentHash.cs b/src/OpenCvSharp/Modules/img_hash/ColorMomentHash.cs index 8bac5cd24..d8287d6b7 100644 --- a/src/OpenCvSharp/Modules/img_hash/ColorMomentHash.cs +++ b/src/OpenCvSharp/Modules/img_hash/ColorMomentHash.cs @@ -57,12 +57,8 @@ public override void Compute(InputArray inputArr, OutputArray outputArr) base.Compute(inputArr, outputArr); } - internal class Ptr : OpenCvSharp.Ptr + internal class Ptr(IntPtr ptr) : OpenCvSharp.Ptr(ptr) { - public Ptr(IntPtr ptr) : base(ptr) - { - } - public override IntPtr Get() { NativeMethods.HandleException( diff --git a/src/OpenCvSharp/Modules/img_hash/MarrHildrethHash.cs b/src/OpenCvSharp/Modules/img_hash/MarrHildrethHash.cs index 009e21851..ec20638f5 100644 --- a/src/OpenCvSharp/Modules/img_hash/MarrHildrethHash.cs +++ b/src/OpenCvSharp/Modules/img_hash/MarrHildrethHash.cs @@ -120,12 +120,8 @@ public override void Compute(InputArray inputArr, OutputArray outputArr) base.Compute(inputArr, outputArr); } - internal class Ptr : OpenCvSharp.Ptr + internal class Ptr(IntPtr ptr) : OpenCvSharp.Ptr(ptr) { - public Ptr(IntPtr ptr) : base(ptr) - { - } - public override IntPtr Get() { NativeMethods.HandleException( diff --git a/src/OpenCvSharp/Modules/img_hash/PHash.cs b/src/OpenCvSharp/Modules/img_hash/PHash.cs index 9a7d1d8d5..b5794423f 100644 --- a/src/OpenCvSharp/Modules/img_hash/PHash.cs +++ b/src/OpenCvSharp/Modules/img_hash/PHash.cs @@ -59,12 +59,8 @@ public override void Compute(InputArray inputArr, OutputArray outputArr) base.Compute(inputArr, outputArr); } - internal class Ptr : OpenCvSharp.Ptr + internal class Ptr(IntPtr ptr) : OpenCvSharp.Ptr(ptr) { - public Ptr(IntPtr ptr) : base(ptr) - { - } - public override IntPtr Get() { NativeMethods.HandleException( diff --git a/src/OpenCvSharp/Modules/img_hash/RadialVarianceHash.cs b/src/OpenCvSharp/Modules/img_hash/RadialVarianceHash.cs index 55109b204..01b1e14bc 100644 --- a/src/OpenCvSharp/Modules/img_hash/RadialVarianceHash.cs +++ b/src/OpenCvSharp/Modules/img_hash/RadialVarianceHash.cs @@ -105,12 +105,8 @@ public override void Compute(InputArray inputArr, OutputArray outputArr) base.Compute(inputArr, outputArr); } - internal class Ptr : OpenCvSharp.Ptr + internal class Ptr(IntPtr ptr) : OpenCvSharp.Ptr(ptr) { - public Ptr(IntPtr ptr) : base(ptr) - { - } - public override IntPtr Get() { NativeMethods.HandleException( diff --git a/src/OpenCvSharp/Modules/imgproc/CLAHE.cs b/src/OpenCvSharp/Modules/imgproc/CLAHE.cs index c55603e4a..20ee8c59f 100644 --- a/src/OpenCvSharp/Modules/imgproc/CLAHE.cs +++ b/src/OpenCvSharp/Modules/imgproc/CLAHE.cs @@ -130,12 +130,8 @@ public void CollectGarbage() GC.KeepAlive(this); } - internal class Ptr : OpenCvSharp.Ptr + internal class Ptr(IntPtr ptr) : OpenCvSharp.Ptr(ptr) { - public Ptr(IntPtr ptr) : base(ptr) - { - } - public override IntPtr Get() { NativeMethods.HandleException( diff --git a/src/OpenCvSharp/Modules/imgproc/ConnectedComponent.cs b/src/OpenCvSharp/Modules/imgproc/ConnectedComponent.cs index 521a34a18..1bd9e3c89 100644 --- a/src/OpenCvSharp/Modules/imgproc/ConnectedComponent.cs +++ b/src/OpenCvSharp/Modules/imgproc/ConnectedComponent.cs @@ -42,10 +42,8 @@ internal ConnectedComponents(IReadOnlyList blobs, int[,] labels, int label /// Destination image. /// Label value. /// Filtered image. - public void FilterByLabel(Mat src, Mat dst, int labelValue) - { - FilterByLabels(src, dst, new[] { labelValue }); - } + public void FilterByLabel(Mat src, Mat dst, int labelValue) + => FilterByLabels(src, dst, [labelValue]); /// /// Filter a image with the specified label values. @@ -94,7 +92,7 @@ public void FilterByBlob(Mat src, Mat dst, Blob blob) { if (blob is null) throw new ArgumentNullException(nameof(blob)); - FilterByLabels(src, dst, new[] { blob.Label }); + FilterByLabels(src, dst, [blob.Label]); } /// @@ -138,16 +136,14 @@ public void RenderBlobs(Mat img) colors[i] = Scalar.RandomColor(); } - using (var imgt = new Mat(img)) + using var imgt = new Mat(img); + var indexer = imgt.GetIndexer(); + for (var y = 0; y < height; y++) { - var indexer = imgt.GetIndexer(); - for (var y = 0; y < height; y++) + for (var x = 0; x < width; x++) { - for (var x = 0; x < width; x++) - { - var labelValue = Labels[y, x]; - indexer[y, x] = colors[labelValue].ToVec3b(); - } + var labelValue = Labels[y, x]; + indexer[y, x] = colors[labelValue].ToVec3b(); } } } @@ -181,13 +177,11 @@ private Mat GetLabelMask(int label) { var rows = Labels.GetLength(0); var cols = Labels.GetLength(1); - using (var labels = Mat.FromPixelData(rows, cols, MatType.CV_32SC1, Labels.GetBuffer())) - using (var cmp = new Mat(rows, cols, MatType.CV_32SC1, Scalar.All(label))) - { - var result = new Mat(); - Cv2.Compare(labels, cmp, result, CmpType.EQ); - return result; - } + using var labels = Mat.FromPixelData(rows, cols, MatType.CV_32SC1, Labels.GetBuffer()); + using var cmp = new Mat(rows, cols, MatType.CV_32SC1, Scalar.All(label)); + var result = new Mat(); + Cv2.Compare(labels, cmp, result, CmpType.EQ); + return result; } #pragma warning disable CA1034 @@ -229,7 +223,7 @@ public class Blob /// /// The bounding box. /// - public Rect Rect => new Rect(Left, Top, Width, Height); + public Rect Rect => new (Left, Top, Width, Height); /// /// The total area (in pixels) of the connected component. diff --git a/src/OpenCvSharp/Modules/imgproc/Enum/ColorConversionCodes.cs b/src/OpenCvSharp/Modules/imgproc/Enum/ColorConversionCodes.cs index 8e4492a68..40e8b1679 100644 --- a/src/OpenCvSharp/Modules/imgproc/Enum/ColorConversionCodes.cs +++ b/src/OpenCvSharp/Modules/imgproc/Enum/ColorConversionCodes.cs @@ -3,6 +3,10 @@ #pragma warning disable 1591 #pragma warning disable CA1027 // Mark enums with FlagsAttribute +// ReSharper disable InconsistentNaming +// ReSharper disable IdentifierTypo +// ReSharper disable CommentTypo + namespace OpenCvSharp; /// diff --git a/src/OpenCvSharp/Modules/imgproc/GeneralizedHoughBallard.cs b/src/OpenCvSharp/Modules/imgproc/GeneralizedHoughBallard.cs index d7fdc26ac..5b2d05578 100644 --- a/src/OpenCvSharp/Modules/imgproc/GeneralizedHoughBallard.cs +++ b/src/OpenCvSharp/Modules/imgproc/GeneralizedHoughBallard.cs @@ -91,12 +91,8 @@ public int VotesThreshold } } - internal class Ptr : OpenCvSharp.Ptr + internal class Ptr(IntPtr ptr) : OpenCvSharp.Ptr(ptr) { - public Ptr(IntPtr ptr) : base(ptr) - { - } - public override IntPtr Get() { NativeMethods.HandleException( diff --git a/src/OpenCvSharp/Modules/imgproc/GeneralizedHoughGuil.cs b/src/OpenCvSharp/Modules/imgproc/GeneralizedHoughGuil.cs index 1d13cc7b3..5b01479af 100644 --- a/src/OpenCvSharp/Modules/imgproc/GeneralizedHoughGuil.cs +++ b/src/OpenCvSharp/Modules/imgproc/GeneralizedHoughGuil.cs @@ -321,12 +321,8 @@ public int PosThresh } } - internal class Ptr : OpenCvSharp.Ptr + internal class Ptr(IntPtr ptr) : OpenCvSharp.Ptr(ptr) { - public Ptr(IntPtr ptr) : base(ptr) - { - } - public override IntPtr Get() { NativeMethods.HandleException( diff --git a/src/OpenCvSharp/Modules/imgproc/LineSegmentDetector.cs b/src/OpenCvSharp/Modules/imgproc/LineSegmentDetector.cs index 04f1f2bd4..8f10a8c66 100644 --- a/src/OpenCvSharp/Modules/imgproc/LineSegmentDetector.cs +++ b/src/OpenCvSharp/Modules/imgproc/LineSegmentDetector.cs @@ -11,7 +11,7 @@ public class LineSegmentDetector : Algorithm /// /// cv::Ptr<LineSegmentDetector> /// - private Ptr ptrObj; + private readonly Ptr ptrObj; /// /// @@ -180,12 +180,8 @@ public virtual int CompareSegments( return ret; } - internal class Ptr : OpenCvSharp.Ptr + internal class Ptr(IntPtr ptr) : OpenCvSharp.Ptr(ptr) { - public Ptr(IntPtr ptr) : base(ptr) - { - } - public override IntPtr Get() { var res = NativeMethods.imgproc_Ptr_LineSegmentDetector_get(ptr); diff --git a/src/OpenCvSharp/Modules/line_descriptors/LSDParam.cs b/src/OpenCvSharp/Modules/line_descriptors/LSDParam.cs index c2e922149..b6d6f6f7b 100644 --- a/src/OpenCvSharp/Modules/line_descriptors/LSDParam.cs +++ b/src/OpenCvSharp/Modules/line_descriptors/LSDParam.cs @@ -7,31 +7,20 @@ namespace OpenCvSharp.LineDescriptor; [StructLayout(LayoutKind.Sequential)] [SuppressMessage("Design", "CA1051: Do not declare visible instance fields")] // ReSharper disable once InconsistentNaming -public readonly struct LSDParam +public readonly struct LSDParam( + double scale = 0.8, + double sigmaScale = 0.6, + double quant = 2.0, + double angTh = 22.5, + double logEps = 0, + double densityTh = 0.7, + int nBins = 1024) { - public readonly double Scale; - public readonly double SigmaScale; - public readonly double Quant; - public readonly double AngTh; - public readonly double LogEps; - public readonly double DensityTh; - public readonly int NBins; - - public LSDParam( - double scale = 0.8, - double sigmaScale = 0.6, - double quant = 2.0, - double angTh = 22.5, - double logEps = 0, - double densityTh = 0.7, - int nBins = 1024) - { - Scale = scale; - SigmaScale = sigmaScale; - Quant = quant; - AngTh = angTh; - LogEps = logEps; - DensityTh = densityTh; - NBins = nBins; - } + public readonly double Scale = scale; + public readonly double SigmaScale = sigmaScale; + public readonly double Quant = quant; + public readonly double AngTh = angTh; + public readonly double LogEps = logEps; + public readonly double DensityTh = densityTh; + public readonly int NBins = nBins; } diff --git a/src/OpenCvSharp/Modules/ml/ANN_MLP.cs b/src/OpenCvSharp/Modules/ml/ANN_MLP.cs index dd91a7630..510267840 100644 --- a/src/OpenCvSharp/Modules/ml/ANN_MLP.cs +++ b/src/OpenCvSharp/Modules/ml/ANN_MLP.cs @@ -418,12 +418,8 @@ public enum TrainingMethods #endregion - internal class Ptr : OpenCvSharp.Ptr + internal class Ptr(IntPtr ptr) : OpenCvSharp.Ptr(ptr) { - public Ptr(IntPtr ptr) : base(ptr) - { - } - public override IntPtr Get() { NativeMethods.HandleException( diff --git a/src/OpenCvSharp/Modules/ml/Boost.cs b/src/OpenCvSharp/Modules/ml/Boost.cs index a9591c2d2..c30722ca4 100644 --- a/src/OpenCvSharp/Modules/ml/Boost.cs +++ b/src/OpenCvSharp/Modules/ml/Boost.cs @@ -179,12 +179,8 @@ public enum Types #endregion - internal new class Ptr : OpenCvSharp.Ptr + internal new class Ptr(IntPtr ptr) : OpenCvSharp.Ptr(ptr) { - public Ptr(IntPtr ptr) : base(ptr) - { - } - public override IntPtr Get() { NativeMethods.HandleException( diff --git a/src/OpenCvSharp/Modules/ml/DTrees.cs b/src/OpenCvSharp/Modules/ml/DTrees.cs index 899a65e77..aff241c45 100644 --- a/src/OpenCvSharp/Modules/ml/DTrees.cs +++ b/src/OpenCvSharp/Modules/ml/DTrees.cs @@ -443,12 +443,8 @@ public struct Split #endregion - internal class Ptr : OpenCvSharp.Ptr + internal class Ptr(IntPtr ptr) : OpenCvSharp.Ptr(ptr) { - public Ptr(IntPtr ptr) : base(ptr) - { - } - public override IntPtr Get() { NativeMethods.HandleException( diff --git a/src/OpenCvSharp/Modules/ml/EM.cs b/src/OpenCvSharp/Modules/ml/EM.cs index 66460340f..a504b62ce 100644 --- a/src/OpenCvSharp/Modules/ml/EM.cs +++ b/src/OpenCvSharp/Modules/ml/EM.cs @@ -403,12 +403,8 @@ public virtual Vec2d Predict2(InputArray sample, OutputArray? probs = null) #endregion - internal class Ptr : OpenCvSharp.Ptr + internal class Ptr(IntPtr ptr) : OpenCvSharp.Ptr(ptr) { - public Ptr(IntPtr ptr) : base(ptr) - { - } - public override IntPtr Get() { NativeMethods.HandleException( diff --git a/src/OpenCvSharp/Modules/ml/KNearest.cs b/src/OpenCvSharp/Modules/ml/KNearest.cs index 26c565298..ecfa47f47 100644 --- a/src/OpenCvSharp/Modules/ml/KNearest.cs +++ b/src/OpenCvSharp/Modules/ml/KNearest.cs @@ -217,12 +217,8 @@ public enum Types #endregion - internal class Ptr : OpenCvSharp.Ptr + internal class Ptr(IntPtr ptr) : OpenCvSharp.Ptr(ptr) { - public Ptr(IntPtr ptr) : base(ptr) - { - } - public override IntPtr Get() { NativeMethods.HandleException( diff --git a/src/OpenCvSharp/Modules/ml/LogisticRegression.cs b/src/OpenCvSharp/Modules/ml/LogisticRegression.cs index 6675db501..1b94f4b39 100644 --- a/src/OpenCvSharp/Modules/ml/LogisticRegression.cs +++ b/src/OpenCvSharp/Modules/ml/LogisticRegression.cs @@ -285,12 +285,8 @@ public enum Methods #endregion - internal class Ptr : OpenCvSharp.Ptr + internal class Ptr(IntPtr ptr) : OpenCvSharp.Ptr(ptr) { - public Ptr(IntPtr ptr) : base(ptr) - { - } - public override IntPtr Get() { NativeMethods.HandleException( diff --git a/src/OpenCvSharp/Modules/ml/NormalBayesClassifier.cs b/src/OpenCvSharp/Modules/ml/NormalBayesClassifier.cs index a51975175..8ff5eeb39 100644 --- a/src/OpenCvSharp/Modules/ml/NormalBayesClassifier.cs +++ b/src/OpenCvSharp/Modules/ml/NormalBayesClassifier.cs @@ -109,12 +109,8 @@ public float PredictProb(InputArray inputs, OutputArray outputs, return ret; } - internal class Ptr : OpenCvSharp.Ptr + internal class Ptr(IntPtr ptr) : OpenCvSharp.Ptr(ptr) { - public Ptr(IntPtr ptr) : base(ptr) - { - } - public override IntPtr Get() { NativeMethods.HandleException( diff --git a/src/OpenCvSharp/Modules/ml/RTrees.cs b/src/OpenCvSharp/Modules/ml/RTrees.cs index e8c974125..f5c7f0be4 100644 --- a/src/OpenCvSharp/Modules/ml/RTrees.cs +++ b/src/OpenCvSharp/Modules/ml/RTrees.cs @@ -163,12 +163,8 @@ public Mat GetVarImportance() #endregion - internal new class Ptr : OpenCvSharp.Ptr + internal new class Ptr(IntPtr ptr) : OpenCvSharp.Ptr(ptr) { - public Ptr(IntPtr ptr) : base(ptr) - { - } - public override IntPtr Get() { NativeMethods.HandleException( diff --git a/src/OpenCvSharp/Modules/ml/SVM.cs b/src/OpenCvSharp/Modules/ml/SVM.cs index 5b3b56471..9c2cc9d3f 100644 --- a/src/OpenCvSharp/Modules/ml/SVM.cs +++ b/src/OpenCvSharp/Modules/ml/SVM.cs @@ -516,12 +516,8 @@ public enum ParamTypes #endregion - internal class Ptr : OpenCvSharp.Ptr + internal class Ptr(IntPtr ptr) : OpenCvSharp.Ptr(ptr) { - public Ptr(IntPtr ptr) : base(ptr) - { - } - public override IntPtr Get() { NativeMethods.HandleException( diff --git a/src/OpenCvSharp/Modules/objdetect/HOGDescriptor.cs b/src/OpenCvSharp/Modules/objdetect/HOGDescriptor.cs index d17b59d5f..62d1508bf 100644 --- a/src/OpenCvSharp/Modules/objdetect/HOGDescriptor.cs +++ b/src/OpenCvSharp/Modules/objdetect/HOGDescriptor.cs @@ -27,8 +27,8 @@ public class HOGDescriptor : DisposableCvObject /// /// Returns coefficients of the classifier trained for people detection (for default window size). /// - public static readonly float[] DefaultPeopleDetector = - { + public static readonly float[] DefaultPeopleDetector = + [ 0.05359386f, -0.14721455f, -0.05532170f, 0.05077307f, 0.11547081f, -0.04268804f, 0.04635834f, -0.05468199f, 0.08232084f, 0.10424068f, -0.02294518f, 0.01108519f, 0.01378693f, 0.11193510f, @@ -834,7 +834,7 @@ public class HOGDescriptor : DisposableCvObject -0.01612278f, -1.46097376e-003f, 0.14013411f, -8.96181818e-003f, -0.03250246f, 3.38630192e-003f, 2.64779478e-003f, 0.03359732f, -0.02411991f, -0.04229729f, 0.10666174f, -6.66579151f - }; + ]; #endregion #region DaimlerPeopleDetector @@ -843,7 +843,7 @@ public class HOGDescriptor : DisposableCvObject /// To use these coeffs the detection window size should be (48,96) /// public static readonly float[] DaimlerPeopleDetector = - { + [ 0.294350f, -0.098796f, -0.129522f, 0.078753f, 0.387527f, 0.261529f, 0.145939f, 0.061520f, 0.328699f, 0.227148f, -0.066467f, -0.086723f, @@ -1340,7 +1340,7 @@ public class HOGDescriptor : DisposableCvObject -0.025054f, -0.093026f, -0.035372f, -0.233209f, -0.049869f, -0.039151f, -0.022279f, -0.065380f, -9.063785f - }; + ]; #endregion #endregion diff --git a/src/OpenCvSharp/Modules/objdetect/QRCodeDetector.cs b/src/OpenCvSharp/Modules/objdetect/QRCodeDetector.cs index 1b580a569..571093bed 100644 --- a/src/OpenCvSharp/Modules/objdetect/QRCodeDetector.cs +++ b/src/OpenCvSharp/Modules/objdetect/QRCodeDetector.cs @@ -224,7 +224,7 @@ protected bool DecodeMulti(InputArray img, IEnumerable points, out stri NativeMethods.HandleException( NativeMethods.objdetect_QRCodeDetector_decodeMulti_NoStraightQrCode( ptr, img.CvPtr, pointsVec.CvPtr, decodedInfoVec.CvPtr, out ret)); - straightQrCode = Array.Empty(); + straightQrCode = []; } // decode utf-8 bytes. diff --git a/src/OpenCvSharp/Modules/photo/CalibrateDebevec.cs b/src/OpenCvSharp/Modules/photo/CalibrateDebevec.cs index cd35ab4d3..695b961c4 100644 --- a/src/OpenCvSharp/Modules/photo/CalibrateDebevec.cs +++ b/src/OpenCvSharp/Modules/photo/CalibrateDebevec.cs @@ -55,11 +55,9 @@ public float Lambda NativeMethods.photo_CalibrateDebevec_getLambda(ptr, out var ret)); return ret; } - set - { + set => NativeMethods.HandleException( NativeMethods.photo_CalibrateDebevec_setLambda(ptr, value)); - } } /// @@ -73,11 +71,9 @@ public float Samples NativeMethods.photo_CalibrateDebevec_getSamples(ptr, out var ret)); return ret; } - set - { + set => NativeMethods.HandleException( NativeMethods.photo_CalibrateDebevec_setSamples(ptr, value)); - } } /// @@ -91,19 +87,13 @@ public bool Random NativeMethods.photo_CalibrateDebevec_getRandom(ptr, out var ret)); return ret != 0; } - set - { + set => NativeMethods.HandleException( NativeMethods.photo_CalibrateDebevec_setRandom(ptr, value ? 1 : 0)); - } } - internal class Ptr : OpenCvSharp.Ptr + internal class Ptr(IntPtr ptr) : OpenCvSharp.Ptr(ptr) { - public Ptr(IntPtr ptr) : base(ptr) - { - } - public override IntPtr Get() { NativeMethods.HandleException( diff --git a/src/OpenCvSharp/Modules/photo/CalibrateRobertson.cs b/src/OpenCvSharp/Modules/photo/CalibrateRobertson.cs index 063e95446..da399234d 100644 --- a/src/OpenCvSharp/Modules/photo/CalibrateRobertson.cs +++ b/src/OpenCvSharp/Modules/photo/CalibrateRobertson.cs @@ -52,11 +52,9 @@ public int MaxIter NativeMethods.photo_CalibrateRobertson_getMaxIter(ptr, out var ret)); return ret; } - set - { + set => NativeMethods.HandleException( NativeMethods.photo_CalibrateRobertson_setMaxIter(ptr, value)); - } } /// @@ -70,11 +68,9 @@ public float Threshold NativeMethods.photo_CalibrateRobertson_getThreshold(ptr, out var ret)); return ret; } - set - { + set => NativeMethods.HandleException( NativeMethods.photo_CalibrateRobertson_setThreshold(ptr, value)); - } } /// @@ -91,12 +87,8 @@ public Mat Radiance } } - internal class Ptr : OpenCvSharp.Ptr + internal class Ptr(IntPtr ptr) : OpenCvSharp.Ptr(ptr) { - public Ptr(IntPtr ptr) : base(ptr) - { - } - public override IntPtr Get() { NativeMethods.HandleException( diff --git a/src/OpenCvSharp/Modules/photo/MergeDebevec.cs b/src/OpenCvSharp/Modules/photo/MergeDebevec.cs index e6215e939..e1c1b5d61 100644 --- a/src/OpenCvSharp/Modules/photo/MergeDebevec.cs +++ b/src/OpenCvSharp/Modules/photo/MergeDebevec.cs @@ -41,12 +41,8 @@ protected override void DisposeManaged() base.DisposeManaged(); } - private class Ptr : OpenCvSharp.Ptr + private class Ptr(IntPtr ptr) : OpenCvSharp.Ptr(ptr) { - public Ptr(IntPtr ptr) : base(ptr) - { - } - public override IntPtr Get() { var res = NativeMethods.photo_Ptr_MergeDebevec_get(ptr); diff --git a/src/OpenCvSharp/Modules/photo/MergeMertens.cs b/src/OpenCvSharp/Modules/photo/MergeMertens.cs index 4e12abdc9..ef9128f3e 100644 --- a/src/OpenCvSharp/Modules/photo/MergeMertens.cs +++ b/src/OpenCvSharp/Modules/photo/MergeMertens.cs @@ -69,12 +69,8 @@ protected override void DisposeManaged() base.DisposeManaged(); } - private class Ptr : OpenCvSharp.Ptr + private class Ptr(IntPtr ptr) : OpenCvSharp.Ptr(ptr) { - public Ptr(IntPtr ptr) : base(ptr) - { - } - public override IntPtr Get() { var res = NativeMethods.photo_Ptr_MergeMertens_get(ptr); diff --git a/src/OpenCvSharp/Modules/photo/Tonemap.cs b/src/OpenCvSharp/Modules/photo/Tonemap.cs index c0c2958f8..c5c287315 100644 --- a/src/OpenCvSharp/Modules/photo/Tonemap.cs +++ b/src/OpenCvSharp/Modules/photo/Tonemap.cs @@ -102,12 +102,8 @@ public float Gamma } } - private class Ptr : OpenCvSharp.Ptr + private class Ptr(IntPtr ptr) : OpenCvSharp.Ptr(ptr) { - public Ptr(IntPtr ptr) : base(ptr) - { - } - public override IntPtr Get() { NativeMethods.HandleException( diff --git a/src/OpenCvSharp/Modules/photo/TonemapDrago.cs b/src/OpenCvSharp/Modules/photo/TonemapDrago.cs index b4c3b12ac..201188098 100644 --- a/src/OpenCvSharp/Modules/photo/TonemapDrago.cs +++ b/src/OpenCvSharp/Modules/photo/TonemapDrago.cs @@ -103,12 +103,8 @@ public float Bias } } - private class Ptr : OpenCvSharp.Ptr + private class Ptr(IntPtr ptr) : OpenCvSharp.Ptr(ptr) { - public Ptr(IntPtr ptr) : base(ptr) - { - } - public override IntPtr Get() { NativeMethods.HandleException( diff --git a/src/OpenCvSharp/Modules/photo/TonemapMantiuk.cs b/src/OpenCvSharp/Modules/photo/TonemapMantiuk.cs index 04d84def2..c783d058e 100644 --- a/src/OpenCvSharp/Modules/photo/TonemapMantiuk.cs +++ b/src/OpenCvSharp/Modules/photo/TonemapMantiuk.cs @@ -103,12 +103,8 @@ public float Saturation } } - private class Ptr : OpenCvSharp.Ptr + private class Ptr(IntPtr ptr) : OpenCvSharp.Ptr(ptr) { - public Ptr(IntPtr ptr) : base(ptr) - { - } - public override IntPtr Get() { NativeMethods.HandleException( diff --git a/src/OpenCvSharp/Modules/photo/TonemapReinhard.cs b/src/OpenCvSharp/Modules/photo/TonemapReinhard.cs index a2860c194..46f453b43 100644 --- a/src/OpenCvSharp/Modules/photo/TonemapReinhard.cs +++ b/src/OpenCvSharp/Modules/photo/TonemapReinhard.cs @@ -126,12 +126,8 @@ public float ColorAdaptation } } - private class Ptr : OpenCvSharp.Ptr + private class Ptr(IntPtr ptr) : OpenCvSharp.Ptr(ptr) { - public Ptr(IntPtr ptr) : base(ptr) - { - } - public override IntPtr Get() { NativeMethods.HandleException( diff --git a/src/OpenCvSharp/Modules/quality/QualityBRISQUE.cs b/src/OpenCvSharp/Modules/quality/QualityBRISQUE.cs index bbbdab2d0..0e125910e 100644 --- a/src/OpenCvSharp/Modules/quality/QualityBRISQUE.cs +++ b/src/OpenCvSharp/Modules/quality/QualityBRISQUE.cs @@ -121,12 +121,8 @@ protected override void DisposeManaged() base.DisposeManaged(); } - internal class Ptr : OpenCvSharp.Ptr + internal class Ptr(IntPtr ptr) : OpenCvSharp.Ptr(ptr) { - public Ptr(IntPtr ptr) : base(ptr) - { - } - public override IntPtr Get() { NativeMethods.HandleException( diff --git a/src/OpenCvSharp/Modules/quality/QualityGMSD.cs b/src/OpenCvSharp/Modules/quality/QualityGMSD.cs index 0519f3a36..c98485278 100644 --- a/src/OpenCvSharp/Modules/quality/QualityGMSD.cs +++ b/src/OpenCvSharp/Modules/quality/QualityGMSD.cs @@ -76,12 +76,8 @@ protected override void DisposeManaged() base.DisposeManaged(); } - internal class Ptr : OpenCvSharp.Ptr + internal class Ptr(IntPtr ptr) : OpenCvSharp.Ptr(ptr) { - public Ptr(IntPtr ptr) : base(ptr) - { - } - public override IntPtr Get() { NativeMethods.HandleException( diff --git a/src/OpenCvSharp/Modules/quality/QualityMSE.cs b/src/OpenCvSharp/Modules/quality/QualityMSE.cs index 399b9cb0d..28f91c252 100644 --- a/src/OpenCvSharp/Modules/quality/QualityMSE.cs +++ b/src/OpenCvSharp/Modules/quality/QualityMSE.cs @@ -77,12 +77,8 @@ protected override void DisposeManaged() base.DisposeManaged(); } - internal class Ptr : OpenCvSharp.Ptr + internal class Ptr(IntPtr ptr) : OpenCvSharp.Ptr(ptr) { - public Ptr(IntPtr ptr) : base(ptr) - { - } - public override IntPtr Get() { NativeMethods.HandleException( diff --git a/src/OpenCvSharp/Modules/quality/QualityPSNR.cs b/src/OpenCvSharp/Modules/quality/QualityPSNR.cs index fa830cdfa..ee4a5d3b7 100644 --- a/src/OpenCvSharp/Modules/quality/QualityPSNR.cs +++ b/src/OpenCvSharp/Modules/quality/QualityPSNR.cs @@ -101,12 +101,8 @@ protected override void DisposeManaged() base.DisposeManaged(); } - internal class Ptr : OpenCvSharp.Ptr + internal class Ptr(IntPtr ptr) : OpenCvSharp.Ptr(ptr) { - public Ptr(IntPtr ptr) : base(ptr) - { - } - public override IntPtr Get() { NativeMethods.HandleException( diff --git a/src/OpenCvSharp/Modules/quality/QualitySSIM.cs b/src/OpenCvSharp/Modules/quality/QualitySSIM.cs index da1377a0b..191ce8caf 100644 --- a/src/OpenCvSharp/Modules/quality/QualitySSIM.cs +++ b/src/OpenCvSharp/Modules/quality/QualitySSIM.cs @@ -75,12 +75,8 @@ protected override void DisposeManaged() base.DisposeManaged(); } - internal class Ptr : OpenCvSharp.Ptr + internal class Ptr(IntPtr ptr) : OpenCvSharp.Ptr(ptr) { - public Ptr(IntPtr ptr) : base(ptr) - { - } - public override IntPtr Get() { NativeMethods.HandleException( diff --git a/src/OpenCvSharp/Modules/shape/HausdorffDistanceExtractor.cs b/src/OpenCvSharp/Modules/shape/HausdorffDistanceExtractor.cs index 85c650c88..fd05b6351 100644 --- a/src/OpenCvSharp/Modules/shape/HausdorffDistanceExtractor.cs +++ b/src/OpenCvSharp/Modules/shape/HausdorffDistanceExtractor.cs @@ -100,12 +100,8 @@ public float RankProportion #endregion - internal class Ptr : OpenCvSharp.Ptr + internal class Ptr(IntPtr ptr) : OpenCvSharp.Ptr(ptr) { - public Ptr(IntPtr ptr) : base(ptr) - { - } - public override IntPtr Get() { NativeMethods.HandleException( diff --git a/src/OpenCvSharp/Modules/shape/ShapeContextDistanceExtractor.cs b/src/OpenCvSharp/Modules/shape/ShapeContextDistanceExtractor.cs index ca5cf3c83..d16b1ab51 100644 --- a/src/OpenCvSharp/Modules/shape/ShapeContextDistanceExtractor.cs +++ b/src/OpenCvSharp/Modules/shape/ShapeContextDistanceExtractor.cs @@ -335,12 +335,8 @@ public void GetImages(OutputArray image1, OutputArray image2) #endregion - internal class Ptr : OpenCvSharp.Ptr + internal class Ptr(IntPtr ptr) : OpenCvSharp.Ptr(ptr) { - public Ptr(IntPtr ptr) : base(ptr) - { - } - public override IntPtr Get() { NativeMethods.HandleException( diff --git a/src/OpenCvSharp/Modules/stitching/Stitcher.cs b/src/OpenCvSharp/Modules/stitching/Stitcher.cs index 8a8d3dd69..5dc91b8ae 100644 --- a/src/OpenCvSharp/Modules/stitching/Stitcher.cs +++ b/src/OpenCvSharp/Modules/stitching/Stitcher.cs @@ -17,33 +17,19 @@ public enum WaveCorrectKind Vertical } - public class FeaturesFinder - { - } + public class FeaturesFinder; - public class BundleAdjusterBase - { - } + public class BundleAdjusterBase; - public class WarperCreator - { - } + public class WarperCreator; - public class ExposureCompensator - { - } + public class ExposureCompensator; - public class SeamFinder - { - } + public class SeamFinder; - public class Blender - { - } + public class Blender; - public class CameraParams - { - } + public class CameraParams; } /// @@ -557,12 +543,8 @@ public Status Stitch(IEnumerable images, Rect[][] rois, OutputArray pano) #endregion - internal class Ptr : OpenCvSharp.Ptr + internal class Ptr(IntPtr ptr) : OpenCvSharp.Ptr(ptr) { - public Ptr(IntPtr ptr) : base(ptr) - { - } - public override IntPtr Get() { NativeMethods.HandleException( diff --git a/src/OpenCvSharp/Modules/superres/BroxOpticalFlow.cs b/src/OpenCvSharp/Modules/superres/BroxOpticalFlow.cs index eba0b2449..104328eb8 100644 --- a/src/OpenCvSharp/Modules/superres/BroxOpticalFlow.cs +++ b/src/OpenCvSharp/Modules/superres/BroxOpticalFlow.cs @@ -193,12 +193,8 @@ public int SolverIterations #endregion - internal class Ptr : OpenCvSharp.Ptr + internal class Ptr(IntPtr ptr) : OpenCvSharp.Ptr(ptr) { - public Ptr(IntPtr ptr) : base(ptr) - { - } - public override IntPtr Get() { NativeMethods.HandleException( diff --git a/src/OpenCvSharp/Modules/superres/DualTVL1OpticalFlow.cs b/src/OpenCvSharp/Modules/superres/DualTVL1OpticalFlow.cs index ef59c2615..70ddcb822 100644 --- a/src/OpenCvSharp/Modules/superres/DualTVL1OpticalFlow.cs +++ b/src/OpenCvSharp/Modules/superres/DualTVL1OpticalFlow.cs @@ -237,12 +237,8 @@ public bool UseInitialFlow #endregion - internal class Ptr : OpenCvSharp.Ptr + internal class Ptr(IntPtr ptr) : OpenCvSharp.Ptr(ptr) { - public Ptr(IntPtr ptr) : base(ptr) - { - } - public override IntPtr Get() { NativeMethods.HandleException( diff --git a/src/OpenCvSharp/Modules/superres/FarnebackOpticalFlow.cs b/src/OpenCvSharp/Modules/superres/FarnebackOpticalFlow.cs index 4afbbabc8..c3f24ba16 100644 --- a/src/OpenCvSharp/Modules/superres/FarnebackOpticalFlow.cs +++ b/src/OpenCvSharp/Modules/superres/FarnebackOpticalFlow.cs @@ -213,12 +213,8 @@ public int Flags #endregion - internal class Ptr : OpenCvSharp.Ptr + internal class Ptr(IntPtr ptr) : OpenCvSharp.Ptr(ptr) { - public Ptr(IntPtr ptr) : base(ptr) - { - } - public override IntPtr Get() { NativeMethods.HandleException( diff --git a/src/OpenCvSharp/Modules/superres/FrameSource.cs b/src/OpenCvSharp/Modules/superres/FrameSource.cs index 91fb03ca1..5c32f0bb7 100644 --- a/src/OpenCvSharp/Modules/superres/FrameSource.cs +++ b/src/OpenCvSharp/Modules/superres/FrameSource.cs @@ -130,12 +130,8 @@ public virtual void Reset() #endregion - internal class Ptr : OpenCvSharp.Ptr + internal class Ptr(IntPtr ptr) : OpenCvSharp.Ptr(ptr) { - public Ptr(IntPtr ptr) : base(ptr) - { - } - public override IntPtr Get() { NativeMethods.HandleException( diff --git a/src/OpenCvSharp/Modules/superres/PyrLKOpticalFlow.cs b/src/OpenCvSharp/Modules/superres/PyrLKOpticalFlow.cs index 3c08330ff..7ecb649cc 100644 --- a/src/OpenCvSharp/Modules/superres/PyrLKOpticalFlow.cs +++ b/src/OpenCvSharp/Modules/superres/PyrLKOpticalFlow.cs @@ -125,12 +125,8 @@ public int Iterations #endregion - internal class Ptr : OpenCvSharp.Ptr + internal class Ptr(IntPtr ptr) : OpenCvSharp.Ptr(ptr) { - public Ptr(IntPtr ptr) : base(ptr) - { - } - public override IntPtr Get() { NativeMethods.HandleException( diff --git a/src/OpenCvSharp/Modules/superres/SuperResolution.cs b/src/OpenCvSharp/Modules/superres/SuperResolution.cs index 65cf73009..cead10bc6 100644 --- a/src/OpenCvSharp/Modules/superres/SuperResolution.cs +++ b/src/OpenCvSharp/Modules/superres/SuperResolution.cs @@ -372,12 +372,8 @@ public DenseOpticalFlowExt OpticalFlow #endregion - internal class Ptr : OpenCvSharp.Ptr + internal class Ptr(IntPtr ptr) : OpenCvSharp.Ptr(ptr) { - public Ptr(IntPtr ptr) : base(ptr) - { - } - public override IntPtr Get() { NativeMethods.HandleException( diff --git a/src/OpenCvSharp/Modules/text/TextDetectorCNN.cs b/src/OpenCvSharp/Modules/text/TextDetectorCNN.cs index b9790d09b..d48ee3e45 100644 --- a/src/OpenCvSharp/Modules/text/TextDetectorCNN.cs +++ b/src/OpenCvSharp/Modules/text/TextDetectorCNN.cs @@ -103,12 +103,8 @@ public override void Detect(InputArray inputImage, out Rect[] bbox, out float[] GC.KeepAlive(inputImage); } - internal class Ptr : OpenCvSharp.Ptr + internal class Ptr(IntPtr ptr) : OpenCvSharp.Ptr(ptr) { - public Ptr(IntPtr ptr) : base(ptr) - { - } - public override IntPtr Get() { NativeMethods.HandleException( diff --git a/src/OpenCvSharp/Modules/tracking/TrackerCSRT.cs b/src/OpenCvSharp/Modules/tracking/TrackerCSRT.cs index 9fcdb78e4..82662f564 100644 --- a/src/OpenCvSharp/Modules/tracking/TrackerCSRT.cs +++ b/src/OpenCvSharp/Modules/tracking/TrackerCSRT.cs @@ -61,12 +61,8 @@ public virtual void SetInitialMask(InputArray mask) GC.KeepAlive(mask); } - internal class Ptr : OpenCvSharp.Ptr + internal class Ptr(IntPtr ptr) : OpenCvSharp.Ptr(ptr) { - public Ptr(IntPtr ptr) : base(ptr) - { - } - public override IntPtr Get() { NativeMethods.HandleException( diff --git a/src/OpenCvSharp/Modules/tracking/TrackerKCF.cs b/src/OpenCvSharp/Modules/tracking/TrackerKCF.cs index f4af0a99a..78a5fc578 100644 --- a/src/OpenCvSharp/Modules/tracking/TrackerKCF.cs +++ b/src/OpenCvSharp/Modules/tracking/TrackerKCF.cs @@ -45,12 +45,8 @@ public static TrackerKCF Create(Params parameters) return new TrackerKCF(p); } - internal class Ptr : OpenCvSharp.Ptr + internal class Ptr(IntPtr ptr) : OpenCvSharp.Ptr(ptr) { - public Ptr(IntPtr ptr) : base(ptr) - { - } - public override IntPtr Get() { NativeMethods.HandleException( diff --git a/src/OpenCvSharp/Modules/video/BackgroundSubtractorKNN.cs b/src/OpenCvSharp/Modules/video/BackgroundSubtractorKNN.cs index b613ab85c..28ae953ac 100644 --- a/src/OpenCvSharp/Modules/video/BackgroundSubtractorKNN.cs +++ b/src/OpenCvSharp/Modules/video/BackgroundSubtractorKNN.cs @@ -247,12 +247,8 @@ public double ShadowThreshold #endregion - internal class Ptr : OpenCvSharp.Ptr + internal class Ptr(IntPtr ptr) : OpenCvSharp.Ptr(ptr) { - public Ptr(IntPtr ptr) : base(ptr) - { - } - public override IntPtr Get() { NativeMethods.HandleException( diff --git a/src/OpenCvSharp/Modules/video/BackgroundSubtractorMog2.cs b/src/OpenCvSharp/Modules/video/BackgroundSubtractorMog2.cs index 036e5c599..7d2c0ea65 100644 --- a/src/OpenCvSharp/Modules/video/BackgroundSubtractorMog2.cs +++ b/src/OpenCvSharp/Modules/video/BackgroundSubtractorMog2.cs @@ -388,12 +388,8 @@ public double ShadowThreshold #endregion - internal class Ptr : OpenCvSharp.Ptr + internal class Ptr(IntPtr ptr) : OpenCvSharp.Ptr(ptr) { - public Ptr(IntPtr ptr) : base(ptr) - { - } - public override IntPtr Get() { NativeMethods.HandleException( diff --git a/src/OpenCvSharp/Modules/video/TrackerGOTURN.cs b/src/OpenCvSharp/Modules/video/TrackerGOTURN.cs index 40a6366bf..30355168a 100644 --- a/src/OpenCvSharp/Modules/video/TrackerGOTURN.cs +++ b/src/OpenCvSharp/Modules/video/TrackerGOTURN.cs @@ -60,12 +60,8 @@ public static TrackerGOTURN Create(Params parameters) } } - internal class Ptr : OpenCvSharp.Ptr + internal class Ptr(IntPtr ptr) : OpenCvSharp.Ptr(ptr) { - public Ptr(IntPtr ptr) : base(ptr) - { - } - public override IntPtr Get() { NativeMethods.HandleException( @@ -87,7 +83,5 @@ protected override void DisposeUnmanaged() /// /// [StructLayout(LayoutKind.Sequential)] - public struct Params - { - } + public struct Params; } diff --git a/src/OpenCvSharp/Modules/video/TrackerMIL.cs b/src/OpenCvSharp/Modules/video/TrackerMIL.cs index d912aa0b9..30f40dbd9 100644 --- a/src/OpenCvSharp/Modules/video/TrackerMIL.cs +++ b/src/OpenCvSharp/Modules/video/TrackerMIL.cs @@ -47,12 +47,8 @@ public static TrackerMIL Create(Params parameters) } } - internal class Ptr : OpenCvSharp.Ptr + internal class Ptr(IntPtr ptr) : OpenCvSharp.Ptr(ptr) { - public Ptr(IntPtr ptr) : base(ptr) - { - } - public override IntPtr Get() { NativeMethods.HandleException( diff --git a/src/OpenCvSharp/Modules/videoio/Enum/VideoCapturePara.cs b/src/OpenCvSharp/Modules/videoio/Enum/VideoCapturePara.cs index da5b99bdf..1512cefce 100644 --- a/src/OpenCvSharp/Modules/videoio/Enum/VideoCapturePara.cs +++ b/src/OpenCvSharp/Modules/videoio/Enum/VideoCapturePara.cs @@ -1,7 +1,7 @@ namespace OpenCvSharp; /// -/// Parameters of VideoCature for hardware acceleration +/// Parameters of VideoCapture for hardware acceleration /// Please check the link below for current HW acceleration types support matrix /// https://github.com/opencv/opencv/wiki/Video-IO-hardware-acceleration /// @@ -20,7 +20,7 @@ public record VideoCapturePara public int HwDeviceIndex { get; } /// - /// Constructor, parameter of VideoCature for hardware acceleration + /// Constructor, parameter of VideoCapture for hardware acceleration /// public VideoCapturePara() { @@ -29,7 +29,7 @@ public VideoCapturePara() } /// - /// Constructor, parameter of VideoCature for hardware acceleration + /// Constructor, parameter of VideoCapture for hardware acceleration /// /// Video Acceleration type /// Hardware device index @@ -40,8 +40,11 @@ public VideoCapturePara(VideoAccelerationType videoAcceleration, int deviceIndex } /// - /// Get parameters of VideoCature for hardware acceleration + /// Get parameters of VideoCapture for hardware acceleration /// - public int[] GetParameters() => new[] { (int)VideoCaptureProperties.HwAcceleration, (int)AccelerationType, - (int)VideoCaptureProperties.HwDevice, HwDeviceIndex }; + public int[] GetParameters() => + [ + (int)VideoCaptureProperties.HwAcceleration, (int)AccelerationType, + (int)VideoCaptureProperties.HwDevice, HwDeviceIndex + ]; } diff --git a/src/OpenCvSharp/Modules/videoio/Enum/VideoWriterPara.cs b/src/OpenCvSharp/Modules/videoio/Enum/VideoWriterPara.cs index 738b66d09..04dc64996 100644 --- a/src/OpenCvSharp/Modules/videoio/Enum/VideoWriterPara.cs +++ b/src/OpenCvSharp/Modules/videoio/Enum/VideoWriterPara.cs @@ -42,6 +42,9 @@ public VideoWriterPara(VideoAccelerationType videoAcceleration, int deviceIndex) /// /// Get parameters of VideoWriter for hardware acceleration /// - public int[] GetParameters() => new[] { (int)VideoWriterProperties.HwAcceleration, (int)AccelerationType, - (int)VideoWriterProperties.HwDevice, HwDeviceIndex }; + public int[] GetParameters() => + [ + (int)VideoWriterProperties.HwAcceleration, (int)AccelerationType, + (int)VideoWriterProperties.HwDevice, HwDeviceIndex + ]; } diff --git a/src/OpenCvSharp/Modules/videoio/VideoCapture.cs b/src/OpenCvSharp/Modules/videoio/VideoCapture.cs index 881172092..437d4e170 100644 --- a/src/OpenCvSharp/Modules/videoio/VideoCapture.cs +++ b/src/OpenCvSharp/Modules/videoio/VideoCapture.cs @@ -82,7 +82,7 @@ public VideoCapture(int index, VideoCaptureAPIs apiPreference, int[] prms) /// (to backward compatibility usage of camera_id + domain_offset (CAP_*) is valid when apiPreference is CAP_ANY) /// preferred Capture API backends to use. Can be used to enforce a specific reader implementation /// if multiple are available: e.g. cv::CAP_DSHOW or cv::CAP_MSMF or cv::CAP_V4L. - /// Parameters of VideoCature for hardware acceleration + /// Parameters of VideoCapture for hardware acceleration /// public VideoCapture(int index, VideoCaptureAPIs apiPreference, VideoCapturePara prms) { @@ -116,9 +116,9 @@ public static VideoCapture FromCamera(int index, VideoCaptureAPIs apiPreference /// Opens a video file or a capturing device or an IP video stream for video capturing with API Preference /// /// it can be: - /// - name of video file (eg. `video.avi`) - /// - or image sequence (eg. `img_%02d.jpg`, which will read samples like `img_00.jpg, img_01.jpg, img_02.jpg, ...`) - /// - or URL of video stream (eg. `protocol://host:port/script_name?script_params|auth`). + /// - name of video file (e.g. `video.avi`) + /// - or image sequence (e.g. `img_%02d.jpg`, which will read samples like `img_00.jpg, img_01.jpg, img_02.jpg, ...`) + /// - or URL of video stream (e.g. `protocol://host:port/script_name?script_params|auth`). /// Note that each video stream or IP camera feed has its own URL scheme. Please refer to the /// documentation of source stream to know the right URL. /// apiPreference preferred Capture API backends to use. Can be used to enforce a specific reader @@ -172,9 +172,9 @@ public VideoCapture(string fileName, VideoCaptureAPIs apiPreference, int[] prms) /// Opens a video file or a capturing device or an IP video stream for video capturing with API Preference /// /// it can be: - /// - name of video file (eg. `video.avi`) - /// - or image sequence (eg. `img_%02d.jpg`, which will read samples like `img_00.jpg, img_01.jpg, img_02.jpg, ...`) - /// - or URL of video stream (eg. `protocol://host:port/script_name?script_params|auth`). + /// - name of video file (e.g. `video.avi`) + /// - or image sequence (e.g. `img_%02d.jpg`, which will read samples like `img_00.jpg, img_01.jpg, img_02.jpg, ...`) + /// - or URL of video stream (e.g. `protocol://host:port/script_name?script_params|auth`). /// Note that each video stream or IP camera feed has its own URL scheme. Please refer to the /// documentation of source stream to know the right URL. /// apiPreference preferred Capture API backends to use. Can be used to enforce a specific reader @@ -202,24 +202,22 @@ public VideoCapture(string fileName, VideoCaptureAPIs apiPreference, VideoCaptur /// Opens a video file or a capturing device or an IP video stream for video capturing with API Preference /// /// it can be: - /// - name of video file (eg. `video.avi`) - /// - or image sequence (eg. `img_%02d.jpg`, which will read samples like `img_00.jpg, img_01.jpg, img_02.jpg, ...`) - /// - or URL of video stream (eg. `protocol://host:port/script_name?script_params|auth`). + /// - name of video file (e.g. `video.avi`) + /// - or image sequence (e.g. `img_%02d.jpg`, which will read samples like `img_00.jpg, img_01.jpg, img_02.jpg, ...`) + /// - or URL of video stream (e.g. `protocol://host:port/script_name?script_params|auth`). /// Note that each video stream or IP camera feed has its own URL scheme. Please refer to the /// documentation of source stream to know the right URL. /// apiPreference preferred Capture API backends to use. Can be used to enforce a specific reader /// implementation if multiple are available: e.g. cv::CAP_FFMPEG or cv::CAP_IMAGES or cv::CAP_DSHOW. /// - public static VideoCapture FromFile(string fileName, VideoCaptureAPIs apiPreference = VideoCaptureAPIs.ANY) - { - return new VideoCapture(fileName, apiPreference); - } + public static VideoCapture FromFile(string fileName, VideoCaptureAPIs apiPreference = VideoCaptureAPIs.ANY) + => new(fileName, apiPreference); /// /// Initializes from native pointer /// /// CvCapture* - protected internal VideoCapture(IntPtr ptr) + internal protected VideoCapture(IntPtr ptr) { this.ptr = ptr; } @@ -334,12 +332,13 @@ public string FourCC { var src = (int)Get(VideoCaptureProperties.FourCC); var bytes = new IntBytes { Value = src }; - char[] fourcc = { + char[] fourcc = + [ Convert.ToChar(bytes.B1), Convert.ToChar(bytes.B2), Convert.ToChar(bytes.B3), Convert.ToChar(bytes.B4) - }; + ]; return new string(fourcc); } set @@ -354,13 +353,7 @@ public string FourCC /// /// Gets number of frames in video file /// - public int FrameCount - { - get - { - return (int)Get(VideoCaptureProperties.FrameCount); - } - } + public int FrameCount => (int)Get(VideoCaptureProperties.FrameCount); /// /// Gets or sets brightness of image (only for cameras) diff --git a/src/OpenCvSharp/Modules/videoio/VideoWriter.cs b/src/OpenCvSharp/Modules/videoio/VideoWriter.cs index 60e131981..235e238c0 100644 --- a/src/OpenCvSharp/Modules/videoio/VideoWriter.cs +++ b/src/OpenCvSharp/Modules/videoio/VideoWriter.cs @@ -269,7 +269,7 @@ public bool Open(string fileName, VideoCaptureAPIs apiPreference, FourCC fourcc, IsColor = isColor; NativeMethods.HandleException( - NativeMethods.videoio_VideoWriter_open2(ptr, fileName, (int)apiPreference, (int)fourcc, fps, frameSize, isColor ? 1 : 0, out var ret)); + NativeMethods.videoio_VideoWriter_open2(ptr, fileName, (int)apiPreference, fourcc, fps, frameSize, isColor ? 1 : 0, out var ret)); GC.KeepAlive(this); return ret != 0; diff --git a/src/OpenCvSharp/Modules/wechat_qrcode/WeChatQRCode.cs b/src/OpenCvSharp/Modules/wechat_qrcode/WeChatQRCode.cs index 593a1f1cb..8d64c6555 100644 --- a/src/OpenCvSharp/Modules/wechat_qrcode/WeChatQRCode.cs +++ b/src/OpenCvSharp/Modules/wechat_qrcode/WeChatQRCode.cs @@ -86,12 +86,8 @@ protected override void DisposeManaged() base.DisposeManaged(); } - internal class Ptr : OpenCvSharp.Ptr + internal class Ptr(IntPtr ptr) : OpenCvSharp.Ptr(ptr) { - public Ptr(IntPtr ptr) : base(ptr) - { - } - public override IntPtr Get() { NativeMethods.HandleException( diff --git a/src/OpenCvSharp/Modules/xfeatures2d/BriefDescriptorExtractor.cs b/src/OpenCvSharp/Modules/xfeatures2d/BriefDescriptorExtractor.cs index 7825a2b7d..e1c592ec7 100644 --- a/src/OpenCvSharp/Modules/xfeatures2d/BriefDescriptorExtractor.cs +++ b/src/OpenCvSharp/Modules/xfeatures2d/BriefDescriptorExtractor.cs @@ -61,12 +61,8 @@ protected override void DisposeManaged() base.DisposeManaged(); } - internal class Ptr : OpenCvSharp.Ptr + internal class Ptr(IntPtr ptr) : OpenCvSharp.Ptr(ptr) { - public Ptr(IntPtr ptr) : base(ptr) - { - } - public override IntPtr Get() { NativeMethods.HandleException( diff --git a/src/OpenCvSharp/Modules/xfeatures2d/FREAK.cs b/src/OpenCvSharp/Modules/xfeatures2d/FREAK.cs index c2b828503..19161cd6f 100644 --- a/src/OpenCvSharp/Modules/xfeatures2d/FREAK.cs +++ b/src/OpenCvSharp/Modules/xfeatures2d/FREAK.cs @@ -55,12 +55,8 @@ protected override void DisposeManaged() base.DisposeManaged(); } - internal class Ptr : OpenCvSharp.Ptr + internal class Ptr(IntPtr ptr) : OpenCvSharp.Ptr(ptr) { - public Ptr(IntPtr ptr) : base(ptr) - { - } - public override IntPtr Get() { NativeMethods.HandleException( diff --git a/src/OpenCvSharp/Modules/xfeatures2d/LATCH.cs b/src/OpenCvSharp/Modules/xfeatures2d/LATCH.cs index 60672a38b..14d36534b 100644 --- a/src/OpenCvSharp/Modules/xfeatures2d/LATCH.cs +++ b/src/OpenCvSharp/Modules/xfeatures2d/LATCH.cs @@ -55,12 +55,8 @@ protected override void DisposeManaged() base.DisposeManaged(); } - internal class Ptr : OpenCvSharp.Ptr + internal class Ptr(IntPtr ptr) : OpenCvSharp.Ptr(ptr) { - public Ptr(IntPtr ptr) : base(ptr) - { - } - public override IntPtr Get() { NativeMethods.HandleException( diff --git a/src/OpenCvSharp/Modules/xfeatures2d/LUCID.cs b/src/OpenCvSharp/Modules/xfeatures2d/LUCID.cs index 24867a3cc..9ccac389e 100644 --- a/src/OpenCvSharp/Modules/xfeatures2d/LUCID.cs +++ b/src/OpenCvSharp/Modules/xfeatures2d/LUCID.cs @@ -46,12 +46,8 @@ protected override void DisposeManaged() base.DisposeManaged(); } - internal class Ptr : OpenCvSharp.Ptr + internal class Ptr(IntPtr ptr) : OpenCvSharp.Ptr(ptr) { - public Ptr(IntPtr ptr) : base(ptr) - { - } - public override IntPtr Get() { NativeMethods.HandleException( diff --git a/src/OpenCvSharp/Modules/xfeatures2d/SURF.cs b/src/OpenCvSharp/Modules/xfeatures2d/SURF.cs index b375d4435..ef5083f95 100644 --- a/src/OpenCvSharp/Modules/xfeatures2d/SURF.cs +++ b/src/OpenCvSharp/Modules/xfeatures2d/SURF.cs @@ -175,12 +175,8 @@ public bool Upright #endregion - internal class Ptr : OpenCvSharp.Ptr + internal class Ptr(IntPtr ptr) : OpenCvSharp.Ptr(ptr) { - public Ptr(IntPtr ptr) : base(ptr) - { - } - public override IntPtr Get() { NativeMethods.HandleException( diff --git a/src/OpenCvSharp/Modules/xfeatures2d/StarDetector.cs b/src/OpenCvSharp/Modules/xfeatures2d/StarDetector.cs index f0889e180..2005313a1 100644 --- a/src/OpenCvSharp/Modules/xfeatures2d/StarDetector.cs +++ b/src/OpenCvSharp/Modules/xfeatures2d/StarDetector.cs @@ -50,12 +50,8 @@ protected override void DisposeManaged() base.DisposeManaged(); } - internal class Ptr : OpenCvSharp.Ptr + internal class Ptr(IntPtr ptr) : OpenCvSharp.Ptr(ptr) { - public Ptr(IntPtr ptr) : base(ptr) - { - } - public override IntPtr Get() { NativeMethods.HandleException( diff --git a/src/OpenCvSharp/Modules/ximgproc/CvXImgProc.cs b/src/OpenCvSharp/Modules/ximgproc/CvXImgProc.cs index 41a5c0ea4..567520926 100644 --- a/src/OpenCvSharp/Modules/ximgproc/CvXImgProc.cs +++ b/src/OpenCvSharp/Modules/ximgproc/CvXImgProc.cs @@ -245,7 +245,7 @@ public static void Paint(InputOutputArray image, InputArray rlSrc, Scalar value) } /// - /// Check whether a custom made structuring element can be used with run length morphological operations. + /// Check whether a custom-made structuring element can be used with run length morphological operations. /// (It must consist of a continuous array of single runs per row) /// /// @@ -576,7 +576,7 @@ public static void ColorMatchTemplate(InputArray img, InputArray templ, OutputAr if (templ is null) throw new ArgumentNullException(nameof(templ)); if (result is null) - throw new ArgumentNullException(nameof(img)); + throw new ArgumentNullException(nameof(result)); img.ThrowIfDisposed(); templ.ThrowIfDisposed(); result.ThrowIfNotReady(); diff --git a/src/OpenCvSharp/Modules/ximgproc/EdgeBoxes.cs b/src/OpenCvSharp/Modules/ximgproc/EdgeBoxes.cs index f8efb233a..3622ca242 100644 --- a/src/OpenCvSharp/Modules/ximgproc/EdgeBoxes.cs +++ b/src/OpenCvSharp/Modules/ximgproc/EdgeBoxes.cs @@ -359,12 +359,8 @@ public virtual void GetBoundingBoxes(InputArray edgeMap, InputArray orientationM GC.KeepAlive(orientationMap); } - internal class Ptr : OpenCvSharp.Ptr + internal class Ptr(IntPtr ptr) : OpenCvSharp.Ptr(ptr) { - public Ptr(IntPtr ptr) : base(ptr) - { - } - public override IntPtr Get() { NativeMethods.HandleException( diff --git a/src/OpenCvSharp/Modules/ximgproc/EdgeFilter/AdaptiveManifoldFilter.cs b/src/OpenCvSharp/Modules/ximgproc/EdgeFilter/AdaptiveManifoldFilter.cs index b6e60e562..249b911cc 100644 --- a/src/OpenCvSharp/Modules/ximgproc/EdgeFilter/AdaptiveManifoldFilter.cs +++ b/src/OpenCvSharp/Modules/ximgproc/EdgeFilter/AdaptiveManifoldFilter.cs @@ -226,12 +226,8 @@ public virtual void Filter(InputArray src, OutputArray dst, InputArray? joint = GC.KeepAlive(joint); } - internal class Ptr : OpenCvSharp.Ptr + internal class Ptr(IntPtr ptr) : OpenCvSharp.Ptr(ptr) { - public Ptr(IntPtr ptr) : base(ptr) - { - } - public override IntPtr Get() { NativeMethods.HandleException( diff --git a/src/OpenCvSharp/Modules/ximgproc/EdgeFilter/DTFilter.cs b/src/OpenCvSharp/Modules/ximgproc/EdgeFilter/DTFilter.cs index 2d985a70b..43fb8d2ad 100644 --- a/src/OpenCvSharp/Modules/ximgproc/EdgeFilter/DTFilter.cs +++ b/src/OpenCvSharp/Modules/ximgproc/EdgeFilter/DTFilter.cs @@ -85,12 +85,8 @@ public virtual void Filter(InputArray src, OutputArray dst, int dDepth = -1) dst.Fix(); } - internal class Ptr : OpenCvSharp.Ptr + internal class Ptr(IntPtr ptr) : OpenCvSharp.Ptr(ptr) { - public Ptr(IntPtr ptr) : base(ptr) - { - } - public override IntPtr Get() { NativeMethods.HandleException( diff --git a/src/OpenCvSharp/Modules/ximgproc/EdgeFilter/FastBilateralSolverFilter.cs b/src/OpenCvSharp/Modules/ximgproc/EdgeFilter/FastBilateralSolverFilter.cs index de0ca103a..17f56eba8 100644 --- a/src/OpenCvSharp/Modules/ximgproc/EdgeFilter/FastBilateralSolverFilter.cs +++ b/src/OpenCvSharp/Modules/ximgproc/EdgeFilter/FastBilateralSolverFilter.cs @@ -86,12 +86,8 @@ public virtual void Filter(InputArray src, InputArray confidence, OutputArray ds dst.Fix(); } - internal class Ptr : OpenCvSharp.Ptr + internal class Ptr(IntPtr ptr) : OpenCvSharp.Ptr(ptr) { - public Ptr(IntPtr ptr) : base(ptr) - { - } - public override IntPtr Get() { NativeMethods.HandleException( diff --git a/src/OpenCvSharp/Modules/ximgproc/EdgeFilter/FastGlobalSmootherFilter.cs b/src/OpenCvSharp/Modules/ximgproc/EdgeFilter/FastGlobalSmootherFilter.cs index 6e4d7d888..1438174fe 100644 --- a/src/OpenCvSharp/Modules/ximgproc/EdgeFilter/FastGlobalSmootherFilter.cs +++ b/src/OpenCvSharp/Modules/ximgproc/EdgeFilter/FastGlobalSmootherFilter.cs @@ -79,12 +79,8 @@ public virtual void Filter(InputArray src, OutputArray dst) dst.Fix(); } - internal class Ptr : OpenCvSharp.Ptr + internal class Ptr(IntPtr ptr) : OpenCvSharp.Ptr(ptr) { - public Ptr(IntPtr ptr) : base(ptr) - { - } - public override IntPtr Get() { NativeMethods.HandleException( diff --git a/src/OpenCvSharp/Modules/ximgproc/EdgeFilter/GuidedFilter.cs b/src/OpenCvSharp/Modules/ximgproc/EdgeFilter/GuidedFilter.cs index 5baa6fb95..1bace46dc 100644 --- a/src/OpenCvSharp/Modules/ximgproc/EdgeFilter/GuidedFilter.cs +++ b/src/OpenCvSharp/Modules/ximgproc/EdgeFilter/GuidedFilter.cs @@ -79,12 +79,8 @@ public virtual void Filter(InputArray src, OutputArray dst, int dDepth = -1) dst.Fix(); } - internal class Ptr : OpenCvSharp.Ptr + internal class Ptr(IntPtr ptr) : OpenCvSharp.Ptr(ptr) { - public Ptr(IntPtr ptr) : base(ptr) - { - } - public override IntPtr Get() { NativeMethods.HandleException( diff --git a/src/OpenCvSharp/Modules/ximgproc/FastLineDetector.cs b/src/OpenCvSharp/Modules/ximgproc/FastLineDetector.cs index 3828514be..7a3f8f99e 100644 --- a/src/OpenCvSharp/Modules/ximgproc/FastLineDetector.cs +++ b/src/OpenCvSharp/Modules/ximgproc/FastLineDetector.cs @@ -153,12 +153,8 @@ public virtual void DrawSegments(InputOutputArray image, IEnumerable line image.Fix(); } - internal class Ptr : OpenCvSharp.Ptr + internal class Ptr(IntPtr ptr) : OpenCvSharp.Ptr(ptr) { - public Ptr(IntPtr ptr) : base(ptr) - { - } - public override IntPtr Get() { NativeMethods.HandleException( diff --git a/src/OpenCvSharp/Modules/ximgproc/RFFeatureGetter.cs b/src/OpenCvSharp/Modules/ximgproc/RFFeatureGetter.cs index c2daa680a..763d1ca03 100644 --- a/src/OpenCvSharp/Modules/ximgproc/RFFeatureGetter.cs +++ b/src/OpenCvSharp/Modules/ximgproc/RFFeatureGetter.cs @@ -79,12 +79,8 @@ public virtual void GetFeatures( GC.KeepAlive(features); } - internal class Ptr : OpenCvSharp.Ptr + internal class Ptr(IntPtr ptr) : OpenCvSharp.Ptr(ptr) { - public Ptr(IntPtr ptr) : base(ptr) - { - } - public override IntPtr Get() { NativeMethods.HandleException( diff --git a/src/OpenCvSharp/Modules/ximgproc/RidgeDetectionFilter.cs b/src/OpenCvSharp/Modules/ximgproc/RidgeDetectionFilter.cs index aaa1c8ada..d9e980985 100644 --- a/src/OpenCvSharp/Modules/ximgproc/RidgeDetectionFilter.cs +++ b/src/OpenCvSharp/Modules/ximgproc/RidgeDetectionFilter.cs @@ -83,12 +83,8 @@ public virtual void GetRidgeFilteredImage(InputArray src, OutputArray dst) GC.KeepAlive(this); } - internal class Ptr : OpenCvSharp.Ptr + internal class Ptr(IntPtr ptr) : OpenCvSharp.Ptr(ptr) { - public Ptr(IntPtr ptr) : base(ptr) - { - } - public override IntPtr Get() { NativeMethods.HandleException( diff --git a/src/OpenCvSharp/Modules/ximgproc/Segmentation/GraphSegmentation.cs b/src/OpenCvSharp/Modules/ximgproc/Segmentation/GraphSegmentation.cs index f9232c726..9ef1d4492 100644 --- a/src/OpenCvSharp/Modules/ximgproc/Segmentation/GraphSegmentation.cs +++ b/src/OpenCvSharp/Modules/ximgproc/Segmentation/GraphSegmentation.cs @@ -132,12 +132,8 @@ public virtual void ProcessImage(InputArray src, OutputArray dst) GC.KeepAlive(dst); } - internal class Ptr : OpenCvSharp.Ptr + internal class Ptr(IntPtr ptr) : OpenCvSharp.Ptr(ptr) { - public Ptr(IntPtr ptr) : base(ptr) - { - } - public override IntPtr Get() { NativeMethods.HandleException( diff --git a/src/OpenCvSharp/Modules/ximgproc/Segmentation/SelectiveSearchSegmentation.cs b/src/OpenCvSharp/Modules/ximgproc/Segmentation/SelectiveSearchSegmentation.cs index df3ec3b61..edea8c39b 100644 --- a/src/OpenCvSharp/Modules/ximgproc/Segmentation/SelectiveSearchSegmentation.cs +++ b/src/OpenCvSharp/Modules/ximgproc/Segmentation/SelectiveSearchSegmentation.cs @@ -132,7 +132,7 @@ public virtual void ClearImages() } /// - /// Add a new graph segmentation in the list of graph segementations to process. + /// Add a new graph segmentation in the list of graph segmentations to process. /// /// The graph segmentation public virtual void AddGraphSegmentation(GraphSegmentation g) @@ -143,7 +143,7 @@ public virtual void AddGraphSegmentation(GraphSegmentation g) g.ThrowIfDisposed(); if (g.PtrObj is null) - throw new ArgumentException($"PtrObj = null", nameof(g)); + throw new ArgumentException("PtrObj = null", nameof(g)); NativeMethods.HandleException( NativeMethods.ximgproc_segmentation_SelectiveSearchSegmentation_addGraphSegmentation(ptr, g.PtrObj.CvPtr)); @@ -210,12 +210,8 @@ public virtual void Process(out Rect[] rects) GC.KeepAlive(this); } - internal class Ptr : OpenCvSharp.Ptr + internal class Ptr(IntPtr ptr) : OpenCvSharp.Ptr(ptr) { - public Ptr(IntPtr ptr) : base(ptr) - { - } - public override IntPtr Get() { NativeMethods.HandleException( diff --git a/src/OpenCvSharp/Modules/ximgproc/Segmentation/SelectiveSearchSegmentationStrategy.cs b/src/OpenCvSharp/Modules/ximgproc/Segmentation/SelectiveSearchSegmentationStrategy.cs index 667f6c20d..eb9723ec6 100644 --- a/src/OpenCvSharp/Modules/ximgproc/Segmentation/SelectiveSearchSegmentationStrategy.cs +++ b/src/OpenCvSharp/Modules/ximgproc/Segmentation/SelectiveSearchSegmentationStrategy.cs @@ -120,12 +120,8 @@ public static SelectiveSearchSegmentationStrategyColor Create() return new SelectiveSearchSegmentationStrategyColor(p); } - internal class Ptr : OpenCvSharp.Ptr + internal class Ptr(IntPtr ptr) : OpenCvSharp.Ptr(ptr) { - public Ptr(IntPtr ptr) : base(ptr) - { - } - public override IntPtr Get() { NativeMethods.HandleException( @@ -170,12 +166,8 @@ public static SelectiveSearchSegmentationStrategySize Create() return new SelectiveSearchSegmentationStrategySize(p); } - internal class Ptr : OpenCvSharp.Ptr + internal class Ptr(IntPtr ptr) : OpenCvSharp.Ptr(ptr) { - public Ptr(IntPtr ptr) : base(ptr) - { - } - public override IntPtr Get() { NativeMethods.HandleException( @@ -218,12 +210,8 @@ public static SelectiveSearchSegmentationStrategyTexture Create() return new SelectiveSearchSegmentationStrategyTexture(p); } - internal class Ptr : OpenCvSharp.Ptr + internal class Ptr(IntPtr ptr) : OpenCvSharp.Ptr(ptr) { - public Ptr(IntPtr ptr) : base(ptr) - { - } - public override IntPtr Get() { NativeMethods.HandleException( @@ -266,12 +254,8 @@ public static SelectiveSearchSegmentationStrategyFill Create() return new SelectiveSearchSegmentationStrategyFill(p); } - internal class Ptr : OpenCvSharp.Ptr + internal class Ptr(IntPtr ptr) : OpenCvSharp.Ptr(ptr) { - public Ptr(IntPtr ptr) : base(ptr) - { - } - public override IntPtr Get() { NativeMethods.HandleException( diff --git a/src/OpenCvSharp/Modules/ximgproc/Segmentation/SelectiveSearchSegmentationStrategyMultiple.cs b/src/OpenCvSharp/Modules/ximgproc/Segmentation/SelectiveSearchSegmentationStrategyMultiple.cs index 5d4e955c5..a7ed8e8a8 100644 --- a/src/OpenCvSharp/Modules/ximgproc/Segmentation/SelectiveSearchSegmentationStrategyMultiple.cs +++ b/src/OpenCvSharp/Modules/ximgproc/Segmentation/SelectiveSearchSegmentationStrategyMultiple.cs @@ -164,12 +164,8 @@ public static SelectiveSearchSegmentationStrategyMultiple Create( return new SelectiveSearchSegmentationStrategyMultiple(p); } - internal class Ptr : OpenCvSharp.Ptr + internal class Ptr(IntPtr ptr) : OpenCvSharp.Ptr(ptr) { - public Ptr(IntPtr ptr) : base(ptr) - { - } - public override IntPtr Get() { NativeMethods.HandleException( diff --git a/src/OpenCvSharp/Modules/ximgproc/StructuredEdgeDetection.cs b/src/OpenCvSharp/Modules/ximgproc/StructuredEdgeDetection.cs index 1cf20cdbd..f7c7943ef 100644 --- a/src/OpenCvSharp/Modules/ximgproc/StructuredEdgeDetection.cs +++ b/src/OpenCvSharp/Modules/ximgproc/StructuredEdgeDetection.cs @@ -154,12 +154,8 @@ public virtual void EdgesNms(InputArray edgeImage, InputArray orientationImage, dst.Fix(); } - internal class Ptr : OpenCvSharp.Ptr + internal class Ptr(IntPtr ptr) : OpenCvSharp.Ptr(ptr) { - public Ptr(IntPtr ptr) : base(ptr) - { - } - public override IntPtr Get() { NativeMethods.HandleException( diff --git a/src/OpenCvSharp/Modules/ximgproc/Superpixel/SuperpixelLSC.cs b/src/OpenCvSharp/Modules/ximgproc/Superpixel/SuperpixelLSC.cs index 70624672d..705730729 100644 --- a/src/OpenCvSharp/Modules/ximgproc/Superpixel/SuperpixelLSC.cs +++ b/src/OpenCvSharp/Modules/ximgproc/Superpixel/SuperpixelLSC.cs @@ -161,12 +161,8 @@ public virtual void EnforceLabelConnectivity(int minElementSize = 20) GC.KeepAlive(this); } - internal class Ptr : OpenCvSharp.Ptr + internal class Ptr(IntPtr ptr) : OpenCvSharp.Ptr(ptr) { - public Ptr(IntPtr ptr) : base(ptr) - { - } - public override IntPtr Get() { NativeMethods.HandleException( diff --git a/src/OpenCvSharp/Modules/ximgproc/Superpixel/SuperpixelSEEDS.cs b/src/OpenCvSharp/Modules/ximgproc/Superpixel/SuperpixelSEEDS.cs index 70b5b6cff..e80b4a819 100644 --- a/src/OpenCvSharp/Modules/ximgproc/Superpixel/SuperpixelSEEDS.cs +++ b/src/OpenCvSharp/Modules/ximgproc/Superpixel/SuperpixelSEEDS.cs @@ -163,12 +163,8 @@ public virtual void GetLabelContourMask(OutputArray image, bool thickLine = true image.Fix(); } - internal class Ptr : OpenCvSharp.Ptr + internal class Ptr(IntPtr ptr) : OpenCvSharp.Ptr(ptr) { - public Ptr(IntPtr ptr) : base(ptr) - { - } - public override IntPtr Get() { NativeMethods.HandleException( diff --git a/src/OpenCvSharp/Modules/ximgproc/Superpixel/SuperpixelSLIC.cs b/src/OpenCvSharp/Modules/ximgproc/Superpixel/SuperpixelSLIC.cs index b9326a512..75c656829 100644 --- a/src/OpenCvSharp/Modules/ximgproc/Superpixel/SuperpixelSLIC.cs +++ b/src/OpenCvSharp/Modules/ximgproc/Superpixel/SuperpixelSLIC.cs @@ -163,12 +163,8 @@ public virtual void EnforceLabelConnectivity(int minElementSize = 20) GC.KeepAlive(this); } - internal class Ptr : OpenCvSharp.Ptr + internal class Ptr(IntPtr ptr) : OpenCvSharp.Ptr(ptr) { - public Ptr(IntPtr ptr) : base(ptr) - { - } - public override IntPtr Get() { NativeMethods.HandleException( diff --git a/src/OpenCvSharp/Modules/xphoto/GrayworldWB.cs b/src/OpenCvSharp/Modules/xphoto/GrayworldWB.cs index 300df6879..b358d40d1 100644 --- a/src/OpenCvSharp/Modules/xphoto/GrayworldWB.cs +++ b/src/OpenCvSharp/Modules/xphoto/GrayworldWB.cs @@ -86,13 +86,8 @@ public override void BalanceWhite(InputArray src, OutputArray dst) dst.Fix(); } - internal class Ptr : OpenCvSharp.Ptr + internal class Ptr(IntPtr ptr) : OpenCvSharp.Ptr(ptr) { - public Ptr(IntPtr ptr) - : base(ptr) - { - } - public override IntPtr Get() { NativeMethods.HandleException( diff --git a/src/OpenCvSharp/Modules/xphoto/LearningBasedWB.cs b/src/OpenCvSharp/Modules/xphoto/LearningBasedWB.cs index d325aa388..233b8c4ae 100644 --- a/src/OpenCvSharp/Modules/xphoto/LearningBasedWB.cs +++ b/src/OpenCvSharp/Modules/xphoto/LearningBasedWB.cs @@ -151,13 +151,8 @@ public void ExtractSimpleFeatures(InputArray src, OutputArray dst) dst.Fix(); } - internal class Ptr : OpenCvSharp.Ptr + internal class Ptr(IntPtr ptr) : OpenCvSharp.Ptr(ptr) { - public Ptr(IntPtr ptr) - : base(ptr) - { - } - public override IntPtr Get() { NativeMethods.HandleException( diff --git a/src/OpenCvSharp/Modules/xphoto/SimpleWB.cs b/src/OpenCvSharp/Modules/xphoto/SimpleWB.cs index a7ed03f96..48cf66ff7 100644 --- a/src/OpenCvSharp/Modules/xphoto/SimpleWB.cs +++ b/src/OpenCvSharp/Modules/xphoto/SimpleWB.cs @@ -174,13 +174,8 @@ public override void BalanceWhite(InputArray src, OutputArray dst) dst.Fix(); } - internal class Ptr : OpenCvSharp.Ptr + internal class Ptr(IntPtr ptr) : OpenCvSharp.Ptr(ptr) { - public Ptr(IntPtr ptr) - : base(ptr) - { - } - public override IntPtr Get() { NativeMethods.HandleException( diff --git a/src/OpenCvSharp/Modules/xphoto/TonemapDurand.cs b/src/OpenCvSharp/Modules/xphoto/TonemapDurand.cs index 80a99d20d..aad6c857d 100644 --- a/src/OpenCvSharp/Modules/xphoto/TonemapDurand.cs +++ b/src/OpenCvSharp/Modules/xphoto/TonemapDurand.cs @@ -152,12 +152,8 @@ public float SigmaColor } } - private class Ptr : OpenCvSharp.Ptr + private class Ptr(IntPtr ptr) : OpenCvSharp.Ptr(ptr) { - public Ptr(IntPtr ptr) : base(ptr) - { - } - public override IntPtr Get() { NativeMethods.HandleException(