Merge remote-tracking branch 'refs/remotes/mariusmuja/master'

mcleary · mcleary · commit c9b7589de303 · 2016-05-11T17:21:47.000-03:00
diff --git a/src/cpp/flann/algorithms/kmeans_index.h b/src/cpp/flann/algorithms/kmeans_index.h
@@ -416,6 +416,7 @@ class KMeansIndex : public NNIndex<Distance>
     		Index* obj = static_cast<Index*>(ar.getObject());
 
     		if (Archive::is_loading::value) {
+    			delete[] pivot;
     			pivot = new DistanceType[obj->veclen_];
     		}
     		ar & serialization::make_binary_object(pivot, obj->veclen_*sizeof(DistanceType));
@@ -524,6 +525,7 @@ class KMeansIndex : public NNIndex<Distance>
 
         node->variance = variance;
         node->radius = radius;
+        delete[] node->pivot;
         node->pivot = mean;
     }
 

Original file line number	Diff line number	Diff line change
`@@ -416,6 +416,7 @@ class KMeansIndex : public NNIndex<Distance>`
`416`	`416`	`Index* obj = static_cast<Index*>(ar.getObject());`
`417`	`417`
`418`	`418`	`if (Archive::is_loading::value) {`
	`419`	`+ delete[] pivot;`
`419`	`420`	`pivot = new DistanceType[obj->veclen_];`
`420`	`421`	`}`
`421`	`422`	`ar & serialization::make_binary_object(pivot, obj->veclen_*sizeof(DistanceType));`
`@@ -524,6 +525,7 @@ class KMeansIndex : public NNIndex<Distance>`
`524`	`525`
`525`	`526`	`node->variance = variance;`
`526`	`527`	`node->radius = radius;`
	`528`	`+ delete[] node->pivot;`
`527`	`529`	`node->pivot = mean;`
`528`	`530`	`}`
`529`	`531`