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

fixed several GCC warnings; fixed crash in kmeans test (because of cv::swap(Mat&a, Mat&b)) (ticket #616)

Browse Source
This commit is contained in:
Vadim Pisarevsky
2010-11-04 15:59:10 +00:00
parent b5f366fb70
commit ced8192174
5 changed files with 19 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2776,12 +2776,9 @@ public:
MatCommaInitializer_(Mat_<_Tp>* _m);
//! the operator that takes the next value and put it to the matrix
template<typename T2> MatCommaInitializer_<_Tp>& operator , (T2 v);
//! the conversion operator
//operator Mat_<_Tp>() const;
//! another form of conversion operator
Mat_<_Tp> operator *() const;
operator Mat_<_Tp>() const;
virtual void assignTo(Mat& m, int type=-1) const;
protected:
MatIterator_<_Tp> it;
};

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

@@ -1938,12 +1938,6 @@ template<typename _Tp> inline MatCommaInitializer_<_Tp>::operator Mat_<_Tp>() co
return Mat_<_Tp>(*this->it.m);
}
template<typename _Tp> inline void
MatCommaInitializer_<_Tp>::assignTo(Mat& m, int type) const
{
Mat_<_Tp>(*this).assignTo(m, type);
}
template<typename _Tp, typename T2> static inline MatCommaInitializer_<_Tp>
operator << (const Mat_<_Tp>& m, T2 val)
{