Drop operator* from MatCommaInitializer

pull/747/head
Andrey Kamaev 12 years ago
parent 4ab650d15b
commit 6fea48c54f
  1. 1
      modules/core/include/opencv2/core/mat.hpp
  2. 9
      modules/core/include/opencv2/core/mat.inl.hpp

@ -231,7 +231,6 @@ public:
//! the operator that takes the next value and put it to the matrix
template<typename T2> MatCommaInitializer_<_Tp>& operator , (T2 v);
//! another form of conversion operator
Mat_<_Tp> operator *() const;
operator Mat_<_Tp>() const;
protected:
MatIterator_<_Tp> it;

@ -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),
refcount(0), datastart(0), dataend(0), allocator(0), size(&rows)
{
*this = *commaInitializer;
*this = commaInitializer.operator Mat_<_Tp>();
}
inline
@ -2691,13 +2691,6 @@ MatCommaInitializer_<_Tp>& MatCommaInitializer_<_Tp>::operator , (T2 v)
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
MatCommaInitializer_<_Tp>::operator Mat_<_Tp>() const
{

Loading…
Cancel
Save