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

Fix: freeing previous elements has to be done before loading new parameters to avoid trying to delete unexisting objects if arrays size was modified

Browse Source
This commit is contained in:
Pierre-Emmanuel Viel 2014-01-03 13:16:36 +01:00
parent 92fc763925
commit 3f458c6eb1
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
modules/flann/include/opencv2/flann/hierarchical_clustering_index.h
View File

@ -414,12 +414,6 @@ public:
void loadIndex(FILE* stream) void loadIndex(FILE* stream)
{ {
load_value(stream, branching_);
load_value(stream, trees_);
load_value(stream, centers_init_);
load_value(stream, leaf_size_);
load_value(stream, memoryCounter);
free_elements(); free_elements();
if (root!=NULL) { if (root!=NULL) {
@ -430,6 +424,12 @@ public:
delete[] indices; delete[] indices;
} }
load_value(stream, branching_);
load_value(stream, trees_);
load_value(stream, centers_init_);
load_value(stream, leaf_size_);
load_value(stream, memoryCounter);
indices = new int*[trees_]; indices = new int*[trees_];
root = new NodePtr[trees_]; root = new NodePtr[trees_];
for (int i=0; i<trees_; ++i) { for (int i=0; i<trees_; ++i) {