merged the trunk r8704:8716

2012-06-28 16:13:29 +00:00
parent 2777ebb8a0
commit 680a44189c
83 changed files with 2402 additions and 2052 deletions
--- a/modules/flann/src/flann.cpp
+++ b/modules/flann/src/flann.cpp
@@ -36,7 +36,7 @@ namespace cvflann
    */
    flann_distance_t flann_distance_type_ = FLANN_DIST_L2;
    flann_distance_t flann_distance_type() { return flann_distance_type_; }
-    
+
    /**
     * Set distance type to used
     * \deprecated
@@ -52,6 +52,6 @@ namespace cvflann
        }
        flann_distance_type_ = distance_type;
    }
-    
+
    void dummyfunc() {}
 }