generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

renamed cv::flann to cv::cvflann to avoid name conflicts

Browse Source
This commit is contained in:
Vadim Pisarevsky
2010-05-21 20:37:05 +00:00
parent 60019422e8
commit b94e09bfeb
39 changed files with 155 additions and 144 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
3rdparty/flann/flann.cpp vendored
View File

@@ -58,7 +58,7 @@ using namespace std;
#endif
namespace flann
namespace cvflann
{
typedef ObjectFactory<IndexParams, flann_algorithm_t> ParamsFactory;
@@ -224,7 +224,7 @@ int hierarchicalClustering(const Matrix<float>& features, Matrix<float>& centers
using namespace flann;
using namespace cvflann;
typedef NNIndex* NNIndexPtr;
typedef Matrix<float>* MatrixPtr;