Commit 4be7619c authored by Vadim Pisarevsky's avatar Vadim Pisarevsky

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

parent 618fbf55
......@@ -61,7 +61,7 @@ if(CMAKE_COMPILER_IS_GNUCXX)
add_extra_compiler_option(-W)
add_extra_compiler_option(-Wall)
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=sequence-point)
add_extra_compiler_option(-Wformat)
......
......@@ -1333,7 +1333,7 @@ public:
virtual int channels(int i=-1) const;
virtual bool empty() const;
virtual ~_InputArray();
/*virtual*/ ~_InputArray();
int flags;
void* obj;
......@@ -1395,7 +1395,7 @@ public:
virtual void release() const;
virtual void clear() const;
virtual ~_OutputArray();
/*virtual*/ ~_OutputArray();
};
typedef const _InputArray& InputArray;
......
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