first version of moving KDTree from core to ml

modules/features2d/CMakeLists.txt

@@ -1,2 +1,2 @@
 set(the_description "2D Features Framework")
-ocv_define_module(features2d opencv_imgproc opencv_flann OPTIONAL opencv_highgui)
+ocv_define_module(features2d opencv_imgproc opencv_ml opencv_flann OPTIONAL opencv_highgui)

modules/features2d/test/test_nearestneighbors.cpp

@@ -12,6 +12,7 @@
 //
 // Copyright (C) 2000-2008, Intel Corporation, all rights reserved.
 // Copyright (C) 2009, Willow Garage Inc., all rights reserved.
+// Copyright (C) 2014, Itseez Inc, all rights reserved.
 // Third party copyrights are property of their respective owners.
 //
 // Redistribution and use in source and binary forms, with or without modification,
@@ -167,13 +168,13 @@ protected:
     virtual int findNeighbors( Mat& points, Mat& neighbors );
     virtual int checkFindBoxed();
     virtual void releaseModel();
-    KDTree* tr;
+    ml::KDTree* tr;
 };
 
 
 void CV_KDTreeTest_CPP::createModel( const Mat& data )
 {
-    tr = new KDTree( data, false );
+    tr = new ml::KDTree( data, false );
 }
 
 int CV_KDTreeTest_CPP::checkGetPoins( const Mat& data )

modules/features2d/test/test_precomp.hpp

@@ -13,6 +13,7 @@
 #include "opencv2/imgproc.hpp"
 #include "opencv2/features2d.hpp"
 #include "opencv2/imgcodecs.hpp"
+#include "opencv2/ml.hpp"
 #include <iostream>
 
 #endif