fly/terragear
1
0
Fork 0
Code Activity

Fix missing std:: namespace, bug #1891

Browse source 
see https://sourceforge.net/p/flightgear/codetickets/1891/
Thanks to James Hester for the patch
This commit is contained in:
Torsten Dreyer 2016-09-13 20:56:46 +02:00 • committed by Alessandro Menti
parent 4c8455c0ee
commit 1e32e9bccb
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/Airports/GenAirports850/linearfeature.cxx
View file

@ -164,7 +164,7 @@ void LinearFeature::ConvertContour( BezContour* src, bool closed )
// theat close to 180 at the control point to the cur node and next node // theat close to 180 at the control point to the cur node and next node
if ( curve_type == CURVE_QUADRATIC ) if ( curve_type == CURVE_QUADRATIC )
{ {
if ( (abs(theta1 - 180.0) < 5.0 ) || (abs(theta1) < 5.0 ) || (isnan(theta1)) ) if ( (std::abs(theta1 - 180.0) < 5.0 ) || (std::abs(theta1) < 5.0 ) || (std::isnan(theta1)) )
{ {
TG_LOG(SG_GENERAL, SG_DEBUG, "\nLinearFeature: Quadtratic curve with cp in line : convert to linear: " << description << ": theta is " << theta1 ); TG_LOG(SG_GENERAL, SG_DEBUG, "\nLinearFeature: Quadtratic curve with cp in line : convert to linear: " << description << ": theta is " << theta1 );
curve_type = CURVE_LINEAR; curve_type = CURVE_LINEAR;
@ -177,11 +177,11 @@ void LinearFeature::ConvertContour( BezContour* src, bool closed )
if ( curve_type == CURVE_CUBIC ) if ( curve_type == CURVE_CUBIC )
{ {
if ( (abs(theta1 - 180.0) < 5.0 ) || (abs(theta1) < 5.0 ) || (isnan(theta1)) ) if ( (std::abs(theta1 - 180.0) < 5.0 ) || (std::abs(theta1) < 5.0 ) || (std::isnan(theta1)) )
{ {
TG_LOG(SG_GENERAL, SG_DEBUG, "\nLinearFeature: Cubic curve with cp1 in line : " << description << ": theta is " << theta1 ); TG_LOG(SG_GENERAL, SG_DEBUG, "\nLinearFeature: Cubic curve with cp1 in line : " << description << ": theta is " << theta1 );
if ( (abs(theta2 - 180.0) < 5.0 ) || (abs(theta2) < 5.0 ) || (isnan(theta2)) ) if ( (std::abs(theta2 - 180.0) < 5.0 ) || (std::abs(theta2) < 5.0 ) || (std::isnan(theta2)) )
{ {
TG_LOG(SG_GENERAL, SG_DEBUG, "\n and cp2 in line : " << description << ": theta is " << theta2 << " CONVERTING TO LINEAR" ); TG_LOG(SG_GENERAL, SG_DEBUG, "\n and cp2 in line : " << description << ": theta is " << theta2 << " CONVERTING TO LINEAR" );
@ -196,7 +196,7 @@ void LinearFeature::ConvertContour( BezContour* src, bool closed )
{ {
TG_LOG(SG_GENERAL, SG_DEBUG, "\nLinearFeature: Cubic curve withOUT cp1 in line : keep quadtratic: " << description << ": theta is " << theta1 ); TG_LOG(SG_GENERAL, SG_DEBUG, "\nLinearFeature: Cubic curve withOUT cp1 in line : keep quadtratic: " << description << ": theta is " << theta1 );
if ( (abs(theta2 - 180.0) < 5.0 ) || (abs(theta2) < 5.0 ) || (isnan(theta2)) ) if ( (std::abs(theta2 - 180.0) < 5.0 ) || (std::abs(theta2) < 5.0 ) || (std::isnan(theta2)) )
{ {
TG_LOG(SG_GENERAL, SG_DEBUG, "\n BUT cp2 IS in line : " << description << ": theta is " << theta2 ); TG_LOG(SG_GENERAL, SG_DEBUG, "\n BUT cp2 IS in line : " << description << ": theta is " << theta2 );
} }