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

Fixed VS2015 warnings

Browse Source
This commit is contained in:
Jan Möbius
2016-11-07 14:12:29 +01:00
parent bb75d7029f
commit 85e183ae05
4 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/OpenMesh/Tools/Subdivider/Uniform/ModifiedButterFlyT.hh
View File

@@ -150,7 +150,7 @@ public:
{
weights[K].resize(K+1);
// s(j) = ( 1/4 + cos(2*pi*j/K) + 1/2 * cos(4*pi*j/K) )/K
real_t invK = 1.0/real_t(K);
real_t invK = static_cast<real_t>(1.0)/real_t(K);
real_t sum = 0;
for(unsigned int j=0; j<K; ++j)
{
@@ -390,7 +390,7 @@ private: // geometry helper
{
pos = _m.point(a_0);
pos += _m.point(a_1);
pos *= 9.0/16;
pos *= static_cast<mesh_t::Point::value_type>(9.0/16.0);
typename mesh_t::Point tpos;
if(_m.is_boundary(heh))
{
@@ -403,7 +403,7 @@ private: // geometry helper
tpos = _m.point(_m.to_vertex_handle(_m.next_halfedge_handle(opp_heh)));
tpos += _m.point(_m.to_vertex_handle(_m.opposite_halfedge_handle(_m.prev_halfedge_handle(opp_heh))));
}
tpos *= -1.0/16;
tpos *= static_cast<mesh_t::Point::value_type>(-1.0/16.0);
pos += tpos;
}
else
@@ -506,7 +506,7 @@ private: // geometry helper
}
else //at least one endpoint is [irregular and not in boundary]
{
double normFactor = 0.0;
typename mesh_t::Point::value_type normFactor = static_cast<typename mesh_t::Point::value_type>(0.0);
if(valence_a_0!=6 && !_m.is_boundary(a_0))
{