Skip to content

Commit e03891b

Browse files
committed
Merge pull request opencv#17701 from pemmanuelviel:pev-lshIndexParams-consistency
2 parents a5fdcf9 + 33fab84 commit e03891b

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

modules/flann/include/opencv2/flann.hpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -224,9 +224,9 @@ class GenericIndex
224224
struct LshIndexParams : public IndexParams
225225
{
226226
LshIndexParams(
227-
unsigned int table_number,
228-
unsigned int key_size,
229-
unsigned int multi_probe_level );
227+
int table_number,
228+
int key_size,
229+
int multi_probe_level );
230230
};
231231
@endcode
232232
- **AutotunedIndexParams** When passing an object of this type the index created is

modules/flann/include/opencv2/flann/lsh_index.h

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -58,15 +58,15 @@ namespace cvflann
5858

5959
struct LshIndexParams : public IndexParams
6060
{
61-
LshIndexParams(unsigned int table_number = 12, unsigned int key_size = 20, unsigned int multi_probe_level = 2)
61+
LshIndexParams(int table_number = 12, int key_size = 20, int multi_probe_level = 2)
6262
{
6363
(*this)["algorithm"] = FLANN_INDEX_LSH;
6464
// The number of hash tables to use
65-
(*this)["table_number"] = static_cast<int>(table_number);
65+
(*this)["table_number"] = table_number;
6666
// The length of the key in the hash tables
67-
(*this)["key_size"] = static_cast<int>(key_size);
67+
(*this)["key_size"] = key_size;
6868
// Number of levels to use in multi-probe (0 for standard LSH)
69-
(*this)["multi_probe_level"] = static_cast<int>(multi_probe_level);
69+
(*this)["multi_probe_level"] = multi_probe_level;
7070
}
7171
};
7272

0 commit comments

Comments
 (0)