From e97d18ba812f6f0410850a22eaa04abecf3c9310 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nicu=20=C8=98tiurc=C4=83?= <nstiurca@seas.upenn.edu>
Date: Mon, 19 Jan 2015 15:26:51 -0500
Subject: [PATCH] implement _OutputArray::assign() for _OutputArrays of type
 MATX

---
 modules/core/src/matrix.cpp | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/modules/core/src/matrix.cpp b/modules/core/src/matrix.cpp
index 38ff7ed53..04d6fb40f 100644
--- 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, "");