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

fixed Mat::Mat(Vec|Matx|vector) constructor (ticket #747)

Browse Source
This commit is contained in:
Vadim Pisarevsky
2010-12-11 18:32:11 +00:00
parent 4339f69da4
commit 8511b69635
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
modules/core/include/opencv2/core/mat.hpp
View File

@@ -805,7 +805,7 @@ template<typename _Tp> inline Mat_<_Tp>::Mat_(const Mat_& m, const Rect& roi)
template<typename _Tp> template<int n> inline
Mat_<_Tp>::Mat_(const Vec<typename DataType<_Tp>::channel_type, n>& vec, bool copyData)
: Mat(n/DataType<_Tp>::channels, 1, DataType<_Tp>::type, &vec)
: Mat(n/DataType<_Tp>::channels, 1, DataType<_Tp>::type, (void*)&vec)
{
CV_Assert(n%DataType<_Tp>::channels == 0);
if( copyData )
@@ -814,7 +814,7 @@ template<typename _Tp> template<int n> inline
template<typename _Tp> template<int m, int n> inline
Mat_<_Tp>::Mat_(const Matx<typename DataType<_Tp>::channel_type,m,n>& M, bool copyData)
: Mat(m, n/DataType<_Tp>::channels, DataType<_Tp>::type, &M)
: Mat(m, n/DataType<_Tp>::channels, DataType<_Tp>::type, (void*)&M)
{
CV_Assert(n % DataType<_Tp>::channels == 0);
if( copyData )
@@ -822,7 +822,7 @@ template<typename _Tp> template<int m, int n> inline
}
template<typename _Tp> inline Mat_<_Tp>::Mat_(const Point_<typename DataType<_Tp>::channel_type>& pt, bool copyData)
: Mat(2/DataType<_Tp>::channels, 1, DataType<_Tp>::type, &pt)
: Mat(2/DataType<_Tp>::channels, 1, DataType<_Tp>::type, (void*)&pt)
{
CV_Assert(2 % DataType<_Tp>::channels == 0);
if( copyData )
@@ -830,7 +830,7 @@ template<typename _Tp> inline Mat_<_Tp>::Mat_(const Point_<typename DataType<_Tp
}
template<typename _Tp> inline Mat_<_Tp>::Mat_(const Point3_<typename DataType<_Tp>::channel_type>& pt, bool copyData)
: Mat(3/DataType<_Tp>::channels, 1, DataType<_Tp>::type, &pt)
: Mat(3/DataType<_Tp>::channels, 1, DataType<_Tp>::type, (void*)&pt)
{
CV_Assert(3 % DataType<_Tp>::channels == 0);
if( copyData )