From a73b509b1e5a1903c5fd9ebe5be4662066e06251 Mon Sep 17 00:00:00 2001
From: Marius Muja <no@email>
Date: Tue, 18 Oct 2011 18:37:47 +0000
Subject: [PATCH] Clang compilation fixes, closes #1432
---
modules/flann/include/opencv2/flann/any.h | 6 ++++++
modules/flann/include/opencv2/flann/lsh_index.h | 2 +-
2 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/modules/flann/include/opencv2/flann/any.h b/modules/flann/include/opencv2/flann/any.h
index 0a5f46859..ca3748747 100644
--- a/modules/flann/include/opencv2/flann/any.h
+++ b/modules/flann/include/opencv2/flann/any.h
@@ -30,6 +30,12 @@ struct empty_any
{
};
+inline std::ostream& operator <<(std::ostream& out, const empty_any&)
+{
+ out << "[empty_any]";
+ return out;
+}
+
struct base_any_policy
{
virtual void static_delete(void** x) = 0;
diff --git a/modules/flann/include/opencv2/flann/lsh_index.h b/modules/flann/include/opencv2/flann/lsh_index.h
index a050c3ca2..468065301 100644
--- a/modules/flann/include/opencv2/flann/lsh_index.h
+++ b/modules/flann/include/opencv2/flann/lsh_index.h
@@ -56,7 +56,7 @@ namespace cvflann
struct LshIndexParams : public IndexParams
{
- LshIndexParams(unsigned int table_number, unsigned int key_size, unsigned int multi_probe_level)
+ LshIndexParams(unsigned int table_number = 12, unsigned int key_size = 20, unsigned int multi_probe_level = 2)
{
(* this)["algorithm"] = FLANN_INDEX_LSH;
// The number of hash tables to use