added dummy symbol to flann to make OpenCV compile on Windows

diff --git a/modules/flann/include/opencv2/flann/general.h b/modules/flann/include/opencv2/flann/general.h
index 87e7e2f..28db33b 100644 (file)
--- a/modules/flann/include/opencv2/flann/general.h
+++ b/modules/flann/include/opencv2/flann/general.h
@@ -46,6 +46,11 @@ public:
     FLANNException(const std::string& message) : std::runtime_error(message) { }
 };
 
+#if (defined WIN32 || defined _WIN32 || defined WINCE) && defined CVAPI_EXPORTS\r
+__declspec(dllexport)\r
+#endif
+void dummyfunc();
+
 }
 
 

diff --git a/modules/flann/src/flann.cpp b/modules/flann/src/flann.cpp
index 77c439f..1002d6e 100644 (file)
--- a/modules/flann/src/flann.cpp
+++ b/modules/flann/src/flann.cpp
@@ -28,5 +28,4 @@
 
 #include "precomp.hpp"
 
-
-
+void cvflann::dummyfunc() {}