Expose InputArray's GetUMat

ravazquez · ravazquez · commit c713d1ffde11 · 2021-02-14T20:16:17.000Z
diff --git a/src/OpenCvSharp/Internal/PInvoke/NativeMethods/core/NativeMethods_core_InputArray.cs b/src/OpenCvSharp/Internal/PInvoke/NativeMethods/core/NativeMethods_core_InputArray.cs
@@ -45,8 +45,10 @@ static partial class NativeMethods
         public static extern ExceptionStatus core_InputArray_getMat(IntPtr ia, int idx, out IntPtr returnValue);
         //[Pure, DllImport(DllExtern, CallingConvention = CallingConvention.Cdecl, ExactSpelling = true)]
         //public static extern ExceptionStatus core_InputArray_getMat_(IntPtr ia, int idx, out IntPtr returnValue);
-        //[Pure, DllImport(DllExtern, CallingConvention = CallingConvention.Cdecl, ExactSpelling = true)]
-        //public static extern IntPtr core_InputArray_getUMat(IntPtr ia, int idx);
+
+        [Pure, DllImport(DllExtern, CallingConvention = CallingConvention.Cdecl, ExactSpelling = true)]
+        public static extern ExceptionStatus core_InputArray_getUMat(IntPtr ia, int idx, out IntPtr returnValue);
+        
         [Pure, DllImport(DllExtern, CallingConvention = CallingConvention.Cdecl, ExactSpelling = true)]
         public static extern ExceptionStatus core_InputArray_getMatVector(IntPtr ia, IntPtr mv);
         //[Pure, DllImport(DllExtern, CallingConvention = CallingConvention.Cdecl, ExactSpelling = true)]
diff --git a/src/OpenCvSharp/Modules/core/InputArray.cs b/src/OpenCvSharp/Modules/core/InputArray.cs
@@ -742,6 +742,20 @@ public Mat[] GetMatVector()
             return vec.ToArray();
         }
 
+        /// <summary>
+        /// 
+        /// </summary>
+        /// <param name="i"></param>
+        /// <returns></returns>
+        public UMat GetUMat(int i = -1)
+        {
+            ThrowIfDisposed();
+            NativeMethods.HandleException(
+                NativeMethods.core_InputArray_getUMat(ptr, i, out var ret));
+            GC.KeepAlive(this);
+            return new UMat(ret);
+        }
+
         /// <summary>
         /// 
         /// </summary>
diff --git a/src/OpenCvSharpExtern/core_InputArray.h b/src/OpenCvSharpExtern/core_InputArray.h
@@ -116,10 +116,15 @@ CVAPI(ExceptionStatus) core_InputArray_getMat(cv::_InputArray *ia, int idx, cv::
     *returnValue = new cv::Mat(ia->getMat_(idx));
     END_WRAP
 }*/
-/*CVAPI(cv::UMat*) core_InputArray_getUMat(cv::_InputArray *ia, int idx)
+
+CVAPI(ExceptionStatus) core_InputArray_getUMat(cv::_InputArray* ia, int idx, cv::UMat** returnValue)
 {
-    return new cv::UMat(ia->getUMat(idx));
-}*/
+    BEGIN_WRAP
+    * returnValue = new cv::Mat(ia->getUMat(idx));
+    END_WRAP
+    
+}
+
 CVAPI(ExceptionStatus) core_InputArray_getMatVector(cv::_InputArray *ia, std::vector<cv::Mat> *mv)
 {
     BEGIN_WRAP
