From ec76f61e788f52834f4abf2de1e4f4589a0b667c Mon Sep 17 00:00:00 2001 From: asl Date: Fri, 4 Dec 2015 09:47:28 +0300 Subject: [PATCH] boost is no more used in HYDROData --- src/HYDROData/HYDROData_Bathymetry.cxx | 8 +++----- src/HYDROData/HYDROData_Image.cxx | 6 ++---- src/HYDROData/HYDROData_Profile.cxx | 8 +++----- 3 files changed, 8 insertions(+), 14 deletions(-) diff --git a/src/HYDROData/HYDROData_Bathymetry.cxx b/src/HYDROData/HYDROData_Bathymetry.cxx index b1204e6f..db0e9d4b 100644 --- a/src/HYDROData/HYDROData_Bathymetry.cxx +++ b/src/HYDROData/HYDROData_Bathymetry.cxx @@ -21,8 +21,6 @@ #include "HYDROData_Tool.h" #include "HYDROData_PolylineXY.h" -#include - #include #include @@ -478,9 +476,9 @@ bool HYDROData_Bathymetry::importFromXYZFile( QFile& theFile, if ( !isXOk || !isYOk || !isZOk ) return false; - if ( boost::math::isnan( aPoint.X() ) || boost::math::isinf( aPoint.X() ) || - boost::math::isnan( aPoint.Y() ) || boost::math::isinf( aPoint.Y() ) || - boost::math::isnan( aPoint.Z() ) || boost::math::isinf( aPoint.Z() ) ) + if ( isnan( aPoint.X() ) || isinf( aPoint.X() ) || + isnan( aPoint.Y() ) || isinf( aPoint.Y() ) || + isnan( aPoint.Z() ) || isinf( aPoint.Z() ) ) return false; // Invert the z value if requested diff --git a/src/HYDROData/HYDROData_Image.cxx b/src/HYDROData/HYDROData_Image.cxx index d6d187b6..1cadb4bf 100644 --- a/src/HYDROData/HYDROData_Image.cxx +++ b/src/HYDROData/HYDROData_Image.cxx @@ -44,8 +44,6 @@ #pragma warning ( default: 4251 ) #endif -#include - static const Standard_GUID GUID_SELF_SPLIT("997995aa-5c19-40bf-9a60-ab4b70ad04d8"); static const Standard_GUID GUID_HAS_LOCAL_POINTS("FD8841AA-FC44-42fa-B6A7-0F682CCC6F27"); static const Standard_GUID GUID_HAS_GLOBAL_POINTS("330D0E81-742D-4ea3-92D4-484877CFA7C1"); @@ -672,8 +670,8 @@ bool HYDROData_Image::SetGlobalPointsFromFile( const QString& theFileName ) // Check the result if ( !isDoubleOk || - boost::math::isnan( aDoubleValue ) || - boost::math::isinf( aDoubleValue ) ) { + isnan( aDoubleValue ) || + isinf( aDoubleValue ) ) { continue; } diff --git a/src/HYDROData/HYDROData_Profile.cxx b/src/HYDROData/HYDROData_Profile.cxx index 76b0bed2..3e638794 100644 --- a/src/HYDROData/HYDROData_Profile.cxx +++ b/src/HYDROData/HYDROData_Profile.cxx @@ -23,8 +23,6 @@ #include "HYDROData_Tool.h" #include "HYDROData_PolylineXY.h" -#include - #include #include #include @@ -620,8 +618,8 @@ bool HYDROData_Profile::ImportFromFile( OSD_File& theFile, double aCoordX = aValX.RealValue(); double aCoordY = aValY.RealValue(); - if ( boost::math::isnan( aCoordX ) || boost::math::isinf( aCoordX ) || - boost::math::isnan( aCoordY ) || boost::math::isinf( aCoordY ) ) + if ( isnan( aCoordX ) || isinf( aCoordX ) || + isnan( aCoordY ) || isinf( aCoordY ) ) aRes = false; if ( anIsParametric ) @@ -647,7 +645,7 @@ bool HYDROData_Profile::ImportFromFile( OSD_File& theFile, } double aCoordZ = aValZ.RealValue(); - if ( boost::math::isnan( aCoordZ ) || boost::math::isinf( aCoordZ ) ) + if ( isnan( aCoordZ ) || isinf( aCoordZ ) ) aRes = false; ProfilePoint aPoint( aCoordX, aCoordY, aCoordZ ); -- 2.39.2