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

Fix to solve conflicts to standalone FLANN

Browse Source
This commit is contained in:
Marius Muja 2011-12-12 09:39:02 +00:00
parent 7795cd200f
commit f1efd955b4
3 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/flann/include/opencv2/flann/any.h
View File

@ -16,7 +16,7 @@
#include <ostream> #include <ostream>
#include <typeinfo> #include <typeinfo>
namespace cdiggins namespace cvflann
{ {
namespace anyimpl namespace anyimpl

4
modules/flann/include/opencv2/flann/dynamic_bitset.h
View File

@ -45,6 +45,8 @@ typedef boost::dynamic_bitset<> DynamicBitset;
#include "dist.h" #include "dist.h"
namespace cvflann {
/** Class re-implementing the boost version of it /** Class re-implementing the boost version of it
* This helps not depending on boost, it also does not do the bound checks * This helps not depending on boost, it also does not do the bound checks
* and has a way to reset a block for speed * and has a way to reset a block for speed
@ -147,6 +149,8 @@ private:
static const unsigned int cell_bit_size_ = CHAR_BIT * sizeof(size_t); static const unsigned int cell_bit_size_ = CHAR_BIT * sizeof(size_t);
}; };
} // namespace cvflann
#endif #endif
#endif // OPENCV_FLANN_DYNAMIC_BITSET_H_ #endif // OPENCV_FLANN_DYNAMIC_BITSET_H_

1
modules/flann/include/opencv2/flann/params.h
View File

@ -39,7 +39,6 @@
namespace cvflann namespace cvflann
{ {
typedef cdiggins::any any;
typedef std::map<std::string, any> IndexParams; typedef std::map<std::string, any> IndexParams;
struct SearchParams : public IndexParams struct SearchParams : public IndexParams