From c1ad9f418c88aa4811f59c58a4dc34bb343f01db Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jan=20M=C3=B6bius?= Date: Mon, 7 Nov 2016 15:23:49 +0100 Subject: [PATCH] Some casts --- src/OpenMesh/Tools/Decimater/ModEdgeLengthT.cc | 2 +- src/OpenMesh/Tools/Decimater/ModEdgeLengthT.hh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/OpenMesh/Tools/Decimater/ModEdgeLengthT.cc b/src/OpenMesh/Tools/Decimater/ModEdgeLengthT.cc index 0e6bf61a..bfd45e52 100644 --- a/src/OpenMesh/Tools/Decimater/ModEdgeLengthT.cc +++ b/src/OpenMesh/Tools/Decimater/ModEdgeLengthT.cc @@ -91,7 +91,7 @@ void ModEdgeLengthT::set_error_tolerance_factor(double _factor) { // the smaller the factor, the smaller edge_length_ gets // thus creating a stricter constraint // division by error_tolerance_factor_ is for normalization - float edge_length = edge_length_ * _factor / this->error_tolerance_factor_; + typename Mesh::Scalar edge_length = edge_length_ * static_cast(_factor / this->error_tolerance_factor_); set_edge_length(edge_length); this->error_tolerance_factor_ = _factor; } diff --git a/src/OpenMesh/Tools/Decimater/ModEdgeLengthT.hh b/src/OpenMesh/Tools/Decimater/ModEdgeLengthT.hh index 6be2315d..f50878d3 100644 --- a/src/OpenMesh/Tools/Decimater/ModEdgeLengthT.hh +++ b/src/OpenMesh/Tools/Decimater/ModEdgeLengthT.hh @@ -94,7 +94,7 @@ class ModEdgeLengthT: public ModBaseT { } /// set edge_length - void set_edge_length(float _f) { + void set_edge_length(typename Mesh::Scalar _f) { edge_length_ = _f; sqr_edge_length_ = _f * _f; }