generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #1874 from SpecLad:merge-2.4

Browse Source
This commit is contained in:
Roman Donchenko
2013-11-28 16:42:53 +04:00
committed by OpenCV Buildbot
parent 41ae5d5f66 2fed668390
commit 9ca80961fd
111 changed files with 1018 additions and 473 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
modules/core/include/opencv2/core/mat.inl.hpp
View File

@@ -1531,7 +1531,9 @@ template<typename _Tp> template<int m, int n> inline
Mat_<_Tp>::operator Matx<typename DataType<_Tp>::channel_type, m, n>() const
{
CV_Assert(n % DataType<_Tp>::channels == 0);
return this->Mat::operator Matx<typename DataType<_Tp>::channel_type, m, n>();
Matx<typename DataType<_Tp>::channel_type, m, n> res = this->Mat::operator Matx<typename DataType<_Tp>::channel_type, m, n>();
return res;
}
template<typename _Tp> inline