Revert "fixed LshIndex types in its constructor"

This reverts commit 54d68da8e7.
pull/8/head
Alexander Mordvintesv 12 years ago
parent 0adf68ae62
commit 0998669d26
  1. 8
      modules/flann/include/opencv2/flann/lsh_index.h

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

Loading…
Cancel
Save