fixed several GCC warnings; fixed crash in kmeans test (because of cv::swap(Mat&a...

diff --git a/modules/core/include/opencv2/core/core.hpp b/modules/core/include/opencv2/core/core.hpp
index cd96c130caa5519306e219be441f014981285489..48ced29af7c28c82890cd9d9e775c04af1956b46 100644 (file)
--- a/modules/core/include/opencv2/core/core.hpp
+++ b/modules/core/include/opencv2/core/core.hpp
@@ -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;
 };

diff --git a/modules/core/include/opencv2/core/mat.hpp b/modules/core/include/opencv2/core/mat.hpp
index c4c70084e50973d17ea6274825a5da42effa6d18..da05e17f189e0b0ae8655d83b5fd861abda10420 100644 (file)
--- a/modules/core/include/opencv2/core/mat.hpp
+++ b/modules/core/include/opencv2/core/mat.hpp
@@ -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)
 {

diff --git a/modules/core/src/matrix.cpp b/modules/core/src/matrix.cpp
index 11641d02e50a100915e8c0c8242d6dba4bd6adef..d599e0d47a0925859255406b0402977a0351bcc8 100644 (file)
--- a/modules/core/src/matrix.cpp
+++ b/modules/core/src/matrix.cpp
@@ -50,11 +50,26 @@ namespace cv {
 
 void swap( Mat& a, Mat& b )
 {
-    int *ap = (int*)&a, *bp = (int*)&b;
+    /*int *ap = (int*)&a, *bp = (int*)&b;
     size_t i, n = sizeof(Mat)/sizeof(ap[0]);
     
     for( i = 0; i < n; i++ )
-        std::swap(ap[i], bp[i]);
+        std::swap(ap[i], bp[i]);*/
+    std::swap(a.flags, b.flags);
+    std::swap(a.dims, b.dims);
+    std::swap(a.rows, b.rows);
+    std::swap(a.cols, b.cols);
+    std::swap(a.data, b.data);
+    std::swap(a.refcount, b.refcount);
+    std::swap(a.datastart, b.datastart);
+    std::swap(a.dataend, b.dataend);
+    std::swap(a.datalimit, b.datalimit);
+    std::swap(a.allocator, b.allocator);
+    
+    std::swap(a.size.p, b.size.p);
+    std::swap(a.step.p, b.step.p);
+    std::swap(a.step.buf[0], b.step.buf[0]);
+    std::swap(a.step.buf[1], b.step.buf[1]);
     
     if( a.step.p == b.step.buf )
     {

diff --git a/modules/features2d/include/opencv2/features2d/features2d.hpp b/modules/features2d/include/opencv2/features2d/features2d.hpp
index 0b4350eb7922f77480d6789ad19bbc0d6f2abf16..0691f8ad3008067c93bc5ffba6a16dd4b6e6a822 100644 (file)
--- a/modules/features2d/include/opencv2/features2d/features2d.hpp
+++ b/modules/features2d/include/opencv2/features2d/features2d.hpp
@@ -2325,7 +2325,7 @@ public:
 
     virtual void train();
 
-    virtual bool supportMask() { matcher->supportMask(); }
+    virtual bool supportMask() { return matcher->supportMask(); }
 
     virtual void read( const FileNode& fn );
     virtual void write( FileStorage& fs ) const;

diff --git a/tests/ml/src/mltest_main.cpp b/tests/ml/src/mltest_main.cpp
index 4cbfff07f6877973cfdb0b0ebe268acc2d0ed747..7946fb92e5d20d202b01db3510cc5ac265a0d441 100644 (file)
--- a/tests/ml/src/mltest_main.cpp
+++ b/tests/ml/src/mltest_main.cpp
@@ -45,7 +45,7 @@ CvTS test_system("ml");
 
 const char* blacklist[] =
 {
-    "kmeans",          //ticket 616
+    //"kmeans",          //ticket 616
     "artrees",         //ticket 460
     "aboost",          //ticket 474
     0