Commit ac23cb90 authored by Jan Möbius's avatar Jan Möbius
Browse files

Fixed warnings

git-svn-id: http://www.openmesh.org/svnrepo/OpenMesh/trunk@1301 fdac6126-5c0c-442c-9429-916003d36597
parent d5c2ea43
......@@ -1173,7 +1173,7 @@ void FVc<M>::raise(typename M::VertexHandle& _vh, state_t _target_state)
c = _2over3 * ( cos( _2pi / valence) + 1.0);
#else
valence = Base::mesh_.valence(_vh);
c = coeff(valence);
c = typename M::Scalar(coeff(valence));
#endif
......@@ -1193,7 +1193,7 @@ void FVc<M>::raise(typename M::VertexHandle& _vh, state_t _target_state)
position += MOBJ(Base::mesh_.FH(*voh_it)).position(_target_state - 1) * c;
position += MOBJ(Base::mesh_.FH(Base::mesh_.OHEH(Base::mesh_.NHEH(*voh_it)))).position(_target_state - 1) * (1.0 - c);
position += MOBJ(Base::mesh_.FH(Base::mesh_.OHEH(Base::mesh_.NHEH(*voh_it)))).position(_target_state - 1) * ( typename M::Scalar(1.0) - c);
}
else {
......
......@@ -71,10 +71,10 @@ TEST_F(OpenMeshSmoother_Triangle, Smoother_Poly_Laplace) {
OpenMesh::Smoother::JacobiLaplaceSmootherT<Mesh> smoother(mesh_);
// Just call function to instanciate template
smoother.set_absolute_local_error(0.5);
smoother.set_absolute_local_error(0.5f);
// Set an error
smoother.set_relative_local_error(0.1);
smoother.set_relative_local_error(0.1f);
// Run algorithm with 5 steps
smoother.smooth(5);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment