mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2024-11-29 22:00:25 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Nicu Știurcă 2015-01-19 15:26:51 -05:00
parent b2a5e66fc5
commit e97d18ba81
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
modules/core/src/matrix.cpp
View File

@ -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
{ {
*(Mat*)obj = m; *(Mat*)obj = m;
} }
else if (k == MATX)
{
getMat() = m;
}
else else
{ {
CV_Error(Error::StsNotImplemented, ""); CV_Error(Error::StsNotImplemented, "");