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

2010-11-04 15:59:10 +00:00
parent b5f366fb70
commit ced8192174
5 changed files with 19 additions and 13 deletions
--- 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;