Commit e97d18ba authored by Nicu Știurcă's avatar Nicu Știurcă

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

parent b2a5e66f
...@@ -2644,6 +2644,10 @@ void _OutputArray::assign(const UMat& u) const ...@@ -2644,6 +2644,10 @@ void _OutputArray::assign(const UMat& u) const
{ {
u.copyTo(*(Mat*)obj); // TODO check u.getMat() u.copyTo(*(Mat*)obj); // TODO check u.getMat()
} }
else if (k == MATX)
{
u.copyTo(getMat()); // TODO check u.getMat()
}
else else
{ {
CV_Error(Error::StsNotImplemented, ""); CV_Error(Error::StsNotImplemented, "");
...@@ -2662,6 +2666,10 @@ void _OutputArray::assign(const Mat& m) const ...@@ -2662,6 +2666,10 @@ void _OutputArray::assign(const Mat& m) const
{ {
*(Mat*)obj = m; *(Mat*)obj = m;
} }
else if (k == MATX)
{
getMat() = m;
}
else else
{ {
CV_Error(Error::StsNotImplemented, ""); CV_Error(Error::StsNotImplemented, "");
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment