From 59fe23dcb3e1f600d37cf0549b771c0db66751d2 Mon Sep 17 00:00:00 2001
From: James Turner <zakalawe@mac.com>
Date: Sat, 21 May 2011 13:41:43 +0100
Subject: [PATCH] Change occurrences of fabsf to fabs - part of tracking down
an osg/Math issue on Mac with XCode4
---
src/Instrumentation/HUD/HUD_label.cxx | 4 ++--
src/Instrumentation/HUD/HUD_ladder.cxx | 2 +-
src/Instrumentation/HUD/HUD_tape.cxx | 2 +-
src/Instrumentation/HUD/HUD_tbi.cxx | 4 ++--
4 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/Instrumentation/HUD/HUD_label.cxx b/src/Instrumentation/HUD/HUD_label.cxx
index 5cf2bcb57..ddadedad3 100644
--- a/src/Instrumentation/HUD/HUD_label.cxx
+++ b/src/Instrumentation/HUD/HUD_label.cxx
@@ -89,7 +89,7 @@ void HUD::Label::draw(void)
l = _center_x - pw;
r = _center_x + pw;
- bool draw_parallel = fabsf(_pointer_width - _w) > 2.0; // draw lines left and right of arrow?
+ bool draw_parallel = fabs(_pointer_width - _w) > 2.0; // draw lines left and right of arrow?
if (option_bottom()) {
if (draw_parallel) {
@@ -115,7 +115,7 @@ void HUD::Label::draw(void)
l = _center_y - pw;
r = _center_y + pw;
- draw_parallel = fabsf(_pointer_width - _h) > 2.0;
+ draw_parallel = fabs(_pointer_width - _h) > 2.0;
if (option_left()) {
if (draw_parallel) {
diff --git a/src/Instrumentation/HUD/HUD_ladder.cxx b/src/Instrumentation/HUD/HUD_ladder.cxx
index 478ffa1b1..88bd17549 100644
--- a/src/Instrumentation/HUD/HUD_ladder.cxx
+++ b/src/Instrumentation/HUD/HUD_ladder.cxx
@@ -48,7 +48,7 @@ HUD::Ladder::Ladder(HUD *hud, const SGPropertyNode *n, float x, float y) :
_roll(n->getNode("roll-input", false)),
_width_units(int(n->getFloatValue("display-span"))),
_div_units(int(fabs(n->getFloatValue("divisions")))),
- _scr_hole(fabsf(n->getFloatValue("screen-hole")) * 0.5f),
+ _scr_hole(fabs(n->getFloatValue("screen-hole")) * 0.5f),
_zero_bar_overlength(n->getFloatValue("zero-bar-overlength", 10)),
_dive_bar_angle(n->getBoolValue("enable-dive-bar-angle")),
_tick_length(n->getFloatValue("tick-length")),
diff --git a/src/Instrumentation/HUD/HUD_tape.cxx b/src/Instrumentation/HUD/HUD_tape.cxx
index 02fb76f15..6820e8880 100644
--- a/src/Instrumentation/HUD/HUD_tape.cxx
+++ b/src/Instrumentation/HUD/HUD_tape.cxx
@@ -534,7 +534,7 @@ void HUD::Tape::draw_horizontal(float value)
char *HUD::Tape::format_value(float v)
{
- if (fabsf(v) < 1e-8) // avoid -0.0
+ if (fabs(v) < 1e-8) // avoid -0.0
v = 0.0f;
if (_label_fmt == INT)
diff --git a/src/Instrumentation/HUD/HUD_tbi.cxx b/src/Instrumentation/HUD/HUD_tbi.cxx
index 7f5f442a4..7ec4c2639 100644
--- a/src/Instrumentation/HUD/HUD_tbi.cxx
+++ b/src/Instrumentation/HUD/HUD_tbi.cxx
@@ -129,12 +129,12 @@ void HUD::TurnBankIndicator::draw_scale()
int dir = bank > 0 ? 1 : -1;
- if (fabsf(bank) > 25) {
+ if (fabs(bank) > 25) {
draw_tick(45, r, minor, dir);
draw_tick(60, r, major, dir);
}
- if (fabsf(bank) > 55) {
+ if (fabs(bank) > 55) {
draw_tick(90, r, major, dir);
draw_tick(135, r, major, dir);
}