From: ippei ito <github@mysrv.link>
Date: Sat, 14 Mar 2015 00:35:53 +0000 (+0900)
Subject: Fix warn conversion from 'size_t' to 'int'. add comment for doxygen
X-Git-Tag: accepted/tizen/6.0/unified/20201030.111113~1314^2~208^2~6
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=7d665a47540d08e3c25bb51dd91d3c77c8aff9e2;p=platform%2Fupstream%2Fopencv.git

Fix warn conversion from 'size_t' to 'int'. add comment for doxygen
---

diff --git a/modules/flann/include/opencv2/flann/lsh_index.h b/modules/flann/include/opencv2/flann/lsh_index.h
index 5d00bea..2b89337 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<ElementType>& wholeData, const Matrix<ElementType>& additionalData)
     {
@@ -113,7 +115,7 @@ public:
         for (unsigned int i = 0; i < table_number_; ++i) {
             lsh::LshTable<ElementType>& 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 bfc486d..cef01b2 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<ElementType> dataset)