Pixyco-XYZ/openmesh
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed several conversion warnings

Browse Source 
git-svn-id: http://www.openmesh.org/svnrepo/OpenMesh/trunk@850 fdac6126-5c0c-442c-9429-916003d36597
This commit is contained in:
Jan Möbius
2013-07-23 16:01:46 +00:00
parent c9c688949a
commit 11376f3c0d
9 changed files with 28 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/OpenMesh/Tools/VDPM/VHierarchy.cc
View File

@@ -90,7 +90,7 @@ add_node(const VHierarchyNode &_node)
{
nodes_.push_back(_node);
return VHierarchyNodeHandle(nodes_.size() - 1);
return VHierarchyNodeHandle(int(nodes_.size() - 1));
}
@@ -150,8 +150,8 @@ is_ancestor(VHierarchyNodeIndex _ancestor_index, VHierarchyNodeIndex _descendent
if (_ancestor_index.tree_id(tree_id_bits_) != _descendent_index.tree_id(tree_id_bits_))
return false;
unsigned int ancestor_node_id = _ancestor_index.node_id(tree_id_bits_);
unsigned int descendent_node_id = _descendent_index.node_id(tree_id_bits_);
unsigned int ancestor_node_id = _ancestor_index.node_id(tree_id_bits_);
unsigned int descendent_node_id = _descendent_index.node_id(tree_id_bits_);
if (ancestor_node_id > descendent_node_id)
return false;

2
src/OpenMesh/Tools/VDPM/VHierarchy.hh
View File

@@ -87,7 +87,7 @@ public:
void clear() { nodes_.clear(); n_roots_ = 0; }
unsigned char tree_id_bits() const { return tree_id_bits_; }
unsigned int num_roots() const { return n_roots_; }
unsigned int num_nodes() const { return nodes_.size(); }
size_t num_nodes() const { return nodes_.size(); }
VHierarchyNodeIndex generate_node_index(id_t _tree_id, id_t _node_id)
{