OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-02-25 18:55:39 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fix missing includes on Linux

Browse Source
This commit is contained in:
Magne Sjaastad 2020-02-19 12:47:06 +01:00
parent 3aa4ffb0da
commit c950f19a51
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
ApplicationCode/FileInterface/RifSurfaceReader.cpp
View File

@ -164,10 +164,11 @@ std::pair<std::vector<cvf::Vec3d>, std::vector<unsigned>> RifSurfaceReader::read
}; };
std::vector<SurfacePointData> surfaceDataPoints; std::vector<SurfacePointData> surfaceDataPoints;
int minI = std::numeric_limits<int>::max();
int minJ = std::numeric_limits<int>::max(); int minI = std::numeric_limits<int>::max();
int maxI = std::numeric_limits<int>::min(); int minJ = std::numeric_limits<int>::max();
int maxJ = std::numeric_limits<int>::min(); int maxI = std::numeric_limits<int>::min();
int maxJ = std::numeric_limits<int>::min();
while ( stream.good() ) while ( stream.good() )
{ {
@ -175,7 +176,10 @@ std::pair<std::vector<cvf::Vec3d>, std::vector<unsigned>> RifSurfaceReader::read
std::getline( stream, line ); std::getline( stream, line );
std::istringstream lineStream( line ); std::istringstream lineStream( line );
double x( HUGE_VAL ), y( HUGE_VAL ), z( HUGE_VAL ); double x( std::numeric_limits<double>::infinity() );
double y( std::numeric_limits<double>::infinity() );
double z( std::numeric_limits<double>::infinity() );
int i( -1 ), j( -1 ); int i( -1 ), j( -1 );
std::vector<double> values; std::vector<double> values;
@ -186,7 +190,8 @@ std::pair<std::vector<cvf::Vec3d>, std::vector<unsigned>> RifSurfaceReader::read
{ {
lineStream >> y >> z >> i >> j; lineStream >> y >> z >> i >> j;
if ( x != HUGE_VAL && y != HUGE_VAL && z != HUGE_VAL && i != -1 && j != -1 ) if ( x != std::numeric_limits<double>::infinity() && y != std::numeric_limits<double>::infinity() &&
z != std::numeric_limits<double>::infinity() && i != -1 && j != -1 )
{ {
// Check for extra data // Check for extra data
while ( lineStream.good() ) while ( lineStream.good() )