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

Two more fixes

Browse Source 
git-svn-id: http://www.openmesh.org/svnrepo/OpenMesh/trunk@871 fdac6126-5c0c-442c-9429-916003d36597
This commit is contained in:
Jan Möbius
2013-07-24 11:20:58 +00:00
parent b9df6c4040
commit 0510d14f62
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/OpenMesh/Core/Mesh/ArrayKernel.cc
View File

@@ -106,11 +106,11 @@ HalfedgeHandle ArrayKernel::handle(const Halfedge& _he) const
// There are two halfedges stored per edge // There are two halfedges stored per edge
// Get memory position inside edge vector and devide by size of an edge // Get memory position inside edge vector and devide by size of an edge
// to get the corresponding edge for the requested halfedge // to get the corresponding edge for the requested halfedge
unsigned int eh = ( (char*)&_he - (char*)&edges_.front() ) / sizeof(Edge) ; size_t eh = ( (char*)&_he - (char*)&edges_.front() ) / sizeof(Edge) ;
assert((&_he == &edges_[eh].halfedges_[0]) || assert((&_he == &edges_[eh].halfedges_[0]) ||
(&_he == &edges_[eh].halfedges_[1])); (&_he == &edges_[eh].halfedges_[1]));
return ((&_he == &edges_[eh].halfedges_[0]) ? return ((&_he == &edges_[eh].halfedges_[0]) ?
HalfedgeHandle(eh<<1) : HalfedgeHandle((eh<<1)+1)); HalfedgeHandle( int(eh)<<1) : HalfedgeHandle((int(eh)<<1)+1));
} }
EdgeHandle ArrayKernel::handle(const Edge& _e) const EdgeHandle ArrayKernel::handle(const Edge& _e) const

2
src/OpenMesh/Core/Utils/RandomNumberGenerator.cc
View File

@@ -75,7 +75,7 @@ RandomNumberGenerator::RandomNumberGenerator(const size_t _resolution) :
} }
for ( unsigned int i = 0 ; i < iterations_ - 1; ++i ) { for ( unsigned int i = 0 ; i < iterations_ - 1; ++i ) {
maxNum_ *= (RAND_MAX + 1.0); maxNum_ *= (RAND_MAX + 1);
} }
} }