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

Clang compilation fixes, closes #1432

Browse Source
This commit is contained in:
Marius Muja 2011-10-18 18:37:47 +00:00
parent 5eee9e6f6d
commit a73b509b1e
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -30,6 +30,12 @@ struct empty_any
{ {
}; };
inline std::ostream& operator <<(std::ostream& out, const empty_any&)
{
out << "[empty_any]";
return out;
}
struct base_any_policy struct base_any_policy
{ {
virtual void static_delete(void** x) = 0; virtual void static_delete(void** x) = 0;

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

@ -56,7 +56,7 @@ namespace cvflann
struct LshIndexParams : public IndexParams struct LshIndexParams : public IndexParams
{ {
LshIndexParams(unsigned int table_number, unsigned int key_size, unsigned int multi_probe_level) LshIndexParams(unsigned int table_number = 12, unsigned int key_size = 20, unsigned int multi_probe_level = 2)
{ {
(* this)["algorithm"] = FLANN_INDEX_LSH; (* this)["algorithm"] = FLANN_INDEX_LSH;
// The number of hash tables to use // The number of hash tables to use