From 759c9522fd2935fc5671440f5eb8efd055ccbb4b Mon Sep 17 00:00:00 2001
From: Pierre-Emmanuel Viel <p.emmanuel.viel@gmail.com>
Date: Sun, 9 Aug 2020 21:56:21 +0200
Subject: [PATCH] Merge the two KMeansIndexParams ctor on master

---
 modules/flann/include/opencv2/flann.hpp         | 10 ++--------
 .../flann/include/opencv2/flann/kmeans_index.h  | 17 +++--------------
 2 files changed, 5 insertions(+), 22 deletions(-)

diff --git a/modules/flann/include/opencv2/flann.hpp b/modules/flann/include/opencv2/flann.hpp
index 9013ae4308..78cf21a79f 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 a823986e09..1b034de0de 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);
-    }
 };