src/kdtree.cc
branchpyrit
changeset 104 2274a07510c1
parent 103 3b3257a410fe
--- a/src/kdtree.cc	Tue Jul 26 17:41:36 2016 +0200
+++ b/src/kdtree.cc	Tue Jul 26 18:19:37 2016 +0200
@@ -107,8 +107,8 @@
 		bounds.w()*bounds.d() + bounds.h()*bounds.d());
 	Float cost = SAV * (K + shapes->size()); // initial cost = non-split cost
 
-	vector<ShapeBound>::iterator edge, splitedge = edges[0].end();
 	int axis = 0;
+	vector<ShapeBound>::iterator edge, splitedge = edges[axis].end();
 	for (int ax = 0; ax < 3; ax++)
 	{
 		int lnum = 0, rnum = (int)shapes->size();
@@ -138,9 +138,6 @@
 		}
 	}
 
-	// we actually need to compare with edges[0].end(), but
-	// MSVC does not allow comparison of iterators from differen instances of vector
-	// it's OK this way, because axis will be zero if no good split was found
 	if (splitedge == edges[axis].end())
 	{
 		node->setLeaf();
@@ -556,7 +553,6 @@
 void KdTree::recursive_load(istream &st, KdNode *node)
 {
 	string s;
-	istringstream is;
 
 	getline(st, s, ',');
 	trim(s);