merged 2.4 into trunk

2012-04-30 14:33:52 +00:00
parent 3f1c6d7357
commit d5a0088bbe
194 changed files with 10158 additions and 8225 deletions
--- a/modules/flann/src/miniflann.cpp
+++ b/modules/flann/src/miniflann.cpp
@@ -7,6 +7,11 @@ static cvflann::IndexParams& get_params(const cv::flann::IndexParams& p)
    return *(cvflann::IndexParams*)(p.params);
 }

+cv::flann::IndexParams::~IndexParams()
+{
+    delete &get_params(*this);
+}
+
 namespace cv
 {
    
@@ -19,11 +24,6 @@ IndexParams::IndexParams()
 {
    params = new ::cvflann::IndexParams();
 }
-    
-IndexParams::~IndexParams()
-{
-    delete &get_params(*this);
-}

 template<typename T>
 T getParam(const IndexParams& _p, const std::string& key, const T& defaultVal=T())