From c02179a7659798453a0b15b2ccfbf4aa6cf0d7f4 Mon Sep 17 00:00:00 2001 From: Andrey Kamaev Date: Sat, 22 Dec 2012 21:14:14 +0400 Subject: [PATCH] Revert "_InputArray/_OutputArray destructors are temporary made non-virtual. Please, restore it after 2.4.3" This reverts commit 4be7619ce4c5173a520860357871c1dd830ef0d8. --- 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 20519ae..f75afce 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 75b308c..60e2096 100644 --- a/modules/core/include/opencv2/core/core.hpp +++ b/modules/core/include/opencv2/core/core.hpp @@ -1340,7 +1340,7 @@ public: virtual int channels(int i=-1) const; virtual bool empty() const; - /*virtual*/ ~_InputArray(); + virtual ~_InputArray(); int flags; void* obj; @@ -1402,7 +1402,7 @@ public: virtual void release() const; virtual void clear() const; - /*virtual*/ ~_OutputArray(); + virtual ~_OutputArray(); }; typedef const _InputArray& InputArray; -- 2.7.4