Merge pull request #3629 from nstiurca:matx-fix

2015-01-22 09:43:33 +00:00
parent 4949f70860 8722faa167
commit f93be25cc8
2 changed files with 111 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)
+    {
+        m.copyTo(getMat());
+    }
    else
    {
        CV_Error(Error::StsNotImplemented, "");