Mirror/ardupilot
5
0
Fork 0
mirror of https://github.com/ArduPilot/ardupilot synced 2025-03-03 12:14:10 -04:00
Code Issues Packages Projects Releases Wiki Activity

AP_Math: Remove an unneeded safe_sqrtf, leverage is_zero

Browse Source
This commit is contained in:
Michael du Breuil 2018-11-03 15:50:10 -07:00 committed by Peter Barker
parent 6e84a31613
commit 48610ea0a0
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libraries/AP_Math/vector2.cpp
View File

@ -191,7 +191,7 @@ bool Vector2<T>::circle_segment_intersection(const Vector2<T>& seg_start, const
const float delta = sq(b) - (4.0f * a * c); const float delta = sq(b) - (4.0f * a * c);
// check for invalid data // check for invalid data
if (fabsf(a) < FLT_EPSILON) { if (::is_zero(a)) {
return false; return false;
} }
if (isnan(a) || isnan(b) || isnan(c) || isnan(delta)) { if (isnan(a) || isnan(b) || isnan(c) || isnan(delta)) {
@ -203,7 +203,7 @@ bool Vector2<T>::circle_segment_intersection(const Vector2<T>& seg_start, const
return false; return false;
} }
const float delta_sqrt = safe_sqrt(delta); const float delta_sqrt = sqrtf(delta);
const float t1 = (-b + delta_sqrt) / (2.0f * a); const float t1 = (-b + delta_sqrt) / (2.0f * a);
const float t2 = (-b - delta_sqrt) / (2.0f * a); const float t2 = (-b - delta_sqrt) / (2.0f * a);

2
libraries/AP_Math/vector3.cpp
View File

@ -415,7 +415,7 @@ float Vector3<T>::distance_to_segment(const Vector3<T> &seg_start, const Vector3
float c = (seg_end-*this).length(); float c = (seg_end-*this).length();
// protect against divide by zero later // protect against divide by zero later
if (fabsf(b) < FLT_EPSILON) { if (::is_zero(b)) {
return 0.0f; return 0.0f;
} }