More warning fixes

2016-10-28 08:59:36 +02:00
parent 7a1cad003d
commit 08160c1584
3 changed files with 9 additions and 8 deletions
--- a/src/OpenMesh/Tools/Subdivider/Uniform/Composite/CompositeT.cc
+++ b/src/OpenMesh/Tools/Subdivider/Uniform/Composite/CompositeT.cc
@@ -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;