diff --git a/modules/flann/include/opencv2/flann.hpp b/modules/flann/include/opencv2/flann.hpp index 9013ae430823bd8d49872685ed428a919b4a913b..78cf21a79f9dd840a68155500288de47168e15a2 100644 --- a/modules/flann/include/opencv2/flann.hpp +++ b/modules/flann/include/opencv2/flann.hpp @@ -220,14 +220,8 @@ public: int branching = 32, int iterations = 11, flann_centers_init_t centers_init = CENTERS_RANDOM, - float cb_index = 0.2 ); - - KMeansIndexParams( - int branching, - int iterations, - flann_centers_init_t centers_init, - float cb_index, - int trees ); + float cb_index = 0.2, + int trees = 1); }; @endcode - **CompositeIndexParams** When using a parameters object of this type the index created diff --git a/modules/flann/include/opencv2/flann/kmeans_index.h b/modules/flann/include/opencv2/flann/kmeans_index.h index a823986e095f1629408e7f5f7dc5c5118d22a61a..1b034de0dea15023c032846b8d09c77468886cac 100644 --- a/modules/flann/include/opencv2/flann/kmeans_index.h +++ b/modules/flann/include/opencv2/flann/kmeans_index.h @@ -57,8 +57,9 @@ namespace cvflann struct KMeansIndexParams : public IndexParams { - void indexParams(int branching, int iterations, - flann_centers_init_t centers_init, float cb_index, int trees) + KMeansIndexParams(int branching = 32, int iterations = 11, + flann_centers_init_t centers_init = FLANN_CENTERS_RANDOM, + float cb_index = 0.2, int trees = 1 ) { (*this)["algorithm"] = FLANN_INDEX_KMEANS; // branching factor @@ -72,18 +73,6 @@ struct KMeansIndexParams : public IndexParams // number of kmeans trees to search in (*this)["trees"] = trees; } - - KMeansIndexParams(int branching = 32, int iterations = 11, - flann_centers_init_t centers_init = FLANN_CENTERS_RANDOM, float cb_index = 0.2 ) - { - indexParams(branching, iterations, centers_init, cb_index, 1); - } - - KMeansIndexParams(int branching, int iterations, - flann_centers_init_t centers_init, float cb_index, int trees) - { - indexParams(branching, iterations, centers_init, cb_index, trees); - } };