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

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

Browse Source 
This reverts commit 4be7619ce4c5173a520860357871c1dd830ef0d8.
This commit is contained in:
Andrey Kamaev 2012-12-22 21:14:14 +04:00
parent 62af76c646
commit c02179a765
2 changed files with 3 additions and 3 deletions
cmake
OpenCVCompilerOptions.cmake
modules/core/include/opencv2/core
core.hpp

2
cmake/OpenCVCompilerOptions.cmake

@ -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

@ -1340,7 +1340,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;
@ -1402,7 +1402,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;