added dummy symbol to flann to make OpenCV compile on Windows

6767f1db · Vadim Pisarevsky · 24cb30fe · 6767f1db · 6767f1db
Commit 6767f1db authored Jun 20, 2011 by Vadim Pisarevsky
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 2 deletions

general.h modules/flann/include/opencv2/flann/general.h +5 -0

flann.cpp modules/flann/src/flann.cpp +1 -2

No files found.
--- 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
+__declspec(dllexport)
+#endif
+void dummyfunc();
+
 }



--- a/modules/flann/src/flann.cpp
+++ b/modules/flann/src/flann.cpp
@@ -28,5 +28,4 @@

 #include "precomp.hpp"

-
-
+void cvflann::dummyfunc() {}