implement _OutputArray::assign() for _OutputArrays of type MATX

10 years ago · e97d18ba81
parent b2a5e66fc5
commit e97d18ba81
1 changed files with 8 additions and 0 deletions
--- a/modules/core/src/matrix.cpp
+++ b/modules/core/src/matrix.cpp
@ -2644,6 +2644,10 @@ void _OutputArray::assign(const UMat& u) const
    {
        u.copyTo(*(Mat*)obj); // TODO check u.getMat()
    }
+    else if (k == MATX)
+    {
+        u.copyTo(getMat()); // TODO check u.getMat()
+    }
    else
    {
        CV_Error(Error::StsNotImplemented, "");
@ -2662,6 +2666,10 @@ void _OutputArray::assign(const Mat& m) const
    {
        *(Mat*)obj = m;
    }
+    else if (k == MATX)
+    {
+        getMat() = m;
+    }
    else
    {
        CV_Error(Error::StsNotImplemented, "");