From 7d665a47540d08e3c25bb51dd91d3c77c8aff9e2 Mon Sep 17 00:00:00 2001 From: ippei ito Date: Sat, 14 Mar 2015 09:35:53 +0900 Subject: [PATCH] Fix warn conversion from 'size_t' to 'int'. add comment for doxygen --- modules/flann/include/opencv2/flann/lsh_index.h | 4 +++- modules/flann/include/opencv2/flann/lsh_table.h | 1 + 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/modules/flann/include/opencv2/flann/lsh_index.h b/modules/flann/include/opencv2/flann/lsh_index.h index 5d00bea95..2b89337d9 100644 --- a/modules/flann/include/opencv2/flann/lsh_index.h +++ b/modules/flann/include/opencv2/flann/lsh_index.h @@ -106,6 +106,8 @@ public: /** * Implementation for the LSH addable indexes after that. + * @param wholeData whole dataset with the input features + * @param additionalData additional dataset with the input features */ void addIndex(const Matrix& wholeData, const Matrix& additionalData) { @@ -113,7 +115,7 @@ public: for (unsigned int i = 0; i < table_number_; ++i) { lsh::LshTable& table = tables_[i]; // Add the features to the table with indexed offset - table.add(wholeData.rows - additionalData.rows, additionalData); + table.add((int)(wholeData.rows - additionalData.rows), additionalData); } dataset_ = wholeData; } diff --git a/modules/flann/include/opencv2/flann/lsh_table.h b/modules/flann/include/opencv2/flann/lsh_table.h index bfc486dbc..cef01b2e1 100644 --- a/modules/flann/include/opencv2/flann/lsh_table.h +++ b/modules/flann/include/opencv2/flann/lsh_table.h @@ -192,6 +192,7 @@ public: } /** Add a set of features to the table + * @param indexed_ofst previous indexed offset * @param dataset the values to store */ void add(int indexed_ofst, Matrix dataset)