From: Vadim Pisarevsky Date: Mon, 20 Jun 2011 08:42:08 +0000 (+0000) Subject: added dummy symbol to flann to make OpenCV compile on Windows X-Git-Tag: accepted/tizen/6.0/unified/20201030.111113~6904 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=6767f1db9eaf1892065294754c2eb987fe7287d5;p=platform%2Fupstream%2Fopencv.git 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 --- 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(); + } diff --git a/modules/flann/src/flann.cpp b/modules/flann/src/flann.cpp index 77c439f..1002d6e 100644 --- a/modules/flann/src/flann.cpp +++ b/modules/flann/src/flann.cpp @@ -28,5 +28,4 @@ #include "precomp.hpp" - - +void cvflann::dummyfunc() {}