fixed bug #1331

1e647922 · Vadim Pisarevsky · 282c3044 · 1e647922 · 1e647922
Commit 1e647922 authored Oct 05, 2011 by Vadim Pisarevsky
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

miniflann.hpp modules/flann/include/opencv2/flann/miniflann.hpp +0 -2

miniflann.cpp modules/flann/src/miniflann.cpp +2 -0

No files found.
--- a/modules/flann/include/opencv2/flann/miniflann.hpp
+++ b/modules/flann/include/opencv2/flann/miniflann.hpp
@@ -54,8 +54,6 @@ namespace cv
 namespace flann
 {

-using namespace cvflann;
-
 struct CV_EXPORTS IndexParams
 {
    IndexParams();

--- a/modules/flann/src/miniflann.cpp
+++ b/modules/flann/src/miniflann.cpp
@@ -13,6 +13,8 @@ namespace cv
 namespace flann
 {

+using namespace cvflann;
+    
 IndexParams::IndexParams()
 {
    params = new ::cvflann::IndexParams();