fixed memory leak in core ds tests

pull/5335/head
Ilya Lavrenov 10 years ago committed by Dikay900
parent 11981c31f0
commit 0303e8067e
  1. 20
      modules/core/test/test_ds.cpp

@ -491,6 +491,7 @@ class Core_SeqBaseTest : public Core_DynStructBaseTest
{ {
public: public:
Core_SeqBaseTest(); Core_SeqBaseTest();
virtual ~Core_SeqBaseTest();
void clear(); void clear();
void run( int ); void run( int );
@ -501,11 +502,14 @@ protected:
int test_seq_ops( int iters ); int test_seq_ops( int iters );
}; };
Core_SeqBaseTest::Core_SeqBaseTest() Core_SeqBaseTest::Core_SeqBaseTest()
{ {
} }
Core_SeqBaseTest::~Core_SeqBaseTest()
{
clear();
}
void Core_SeqBaseTest::clear() void Core_SeqBaseTest::clear()
{ {
@ -1206,6 +1210,7 @@ class Core_SetTest : public Core_DynStructBaseTest
{ {
public: public:
Core_SetTest(); Core_SetTest();
virtual ~Core_SetTest();
void clear(); void clear();
void run( int ); void run( int );
@ -1219,6 +1224,10 @@ Core_SetTest::Core_SetTest()
{ {
} }
Core_SetTest::~Core_SetTest()
{
clear();
}
void Core_SetTest::clear() void Core_SetTest::clear()
{ {
@ -1417,6 +1426,7 @@ class Core_GraphTest : public Core_DynStructBaseTest
{ {
public: public:
Core_GraphTest(); Core_GraphTest();
virtual ~Core_GraphTest();
void clear(); void clear();
void run( int ); void run( int );
@ -1430,6 +1440,10 @@ Core_GraphTest::Core_GraphTest()
{ {
} }
Core_GraphTest::~Core_GraphTest()
{
clear();
}
void Core_GraphTest::clear() void Core_GraphTest::clear()
{ {
@ -2042,6 +2056,8 @@ void Core_GraphScanTest::run( int )
CV_TS_SEQ_CHECK_CONDITION( vtx_count == 0 && edge_count == 0, CV_TS_SEQ_CHECK_CONDITION( vtx_count == 0 && edge_count == 0,
"Not every vertex/edge has been visited" ); "Not every vertex/edge has been visited" );
update_progressbar(); update_progressbar();
cvReleaseGraphScanner( &scanner );
} }
// for a random graph the test just checks that every graph vertex and // for a random graph the test just checks that every graph vertex and
@ -2106,8 +2122,6 @@ void Core_GraphScanTest::run( int )
catch(int) catch(int)
{ {
} }
cvReleaseGraphScanner( &scanner );
} }

Loading…
Cancel
Save