Fixed various warnings
git-svn-id: http://www.openmesh.org/svnrepo/OpenMesh/trunk@1208 fdac6126-5c0c-442c-9429-916003d36597
This commit is contained in:
@@ -134,7 +134,7 @@ public:
|
||||
|
||||
/// Set normal deviation ( 0 .. 360 )
|
||||
void set_normal_deviation(Scalar _s) {
|
||||
normal_deviation_ = _s / 180.0 * M_PI;
|
||||
normal_deviation_ = _s / static_cast<Scalar>(180.0) * static_cast<Scalar>(M_PI);
|
||||
}
|
||||
|
||||
|
||||
@@ -207,7 +207,7 @@ public:
|
||||
// the smaller the factor, the smaller normal_deviation_ gets
|
||||
// thus creating a stricter constraint
|
||||
// division by error_tolerance_factor_ is for normalization
|
||||
Scalar normal_deviation = (normal_deviation_ * 180.0/M_PI) * _factor / this->error_tolerance_factor_;
|
||||
Scalar normal_deviation = (normal_deviation_ * static_cast<Scalar>(180.0)/static_cast<Scalar>(M_PI) ) * _factor / this->error_tolerance_factor_;
|
||||
set_normal_deviation(normal_deviation);
|
||||
this->error_tolerance_factor_ = _factor;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user