Commit e4303dc9 authored by Andrey Kamaev's avatar Andrey Kamaev

Fixed build with mingw 4.4.0

parent 3c0e9d12
...@@ -706,7 +706,7 @@ cv::Mat::Mat(const GpuMat& m) : flags(0), dims(0), rows(0), cols(0), data(0), re ...@@ -706,7 +706,7 @@ cv::Mat::Mat(const GpuMat& m) : flags(0), dims(0), rows(0), cols(0), data(0), re
namespace namespace
{ {
class CV_EXPORTS GpuFuncTable class GpuFuncTable
{ {
public: public:
virtual ~GpuFuncTable() {} virtual ~GpuFuncTable() {}
......
...@@ -7,6 +7,11 @@ static cvflann::IndexParams& get_params(const cv::flann::IndexParams& p) ...@@ -7,6 +7,11 @@ static cvflann::IndexParams& get_params(const cv::flann::IndexParams& p)
return *(cvflann::IndexParams*)(p.params); return *(cvflann::IndexParams*)(p.params);
} }
cv::flann::IndexParams::~IndexParams()
{
delete &get_params(*this);
}
namespace cv namespace cv
{ {
...@@ -19,11 +24,6 @@ IndexParams::IndexParams() ...@@ -19,11 +24,6 @@ IndexParams::IndexParams()
{ {
params = new ::cvflann::IndexParams(); params = new ::cvflann::IndexParams();
} }
IndexParams::~IndexParams()
{
delete &get_params(*this);
}
template<typename T> template<typename T>
T getParam(const IndexParams& _p, const std::string& key, const T& defaultVal=T()) T getParam(const IndexParams& _p, const std::string& key, const T& defaultVal=T())
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment