Commit 4fefc30f authored by Jan Möbius's avatar Jan Möbius

Merge branch 'warn3' into 'master'

More warnings fixed

See merge request !101
parents 4dd321bb 43778037
Pipeline #3419 canceled with stage
in 14 minutes and 16 seconds
......@@ -214,7 +214,8 @@ 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_ * static_cast<Scalar>(180.0)/static_cast<Scalar>(M_PI) ) * _factor / this->error_tolerance_factor_;
Scalar normal_deviation = normal_deviation_ * static_cast<Scalar>( 180.0 / M_PI * _factor / this->error_tolerance_factor_);
set_normal_deviation(normal_deviation);
this->error_tolerance_factor_ = _factor;
}
......
......@@ -185,7 +185,7 @@ class ModRoundnessT : public ModBaseT<MeshT>
// the smaller the factor, the smaller min_r_ gets
// thus creating a stricter constraint
// division by error_tolerance_factor_ is for normalization
value_type min_roundness = min_r_ * _factor / this->error_tolerance_factor_;
value_type min_roundness = min_r_ * static_cast<value_type>(_factor / this->error_tolerance_factor_);
set_min_roundness(min_roundness);
this->error_tolerance_factor_ = _factor;
}
......
......@@ -231,7 +231,7 @@ private:
double t = (3.0 + 2.0 * cos( 2.0 * M_PI * inv_v) );
double alpha = (40.0 - t * t)/64.0;
return weight_t( 1.0-alpha, inv_v*alpha);
return weight_t( static_cast<real_t>(1.0-alpha), static_cast<real_t>(inv_v*alpha) );
}
return weight_t(0.0, 0.0);
}
......
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