Merge pull request #2108 from pemmanuelviel:flannMemoryLeak

87e0c261 · Roman Donchenko · OpenCV Buildbot · 890f1baf · 3f458c6e · 87e0c261
Commit 87e0c261 authored Jan 13, 2014 by Roman Donchenko Committed by OpenCV Buildbot Jan 13, 2014
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 6 deletions

hierarchical_clustering_index.h ...ann/include/opencv2/flann/hierarchical_clustering_index.h +6 -6

No files found.
--- a/modules/flann/include/opencv2/flann/hierarchical_clustering_index.h
+++ b/modules/flann/include/opencv2/flann/hierarchical_clustering_index.h
@@ -414,12 +414,6 @@ public:

    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();

        if (root!=NULL) {
@@ -430,6 +424,12 @@ public:
            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_];
        root = new NodePtr[trees_];
        for (int i=0; i<trees_; ++i) {