kindred/create
1
1
Fork 0
Code Issues 51 Pull Requests 1 Actions 1 Packages Projects 9 Releases 2 Wiki Activity

Mesh: [skip ci] lgtm: Multiplication result converted to larger type

Browse Source 
Multiplication result may overflow 'float' before it is converted to 'double'.
This commit is contained in:
wmayer
2022-03-20 15:53:04 +01:00
parent 8f894ebefe
commit cb81addfa1
3 changed files with 29 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/Mod/Mesh/App/Core/CylinderFit.cpp
View File

@@ -179,20 +179,16 @@ float CylinderFit::GetStdDeviation() const
if (!_bIsFitted)
return FLOAT_MAX;
float fSumXi = 0.0f, fSumXi2 = 0.0f,
fMean = 0.0f, fDist = 0.0f;
float ulPtCt = float(CountPoints());
std::list< Base::Vector3f >::const_iterator cIt;
for (cIt = _vPoints.begin(); cIt != _vPoints.end(); ++cIt) {
fDist = GetDistanceToCylinder( *cIt );
fSumXi += fDist;
fSumXi2 += ( fDist * fDist );
double sumXi = 0.0, sumXi2 = 0.0, dist = 0.0;
for (auto it : _vPoints) {
dist = GetDistanceToCylinder( it );
sumXi += dist;
sumXi2 += (dist * dist);
}
fMean = (1.0f / ulPtCt) * fSumXi;
return sqrt((ulPtCt / (ulPtCt - 1.0f)) * ((1.0f / ulPtCt) * fSumXi2 - fMean * fMean));
double N = static_cast<double>(CountPoints());
double mean = sumXi / N;
return sqrt((N / (N - 1.0)) * (sumXi2 / N - mean * mean));
}
void CylinderFit::ProjectToCylinder()

27
src/Mod/Mesh/App/Core/Elements.cpp
View File

@@ -1235,26 +1235,25 @@ float MeshGeomFacet::CenterOfCircumCircle(Base::Vector3f& rclCenter) const
Base::Vector3f v = (p2-p1);
Base::Vector3f w = (p0-p2);
float uu = (u * u);
float vv = (v * v);
float ww = (w * w);
float uv = - (u * v);
float vw = - (v * w);
float uw = - (w * u);
double uu = (u * u);
double vv = (v * v);
double ww = (w * w);
double uv = - (u * v);
double vw = - (v * w);
double uw = - (w * u);
float w0 = static_cast<float>(2 * sqrt(uu * ww - uw * uw) * uw / (uu * ww));
float w1 = static_cast<float>(2 * sqrt(uu * vv - uv * uv) * uv / (uu * vv));
float w2 = static_cast<float>(2 * sqrt(vv * ww - vw * vw) * vw / (vv * ww));
double w0 = (2 * sqrt(uu * ww - uw * uw) * uw / (uu * ww));
double w1 = (2 * sqrt(uu * vv - uv * uv) * uv / (uu * vv));
double w2 = (2 * sqrt(vv * ww - vw * vw) * vw / (vv * ww));
// center of the circle
float wx = w0 + w1 + w2;
rclCenter.x = (w0*p0.x + w1*p1.x + w2*p2.x)/wx;
rclCenter.y = (w0*p0.y + w1*p1.y + w2*p2.y)/wx;
rclCenter.z = (w0*p0.z + w1*p1.z + w2*p2.z)/wx;
double wx = w0 + w1 + w2;
rclCenter.x = static_cast<float>((w0*p0.x + w1*p1.x + w2*p2.x)/wx);
rclCenter.y = static_cast<float>((w0*p0.y + w1*p1.y + w2*p2.y)/wx);
rclCenter.z = static_cast<float>((w0*p0.z + w1*p1.z + w2*p2.z)/wx);
// radius of the circle
float fRadius = static_cast<float>(sqrt(uu * vv * ww) / (4 * Area()));
return fRadius;
}

20
src/Mod/Mesh/App/Core/SphereFit.cpp
View File

@@ -112,20 +112,16 @@ float SphereFit::GetStdDeviation() const
if (!_bIsFitted)
return FLOAT_MAX;
float fSumXi = 0.0f, fSumXi2 = 0.0f,
fMean = 0.0f, fDist = 0.0f;
float ulPtCt = float(CountPoints());
std::list< Base::Vector3f >::const_iterator cIt;
for (cIt = _vPoints.begin(); cIt != _vPoints.end(); ++cIt) {
fDist = GetDistanceToSphere( *cIt );
fSumXi += fDist;
fSumXi2 += ( fDist * fDist );
double sumXi = 0.0, sumXi2 = 0.0, dist = 0.0;
for (auto it : _vPoints) {
dist = GetDistanceToSphere( it );
sumXi += dist;
sumXi2 += (dist * dist);
}
fMean = (1.0f / ulPtCt) * fSumXi;
return sqrt((ulPtCt / (ulPtCt - 1.0f)) * ((1.0f / ulPtCt) * fSumXi2 - fMean * fMean));
double N = static_cast<double>(CountPoints());
double mean = sumXi / N;
return sqrt((N / (N - 1.0)) * (sumXi2 / N - mean * mean));
}
void SphereFit::ProjectToSphere()