From 0998669d26ee2161e7dc6a3e97139e1e12b89a2c Mon Sep 17 00:00:00 2001 From: Alexander Mordvintesv Date: Tue, 7 Aug 2012 21:37:19 +0300 Subject: [PATCH] Revert "fixed LshIndex types in its constructor" This reverts commit 54d68da8e75d2620b0781a8a45a5ad612a02ae5e. --- modules/flann/include/opencv2/flann/lsh_index.h | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/modules/flann/include/opencv2/flann/lsh_index.h b/modules/flann/include/opencv2/flann/lsh_index.h index 8ce019a006..7d65d37718 100644 --- a/modules/flann/include/opencv2/flann/lsh_index.h +++ b/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(index_params_,"table_number",12); - key_size_ = get_param(index_params_,"key_size",20); - multi_probe_level_ = get_param(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(index_params_,"table_number",12); + key_size_ = (unsigned int)get_param(index_params_,"key_size",20); + multi_probe_level_ = (unsigned int)get_param(index_params_,"multi_probe_level",2); feature_size_ = (unsigned)dataset_.cols; fill_xor_mask(0, key_size_, multi_probe_level_, xor_masks_);