Browse Source

AP_Math: compiler warnings: apply is_zero(float) or is_equal(float)

mission-4.1.18
Tom Pittenger 10 years ago committed by Andrew Tridgell
parent
commit
35f7a466e5
  1. 4
      libraries/AP_Math/location.cpp

4
libraries/AP_Math/location.cpp

@ -128,7 +128,7 @@ void location_update(struct Location &loc, float bearing, float distance)
*/ */
void location_offset(struct Location &loc, float ofs_north, float ofs_east) void location_offset(struct Location &loc, float ofs_north, float ofs_east)
{ {
if (ofs_north != 0 || ofs_east != 0) { if (!AP_Math::is_zero(ofs_north) || !AP_Math::is_zero(ofs_east)) {
int32_t dlat = ofs_north * LOCATION_SCALING_FACTOR_INV; int32_t dlat = ofs_north * LOCATION_SCALING_FACTOR_INV;
int32_t dlng = (ofs_east * LOCATION_SCALING_FACTOR_INV) / longitude_scale(loc); int32_t dlng = (ofs_east * LOCATION_SCALING_FACTOR_INV) / longitude_scale(loc);
loc.lat += dlat; loc.lat += dlat;
@ -254,7 +254,7 @@ void wgsecef2llh(const Vector3d &ecef, Vector3d &llh) {
const double p = sqrt(ecef[0]*ecef[0] + ecef[1]*ecef[1]); const double p = sqrt(ecef[0]*ecef[0] + ecef[1]*ecef[1]);
/* Compute longitude first, this can be done exactly. */ /* Compute longitude first, this can be done exactly. */
if (p != 0) if (!AP_Math::is_zero(p))
llh[1] = atan2(ecef[1], ecef[0]); llh[1] = atan2(ecef[1], ecef[0]);
else else
llh[1] = 0; llh[1] = 0;

Loading…
Cancel
Save