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

Revert "fixed LshIndex types in its constructor"

Browse Source 
This reverts commit 54d68da8e75d2620b0781a8a45a5ad612a02ae5e.
This commit is contained in:
Alexander Mordvintesv 2012-08-07 21:37:19 +03:00
parent 0adf68ae62
commit 0998669d26
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -90,9 +90,11 @@ public:
Distance d = Distance()) : Distance d = Distance()) :
dataset_(input_data), index_params_(params), distance_(d) dataset_(input_data), index_params_(params), distance_(d)
{ {
table_number_ = get_param<unsigned>(index_params_,"table_number",12); // cv::flann::IndexParams sets integer params as 'int', so it is in get_param
key_size_ = get_param<unsigned>(index_params_,"key_size",20); // in place of 'unsigned int'
multi_probe_level_ = get_param<unsigned>(index_params_,"multi_probe_level",2); table_number_ = (unsigned int)get_param<int>(index_params_,"table_number",12);
key_size_ = (unsigned int)get_param<int>(index_params_,"key_size",20);
multi_probe_level_ = (unsigned int)get_param<int>(index_params_,"multi_probe_level",2);
feature_size_ = (unsigned)dataset_.cols; feature_size_ = (unsigned)dataset_.cols;
fill_xor_mask(0, key_size_, multi_probe_level_, xor_masks_); fill_xor_mask(0, key_size_, multi_probe_level_, xor_masks_);