generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #2856 from sanchom:master

Browse Source
This commit is contained in:
Vadim Pisarevsky 2014-07-02 14:22:55 +00:00
commit c3329ff79d
1 changed files with 23 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
modules/objdetect/src/erfilter.cpp
View File

@ -42,6 +42,7 @@
#include "precomp.hpp" #include "precomp.hpp"
#include <fstream> #include <fstream>
#include <queue>
#if defined _MSC_VER && _MSC_VER == 1500 #if defined _MSC_VER && _MSC_VER == 1500
typedef int int_fast32_t; typedef int int_fast32_t;
@ -57,6 +58,27 @@ using namespace std;
namespace cv namespace cv
{ {
// Deletes a tree of ERStat regions starting at root. Used only
// internally to this implementation.
static void deleteERStatTree(ERStat* root) {
queue<ERStat*> to_delete;
to_delete.push(root);
while (!to_delete.empty()) {
ERStat* n = to_delete.front();
to_delete.pop();
ERStat* c = n->child;
if (c != NULL) {
to_delete.push(c);
ERStat* sibling = c->next;
while (sibling != NULL) {
to_delete.push(sibling);
sibling = sibling->next;
}
}
delete n;
}
}
ERStat::ERStat(int init_level, int init_pixel, int init_x, int init_y) : pixel(init_pixel), ERStat::ERStat(int init_level, int init_pixel, int init_x, int init_y) : pixel(init_pixel),
level(init_level), area(0), perimeter(0), euler(0), probability(1.0), level(init_level), area(0), perimeter(0), euler(0), probability(1.0),
parent(0), child(0), next(0), prev(0), local_maxima(0), parent(0), child(0), next(0), prev(0), local_maxima(0),
@ -497,7 +519,7 @@ void ERFilterNM::er_tree_extract( InputArray image )
delete(stat->crossings); delete(stat->crossings);
stat->crossings = NULL; stat->crossings = NULL;
} }
delete stat; deleteERStatTree(stat);
} }
er_stack.clear(); er_stack.clear();