From 4be7619ce4c5173a520860357871c1dd830ef0d8 Mon Sep 17 00:00:00 2001 From: Vadim Pisarevsky Date: Mon, 8 Oct 2012 21:37:15 +0400 Subject: [PATCH] _InputArray/_OutputArray destructors are temporary made non-virtual. Please, restore it after 2.4.3 --- cmake/OpenCVCompilerOptions.cmake | 2 +- modules/core/include/opencv2/core/core.hpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/cmake/OpenCVCompilerOptions.cmake b/cmake/OpenCVCompilerOptions.cmake index c2e45b30d8..ecc0c52e4e 100644 --- a/cmake/OpenCVCompilerOptions.cmake +++ b/cmake/OpenCVCompilerOptions.cmake @@ -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) diff --git a/modules/core/include/opencv2/core/core.hpp b/modules/core/include/opencv2/core/core.hpp index 5cc5262322..81740707c6 100644 --- a/modules/core/include/opencv2/core/core.hpp +++ b/modules/core/include/opencv2/core/core.hpp @@ -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; -- GitLab