Merge pull request #2692 from 1Hyena:2.4

modules/flann/include/opencv2/flann/autotuned_index.h

@@ -99,18 +99,22 @@ public:
      */
     virtual void buildIndex()
     {
+        std::ostringstream stream;
         bestParams_ = estimateBuildParams();
+        print_params(bestParams_, stream);
         Logger::info("----------------------------------------------------\n");
         Logger::info("Autotuned parameters:\n");
-        print_params(bestParams_);
+        Logger::info("%s", stream.str().c_str());
         Logger::info("----------------------------------------------------\n");
 
         bestIndex_ = create_index_by_type(dataset_, bestParams_, distance_);
         bestIndex_->buildIndex();
         speedup_ = estimateSearchParams(bestSearchParams_);
+        stream.str(std::string());
+        print_params(bestSearchParams_, stream);
         Logger::info("----------------------------------------------------\n");
         Logger::info("Search parameters:\n");
-        print_params(bestSearchParams_);
+        Logger::info("%s", stream.str().c_str());
         Logger::info("----------------------------------------------------\n");
     }
 

modules/flann/include/opencv2/flann/params.h

@@ -79,16 +79,19 @@ T get_param(const IndexParams& params, std::string name)
     }
 }
 
-inline void print_params(const IndexParams& params)
+inline void print_params(const IndexParams& params, std::ostream& stream)
 {
     IndexParams::const_iterator it;
 
     for(it=params.begin(); it!=params.end(); ++it) {
-        std::cout << it->first << " : " << it->second << std::endl;
+        stream << it->first << " : " << it->second << std::endl;
     }
 }
 
-
+inline void print_params(const IndexParams& params)
+{
+    print_params(params, std::cout);
+}
 
 }