Bring back escaped virtual destructors from 2.4.2

This commit is contained in:
Andrey Kamaev
2012-10-15 17:48:49 +04:00
parent 3ffe0f0117
commit a3b1971977
5 changed files with 22 additions and 3 deletions

View File

@@ -1345,7 +1345,9 @@ public:
virtual int channels(int i=-1) const;
virtual bool empty() const;
/*virtual*/ ~_InputArray();
#ifdef OPENCV_CAN_BREAK_BINARY_COMPATIBILITY
virtual ~_InputArray();
#endif
int flags;
void* obj;
@@ -1407,7 +1409,9 @@ public:
virtual void release() const;
virtual void clear() const;
/*virtual*/ ~_OutputArray();
#ifdef OPENCV_CAN_BREAK_BINARY_COMPATIBILITY
virtual ~_OutputArray();
#endif
};
typedef const _InputArray& InputArray;