Skip to content

O
opencv
Commit 8511b696 authored by Vadim Pisarevsky's avatar Vadim Pisarevsky
Browse files
Options

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

parent 4339f69d
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 4 deletions
modules/core/include/opencv2/core/mat.hpp
View file @ 8511b696
...@@ -805,7 +805,7 @@ template<typename _Tp> inline Mat_<_Tp>::Mat_(const Mat_& m, const Rect& roi) ...@@ -805,7 +805,7 @@ template<typename _Tp> inline Mat_<_Tp>::Mat_(const Mat_& m, const Rect& roi)
template<typename _Tp> template<int n> inline template<typename _Tp> template<int n> inline
Mat_<_Tp>::Mat_(const Vec<typename DataType<_Tp>::channel_type, n>& vec, bool copyData) 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); CV_Assert(n%DataType<_Tp>::channels == 0);
if( copyData ) if( copyData )
...@@ -814,7 +814,7 @@ template<typename _Tp> template<int n> inline ...@@ -814,7 +814,7 @@ template<typename _Tp> template<int n> inline
template<typename _Tp> template<int m, 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_<_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); CV_Assert(n % DataType<_Tp>::channels == 0);
if( copyData ) if( copyData )
...@@ -822,7 +822,7 @@ template<typename _Tp> template<int m, int n> inline ...@@ -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) 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); CV_Assert(2 % DataType<_Tp>::channels == 0);
if( copyData ) if( copyData )
...@@ -830,7 +830,7 @@ template<typename _Tp> inline Mat_<_Tp>::Mat_(const Point_<typename DataType<_Tp ...@@ -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) 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); CV_Assert(3 % DataType<_Tp>::channels == 0);
if( copyData ) if( copyData )
......
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