_InputArray/_OutputArray destructors are temporary made non-virtual. Please, restore...
authorVadim Pisarevsky <vadim.pisarevsky@itseez.com>
Mon, 8 Oct 2012 17:37:15 +0000 (21:37 +0400)
committerVadim Pisarevsky <vadim.pisarevsky@itseez.com>
Mon, 8 Oct 2012 17:37:15 +0000 (21:37 +0400)
cmake/OpenCVCompilerOptions.cmake
modules/core/include/opencv2/core/core.hpp

index c2e45b3..ecc0c52 100644 (file)
@@ -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)
index 5cc5262..8174070 100644 (file)
@@ -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;