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

fixed matrix comma initializer for shorter notation

Browse Source
This commit is contained in:
Vadim Pisarevsky 2010-06-09 18:17:50 +00:00
parent 8710c8d669
commit 345a57b616
2 changed files with 21 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
modules/core/include/opencv2/core/core.hpp
View File

@ -1069,8 +1069,9 @@ template<typename M> class CV_EXPORTS MatOp_T_;
typedef MatExpr_<MatExpr_Op4_<Size, int, Scalar, typedef MatExpr_<MatExpr_Op4_<Size, int, Scalar,
int, Mat, MatOp_Set_<Mat> >, Mat> MatExpr_Initializer; int, Mat, MatOp_Set_<Mat> >, Mat> MatExpr_Initializer;
template<typename _Tp> class MatIterator_; template<typename _Tp> class CV_EXPORTS MatIterator_;
template<typename _Tp> class MatConstIterator_; template<typename _Tp> class CV_EXPORTS MatConstIterator_;
template<typename _Tp> class CV_EXPORTS MatCommaInitializer_;
enum { MAGIC_MASK=0xFFFF0000, TYPE_MASK=0x00000FFF, DEPTH_MASK=7 }; enum { MAGIC_MASK=0xFFFF0000, TYPE_MASK=0x00000FFF, DEPTH_MASK=7 };
@ -1327,6 +1328,8 @@ public:
template<typename _Tp> explicit Mat(const Point_<_Tp>& pt); template<typename _Tp> explicit Mat(const Point_<_Tp>& pt);
//! builds matrix from a 3D point //! builds matrix from a 3D point
template<typename _Tp> explicit Mat(const Point3_<_Tp>& pt); template<typename _Tp> explicit Mat(const Point3_<_Tp>& pt);
//! builds matrix from comma initializer
template<typename _Tp> explicit Mat(const MatCommaInitializer_<_Tp>& commaInitializer);
//! helper constructor to compile matrix expressions //! helper constructor to compile matrix expressions
Mat(const MatExpr_Base& expr); Mat(const MatExpr_Base& expr);
//! destructor - calls release() //! destructor - calls release()
@ -2116,6 +2119,7 @@ public:
template<int n> explicit Mat_(const Vec<_Tp, n>& vec); template<int n> explicit Mat_(const Vec<_Tp, n>& vec);
explicit Mat_(const Point_<_Tp>& pt); explicit Mat_(const Point_<_Tp>& pt);
explicit Mat_(const Point3_<_Tp>& pt); explicit Mat_(const Point3_<_Tp>& pt);
explicit Mat_(const MatCommaInitializer_<_Tp>& commaInitializer);
Mat_& operator = (const Mat& m); Mat_& operator = (const Mat& m);
Mat_& operator = (const Mat_& m); Mat_& operator = (const Mat_& m);
@ -2349,7 +2353,7 @@ public:
//! the operator that takes the next value and put it to the matrix //! the operator that takes the next value and put it to the matrix
template<typename T2> MatCommaInitializer_<_Tp>& operator , (T2 v); template<typename T2> MatCommaInitializer_<_Tp>& operator , (T2 v);
//! the conversion operator //! the conversion operator
operator Mat_<_Tp>() const; //operator Mat_<_Tp>() const;
//! another form of conversion operator //! another form of conversion operator
Mat_<_Tp> operator *() const; Mat_<_Tp> operator *() const;
void assignTo(Mat& m, int type=-1) const; void assignTo(Mat& m, int type=-1) const;

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

@ -263,6 +263,13 @@ template<typename _Tp> inline Mat::Mat(const Point3_<_Tp>& pt)
((_Tp*)data)[2] = pt.z; ((_Tp*)data)[2] = pt.z;
} }
template<typename _Tp> inline Mat::Mat(const MatCommaInitializer_<_Tp>& commaInitializer)
: flags(MAGIC_VAL | DataType<_Tp>::type | CV_MAT_CONT_FLAG),
rows(0), cols(0), step(0), data(0), refcount(0),
datastart(0), dataend(0)
{
*this = *commaInitializer;
}
inline Mat::~Mat() inline Mat::~Mat()
{ {
@ -637,6 +644,12 @@ template<typename _Tp> inline Mat_<_Tp>::Mat_(const Point3_<_Tp>& pt)
} }
template<typename _Tp> inline Mat_<_Tp>::Mat_(const MatCommaInitializer_<_Tp>& commaInitializer)
: Mat(commaInitializer)
{
}
template<typename _Tp> inline Mat_<_Tp>::Mat_(const vector<_Tp>& vec, bool copyData) template<typename _Tp> inline Mat_<_Tp>::Mat_(const vector<_Tp>& vec, bool copyData)
: Mat(vec, copyData) : Mat(vec, copyData)
{} {}
@ -3707,12 +3720,6 @@ MatCommaInitializer_<_Tp>::operator , (T2 v)
return *this; return *this;
} }
template<typename _Tp> inline MatCommaInitializer_<_Tp>::operator Mat_<_Tp>() const
{
CV_DbgAssert( this->e.a1 == this->e.a1.m->end() );
return *this->e.a1.m;
}
template<typename _Tp> inline Mat_<_Tp> MatCommaInitializer_<_Tp>::operator *() const template<typename _Tp> inline Mat_<_Tp> MatCommaInitializer_<_Tp>::operator *() const
{ {
CV_DbgAssert( this->e.a1 == this->e.a1.m->end() ); CV_DbgAssert( this->e.a1 == this->e.a1.m->end() );