third_party/opencv
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Type consistency for all xxxIndexParams integer arguments as well as with miniflann's LshIndexParams

Browse Source
This commit is contained in:
Pierre-Emmanuel Viel 2020-06-30 10:33:07 +02:00
parent a711e2aa41
commit 33fab84473
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -224,9 +224,9 @@ public:
struct LshIndexParams : public IndexParams
{
LshIndexParams(
unsigned int table_number,
unsigned int key_size,
unsigned int multi_probe_level );
int table_number,
int key_size,
int multi_probe_level );
};
@endcode
- **AutotunedIndexParams** When passing an object of this type the index created is

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

@ -58,15 +58,15 @@ namespace cvflann
struct LshIndexParams : public IndexParams
{
LshIndexParams(unsigned int table_number = 12, unsigned int key_size = 20, unsigned int multi_probe_level = 2)
LshIndexParams(int table_number = 12, int key_size = 20, int multi_probe_level = 2)
{
(*this)["algorithm"] = FLANN_INDEX_LSH;
// The number of hash tables to use
(*this)["table_number"] = static_cast<int>(table_number);
(*this)["table_number"] = table_number;
// The length of the key in the hash tables
(*this)["key_size"] = static_cast<int>(key_size);
(*this)["key_size"] = key_size;
// Number of levels to use in multi-probe (0 for standard LSH)
(*this)["multi_probe_level"] = static_cast<int>(multi_probe_level);
(*this)["multi_probe_level"] = multi_probe_level;
}
};