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

More warning fixes

Browse Source
This commit is contained in:
Jan Möbius
2016-10-28 08:59:36 +02:00
parent 7a1cad003d
commit 08160c1584
3 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/OpenMesh/Tools/Subdivider/Adaptive/Composite/RulesT.cc
View File

@@ -992,7 +992,7 @@ void FFc<M>::raise(typename M::FaceHandle& _fh, state_t _target_state)
// choose coefficient c
typename M::Scalar c = Base::coeff();
position *= (1.0 - c);
position *= (static_cast<typename M::Scalar>(1.0) - c);
position += MOBJ(_fh).position(_target_state - 1) * c;
MOBJ(_fh).set_position(_target_state, position);

3
src/OpenMesh/Tools/Subdivider/Uniform/Composite/CompositeT.cc
View File

@@ -882,7 +882,8 @@ void CompositeT<MeshType,RealType>::EVc(Coeff& _coeff)
++valence;
}
c = _coeff(valence);
// Coefficients always work on double so we cast them to the correct scalar here
c = static_cast<scalar_t>(_coeff(valence));
for (voh_it = mesh_.voh_iter(*v_it); voh_it.is_valid(); ++voh_it) {
cog += mesh_.data(mesh_.edge_handle(*voh_it)).position() * c;