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

Prefixed constants in flann with FLANN_ to prevent clashes with constants from other includes, closes bug #890

Browse Source
This commit is contained in:
Marius Muja
2011-02-16 08:42:52 +00:00
parent 0725a31e5a
commit 53e6bab678
11 changed files with 82 additions and 92 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
modules/flann/include/opencv2/flann/flann_base.hpp
View File

@@ -67,12 +67,10 @@ CV_EXPORTS void set_distance_type(flann_distance_t distance_type, int order);
struct CV_EXPORTS SavedIndexParams : public IndexParams {
SavedIndexParams(std::string filename_) : IndexParams(SAVED), filename(filename_) {}
SavedIndexParams(std::string filename_) : IndexParams(FLANN_INDEX_SAVED), filename(filename_) {}
std::string filename; // filename of the stored index
flann_algorithm_t getIndexType() const { return algorithm; }
void print() const
{
logger().info("Index type: %d\n",(int)algorithm);
@@ -138,7 +136,7 @@ Index<T>::Index(const Matrix<T>& dataset, const IndexParams& params)
flann_algorithm_t index_type = params.getIndexType();
built = false;
if (index_type==SAVED) {
if (index_type==FLANN_INDEX_SAVED) {
nnIndex = load_saved_index(dataset, ((const SavedIndexParams&)params).filename);
built = true;
}