From 6d04e56080d7573366d27e11a1614cc4a5785267 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20M=C3=B6bius?= Date: Wed, 24 Jul 2013 13:18:49 +0000 Subject: [PATCH] Fixed more warnings git-svn-id: http://www.openmesh.org/svnrepo/OpenMesh/trunk@878 fdac6126-5c0c-442c-9429-916003d36597 --- src/OpenMesh/Tools/Decimater/MixedDecimaterT.cc | 2 +- src/OpenMesh/Tools/Subdivider/Uniform/CatmullClarkT.cc | 2 +- src/OpenMesh/Tools/Utils/HeapT.hh | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/OpenMesh/Tools/Decimater/MixedDecimaterT.cc b/src/OpenMesh/Tools/Decimater/MixedDecimaterT.cc index a66c896d..5871eac2 100644 --- a/src/OpenMesh/Tools/Decimater/MixedDecimaterT.cc +++ b/src/OpenMesh/Tools/Decimater/MixedDecimaterT.cc @@ -136,7 +136,7 @@ size_t MixedDecimaterT::decimate_to_faces(const size_t _n_vertices,const size_t samples = int (double( min) + double(i)/(double(steps)-1.0) * (max-2) ) ; // We won't allow 1 here, as this is the last step in the incremental part - float decimaterLevel = (double(i + 1)) * _mc_factor / (double(steps) ); + float decimaterLevel = (float(i + 1)) * _mc_factor / (float(steps) ); this->set_samples(samples); r_collapses += McDecimaterT::decimate_constraints_only(decimaterLevel); diff --git a/src/OpenMesh/Tools/Subdivider/Uniform/CatmullClarkT.cc b/src/OpenMesh/Tools/Subdivider/Uniform/CatmullClarkT.cc index 8fc67fd2..7f22fbe6 100644 --- a/src/OpenMesh/Tools/Subdivider/Uniform/CatmullClarkT.cc +++ b/src/OpenMesh/Tools/Subdivider/Uniform/CatmullClarkT.cc @@ -380,7 +380,7 @@ CatmullClarkT::update_vertex( MeshType& _m, const VertexHandl Q /= valence*valence;//neigboring_faces; - pos += _m.point(_vh) * (valence-2.0)/valence + Q; + pos += _m.point(_vh) * (valence - RealType(2.0) )/valence + Q; // pos = vector_cast(_m.point(_vh)); } diff --git a/src/OpenMesh/Tools/Utils/HeapT.hh b/src/OpenMesh/Tools/Utils/HeapT.hh index f94b6800..961f1070 100644 --- a/src/OpenMesh/Tools/Utils/HeapT.hh +++ b/src/OpenMesh/Tools/Utils/HeapT.hh @@ -286,7 +286,7 @@ private: { assert(_idx < size()); Base::operator[](_idx) = _h; - interface_.set_heap_position(_h, _idx); + interface_.set_heap_position(_h, int(_idx)); }