Merge branch 'master' of github.com:mariusmuja/flann

Author: mariusmuja

src/cpp/flann/algorithms/hierarchical_clustering_index.h

@@ -345,6 +345,18 @@ class HierarchicalClusteringIndex : public NNIndex<HierarchicalClusteringIndex<D
         if (ownDataset_) {
             delete[] dataset_.ptr();
         }
+
+        clearNodeTrees();
+    }
+
+    /**
+     * Clears Node tree
+     * calling Node destructor explicitly
+     */
+    void clearNodeTrees(){
+        for (int i=0; i<trees_; ++i) {
+            tree_roots_[i]->~Node();
+        }
     }
 
     /**
@@ -386,6 +398,7 @@ class HierarchicalClusteringIndex : public NNIndex<HierarchicalClusteringIndex<D
         extendDataset(points);
 
         if (rebuild_threshold>1 && size_at_build_*rebuild_threshold<size_) {
+            clearNodeTrees();
             pool_.free();
             buildIndex();
         }
@@ -501,6 +514,17 @@ class HierarchicalClusteringIndex : public NNIndex<HierarchicalClusteringIndex<D
          * Level
          */
         int level;
+
+        /**
+         * destructor
+         * calling Node destructor explicitly
+         */
+        ~Node(){
+            for(int i=0; i<childs.size(); i++){
+                childs[i]->~Node();
+            }
+        };
+
     };
     typedef Node* NodePtr;