Merge pull request #1989 from shimat/feature/inputarray-migration-cleanup-5x

Migration: InputArray/OutputArray/InputOutputArray to allocation-free ref structs (issue #1976 step 4 & 5)

Author: shimat

src/OpenCvSharp/Cv2/Cv2_calib.FishEye.cs

@@ -21,14 +21,10 @@ static partial class Cv2
     /// <returns>keypoints detected on the image.</returns>
     public static KeyPoint[] FAST(InputArray image, int threshold, bool nonmaxSupression = true)
     {
-        if (image is null)
-            throw new ArgumentNullException(nameof(image));
-        image.ThrowIfDisposed();
-
         using var kp = new StdVector<KeyPoint>();
         NativeMethods.HandleException(
-            NativeMethods.features_FAST1(image.ToInputProxy(), kp.CvPtr, threshold, nonmaxSupression ? 1 : 0));
-        GC.KeepAlive(image);
+            NativeMethods.features_FAST1(image.Proxy, kp.CvPtr, threshold, nonmaxSupression ? 1 : 0));
+        GC.KeepAlive(image.Source);
         return kp.ToArray();
     }
 
@@ -44,14 +40,10 @@ public static KeyPoint[] FAST(InputArray image, int threshold, bool nonmaxSupres
     /// <returns>keypoints detected on the image.</returns>
     public static KeyPoint[] FAST(InputArray image, int threshold, bool nonmaxSupression, FASTType type)
     {
-        if (image is null)
-            throw new ArgumentNullException(nameof(image));
-        image.ThrowIfDisposed();
-
         using var kp = new StdVector<KeyPoint>();
         NativeMethods.HandleException(
-            NativeMethods.features_FAST2(image.ToInputProxy(), kp.CvPtr, threshold, nonmaxSupression ? 1 : 0, (int)type));
-        GC.KeepAlive(image);
+            NativeMethods.features_FAST2(image.Proxy, kp.CvPtr, threshold, nonmaxSupression ? 1 : 0, (int)type));
+        GC.KeepAlive(image.Source);
         return kp.ToArray();
     }
 
@@ -67,14 +59,10 @@ public static KeyPoint[] FAST(InputArray image, int threshold, bool nonmaxSupres
     /// <returns>keypoints detected on the image.</returns>
     public static KeyPoint[] AGAST(InputArray image, int threshold, bool nonmaxSuppression, AgastFeatureDetector.DetectorType type)
     {
-        if (image is null)
-            throw new ArgumentNullException(nameof(image));
-        image.ThrowIfDisposed();
-
         using var vector = new StdVector<KeyPoint>();
         NativeMethods.HandleException(
-            NativeMethods.xfeatures2d_AGAST(image.ToInputProxy(), vector.CvPtr, threshold, nonmaxSuppression ? 1 : 0, (int) type));
-        GC.KeepAlive(image);
+            NativeMethods.xfeatures2d_AGAST(image.Proxy, vector.CvPtr, threshold, nonmaxSuppression ? 1 : 0, (int) type));
+        GC.KeepAlive(image.Source);
         return vector.ToArray();
     }
 
@@ -93,22 +81,16 @@ public static void DrawKeypoints(
         Scalar? color = null,
         DrawMatchesFlags flags = DrawMatchesFlags.Default)
     {
-        if (image is null)
-            throw new ArgumentNullException(nameof(image));
-        if (outImage is null)
-            throw new ArgumentNullException(nameof(outImage));
         if (keypoints is null)
             throw new ArgumentNullException(nameof(keypoints));
-        image.ThrowIfDisposed();
-        outImage.ThrowIfDisposed();
 
         var keypointsArray = keypoints.CastOrToArray();
         var color0 = color.GetValueOrDefault(Scalar.All(-1));
         NativeMethods.HandleException(
-            NativeMethods.features_drawKeypoints(image.ToInputProxy(), keypointsArray, keypointsArray.Length, outImage.ToInputOutputProxy(), color0, (int)flags));
+            NativeMethods.features_drawKeypoints(image.Proxy, keypointsArray, keypointsArray.Length, outImage.Proxy, color0, (int)flags));
 
-        GC.KeepAlive(image);
-        GC.KeepAlive(outImage);
+        GC.KeepAlive(image.Source);
+        GC.KeepAlive(outImage.Source);
     }
 
     /// <summary>