generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Bring back escaped virtual destructors from 2.4.2

Browse Source
This commit is contained in:
Andrey Kamaev 2012-10-15 17:48:49 +04:00
parent 3ffe0f0117
commit a3b1971977
5 changed files with 22 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
cmake/OpenCVCompilerOptions.cmake
View File

@ -56,12 +56,18 @@ if(MINGW)
endif() endif()
endif() endif()
if(OPENCV_CAN_BREAK_BINARY_COMPATIBILITY)
add_definitions(-DOPENCV_CAN_BREAK_BINARY_COMPATIBILITY)
endif()
if(CMAKE_COMPILER_IS_GNUCXX) if(CMAKE_COMPILER_IS_GNUCXX)
# High level of warnings. # High level of warnings.
add_extra_compiler_option(-W) add_extra_compiler_option(-W)
add_extra_compiler_option(-Wall) add_extra_compiler_option(-Wall)
add_extra_compiler_option(-Werror=return-type) add_extra_compiler_option(-Werror=return-type)
#add_extra_compiler_option(-Werror=non-virtual-dtor) if(OPENCV_CAN_BREAK_BINARY_COMPATIBILITY)
add_extra_compiler_option(-Werror=non-virtual-dtor)
endif()
add_extra_compiler_option(-Werror=address) add_extra_compiler_option(-Werror=address)
add_extra_compiler_option(-Werror=sequence-point) add_extra_compiler_option(-Werror=sequence-point)
add_extra_compiler_option(-Wformat) add_extra_compiler_option(-Wformat)

8
modules/core/include/opencv2/core/core.hpp
View File

@ -1345,7 +1345,9 @@ public:
virtual int channels(int i=-1) const; virtual int channels(int i=-1) const;
virtual bool empty() const; virtual bool empty() const;
/*virtual*/ ~_InputArray(); #ifdef OPENCV_CAN_BREAK_BINARY_COMPATIBILITY
virtual ~_InputArray();
#endif
int flags; int flags;
void* obj; void* obj;
@ -1407,7 +1409,9 @@ public:
virtual void release() const; virtual void release() const;
virtual void clear() const; virtual void clear() const;
/*virtual*/ ~_OutputArray(); #ifdef OPENCV_CAN_BREAK_BINARY_COMPATIBILITY
virtual ~_OutputArray();
#endif
}; };
typedef const _InputArray& InputArray; typedef const _InputArray& InputArray;

4
modules/core/src/matrix.cpp
View File

@ -917,7 +917,9 @@ void scalarToRawData(const Scalar& s, void* _buf, int type, int unroll_to)
\*************************************************************************************************/ \*************************************************************************************************/
_InputArray::_InputArray() : flags(0), obj(0) {} _InputArray::_InputArray() : flags(0), obj(0) {}
#ifdef OPENCV_CAN_BREAK_BINARY_COMPATIBILITY
_InputArray::~_InputArray() {} _InputArray::~_InputArray() {}
#endif
_InputArray::_InputArray(const Mat& m) : flags(MAT), obj((void*)&m) {} _InputArray::_InputArray(const Mat& m) : flags(MAT), obj((void*)&m) {}
_InputArray::_InputArray(const vector<Mat>& vec) : flags(STD_VECTOR_MAT), obj((void*)&vec) {} _InputArray::_InputArray(const vector<Mat>& vec) : flags(STD_VECTOR_MAT), obj((void*)&vec) {}
_InputArray::_InputArray(const double& val) : flags(FIXED_TYPE + FIXED_SIZE + MATX + CV_64F), obj((void*)&val), sz(Size(1,1)) {} _InputArray::_InputArray(const double& val) : flags(FIXED_TYPE + FIXED_SIZE + MATX + CV_64F), obj((void*)&val), sz(Size(1,1)) {}
@ -1281,7 +1283,9 @@ bool _InputArray::empty() const
_OutputArray::_OutputArray() {} _OutputArray::_OutputArray() {}
#ifdef OPENCV_CAN_BREAK_BINARY_COMPATIBILITY
_OutputArray::~_OutputArray() {} _OutputArray::~_OutputArray() {}
#endif
_OutputArray::_OutputArray(Mat& m) : _InputArray(m) {} _OutputArray::_OutputArray(Mat& m) : _InputArray(m) {}
_OutputArray::_OutputArray(vector<Mat>& vec) : _InputArray(vec) {} _OutputArray::_OutputArray(vector<Mat>& vec) : _InputArray(vec) {}
_OutputArray::_OutputArray(gpu::GpuMat& d_mat) : _InputArray(d_mat) {} _OutputArray::_OutputArray(gpu::GpuMat& d_mat) : _InputArray(d_mat) {}

3
modules/flann/include/opencv2/flann/any.h
View File

@ -47,7 +47,10 @@ struct base_any_policy
virtual ::size_t get_size() = 0; virtual ::size_t get_size() = 0;
virtual const std::type_info& type() = 0; virtual const std::type_info& type() = 0;
virtual void print(std::ostream& out, void* const* src) = 0; virtual void print(std::ostream& out, void* const* src) = 0;
#ifdef OPENCV_CAN_BREAK_BINARY_COMPATIBILITY
virtual ~base_any_policy() {} virtual ~base_any_policy() {}
#endif
}; };
template<typename T> template<typename T>

2
modules/videostab/include/opencv2/videostab/motion_stabilizing.hpp
View File

@ -56,7 +56,9 @@ namespace videostab
class CV_EXPORTS IMotionStabilizer class CV_EXPORTS IMotionStabilizer
{ {
public: public:
#ifdef OPENCV_CAN_BREAK_BINARY_COMPATIBILITY
virtual ~IMotionStabilizer() {} virtual ~IMotionStabilizer() {}
#endif
// assumes that [0, size-1) is in or equals to [range.first, range.second) // assumes that [0, size-1) is in or equals to [range.first, range.second)
virtual void stabilize( virtual void stabilize(