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

_InputArray/_OutputArray destructors are temporary made non-virtual. Please, restore it after 2.4.3

Browse Source
This commit is contained in:
Vadim Pisarevsky
2012-10-08 21:37:15 +04:00
parent 618fbf5508
commit 4be7619ce4
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cmake/OpenCVCompilerOptions.cmake
View File

@@ -61,7 +61,7 @@ if(CMAKE_COMPILER_IS_GNUCXX)
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) #add_extra_compiler_option(-Werror=non-virtual-dtor)
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)

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

@@ -1333,7 +1333,7 @@ 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(); /*virtual*/ ~_InputArray();
int flags; int flags;
void* obj; void* obj;
@@ -1395,7 +1395,7 @@ public:
virtual void release() const; virtual void release() const;
virtual void clear() const; virtual void clear() const;
virtual ~_OutputArray(); /*virtual*/ ~_OutputArray();
}; };
typedef const _InputArray& InputArray; typedef const _InputArray& InputArray;