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

Drop operator* from MatCommaInitializer

Browse Source
This commit is contained in:
Andrey Kamaev 2013-03-30 21:50:20 +04:00
parent 4ab650d15b
commit 6fea48c54f
2 changed files with 1 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -231,7 +231,6 @@ 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);
//! another form of conversion operator //! another form of conversion operator
Mat_<_Tp> operator *() const;
operator Mat_<_Tp>() const; operator Mat_<_Tp>() const;
protected: protected:
MatIterator_<_Tp> it; MatIterator_<_Tp> it;

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

@ -379,7 +379,7 @@ Mat::Mat(const MatCommaInitializer_<_Tp>& commaInitializer)
: flags(MAGIC_VAL | DataType<_Tp>::type | CV_MAT_CONT_FLAG), dims(0), rows(0), cols(0), data(0), : flags(MAGIC_VAL | DataType<_Tp>::type | CV_MAT_CONT_FLAG), dims(0), rows(0), cols(0), data(0),
refcount(0), datastart(0), dataend(0), allocator(0), size(&rows) refcount(0), datastart(0), dataend(0), allocator(0), size(&rows)
{ {
*this = *commaInitializer; *this = commaInitializer.operator Mat_<_Tp>();
} }
inline inline
@ -2691,13 +2691,6 @@ MatCommaInitializer_<_Tp>& MatCommaInitializer_<_Tp>::operator , (T2 v)
return *this; return *this;
} }
template<typename _Tp> inline
Mat_<_Tp> MatCommaInitializer_<_Tp>::operator *() const
{
CV_DbgAssert( this->it == ((const Mat_<_Tp>*)this->it.m)->end() );
return Mat_<_Tp>(*this->it.m);
}
template<typename _Tp> inline template<typename _Tp> inline
MatCommaInitializer_<_Tp>::operator Mat_<_Tp>() const MatCommaInitializer_<_Tp>::operator Mat_<_Tp>() const
{ {