From e4303dc96f5027c5e16599550bd81bc9f6a02151 Mon Sep 17 00:00:00 2001 From: Andrey Kamaev Date: Sun, 22 Apr 2012 14:50:09 +0000 Subject: [PATCH] Fixed build with mingw 4.4.0 --- modules/core/src/gpumat.cpp | 2 +- modules/flann/src/miniflann.cpp | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/modules/core/src/gpumat.cpp b/modules/core/src/gpumat.cpp index f194878..cb58f19 100644 --- a/modules/core/src/gpumat.cpp +++ b/modules/core/src/gpumat.cpp @@ -706,7 +706,7 @@ cv::Mat::Mat(const GpuMat& m) : flags(0), dims(0), rows(0), cols(0), data(0), re namespace { - class CV_EXPORTS GpuFuncTable + class GpuFuncTable { public: virtual ~GpuFuncTable() {} diff --git a/modules/flann/src/miniflann.cpp b/modules/flann/src/miniflann.cpp index 55bb8b6..e1dbe5b 100644 --- a/modules/flann/src/miniflann.cpp +++ b/modules/flann/src/miniflann.cpp @@ -7,6 +7,11 @@ static cvflann::IndexParams& get_params(const cv::flann::IndexParams& p) return *(cvflann::IndexParams*)(p.params); } +cv::flann::IndexParams::~IndexParams() +{ + delete &get_params(*this); +} + namespace cv { @@ -19,11 +24,6 @@ IndexParams::IndexParams() { params = new ::cvflann::IndexParams(); } - -IndexParams::~IndexParams() -{ - delete &get_params(*this); -} template T getParam(const IndexParams& _p, const std::string& key, const T& defaultVal=T()) -- 2.7.4