diff --git a/include/osg/KdTree b/include/osg/KdTree index 446e8a77f..e68634f1e 100644 --- a/include/osg/KdTree +++ b/include/osg/KdTree @@ -38,9 +38,9 @@ class OSG_EXPORT KdTree : public osg::Shape { BuildOptions(); - int _numVerticesProcessed; - int _targetNumTrianglesPerLeaf; - int _maxNumLevels; + unsigned int _numVerticesProcessed; + unsigned int _targetNumTrianglesPerLeaf; + unsigned int _maxNumLevels; }; diff --git a/src/osg/KdTree.cpp b/src/osg/KdTree.cpp index 9cb32f550..4af1f3b39 100644 --- a/src/osg/KdTree.cpp +++ b/src/osg/KdTree.cpp @@ -176,7 +176,7 @@ void BuildKdTree::computeDivisions(KdTree::BuildOptions& options) _axisStack.reserve(options._maxNumLevels); - for(int level=0; level=dimensions[1]) @@ -205,7 +205,7 @@ int BuildKdTree::divide(KdTree::BuildOptions& options, osg::BoundingBox& bb, int KdTree::KdNode& node = _kdTree.getNode(nodeIndex); bool needToDivide = level < _axisStack.size() && - (node.first<0 && node.second>options._targetNumTrianglesPerLeaf); + (node.first<0 && static_cast(node.second)>options._targetNumTrianglesPerLeaf); if (!needToDivide) {