From 05a71b79c9916550a34fb2f09a086e2508e90da4 Mon Sep 17 00:00:00 2001 From: Magne Sjaastad Date: Mon, 5 Oct 2015 17:36:19 +0200 Subject: [PATCH] Linux fixes --- .../ProjectDataModel/RimWellLogExtractionCurveImpl.cpp | 6 +++++- .../ProjectDataModel/RimWellLogExtractionCurveImpl.h | 1 + 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/ApplicationCode/ProjectDataModel/RimWellLogExtractionCurveImpl.cpp b/ApplicationCode/ProjectDataModel/RimWellLogExtractionCurveImpl.cpp index 33fd92dacb..2ab80fcb27 100644 --- a/ApplicationCode/ProjectDataModel/RimWellLogExtractionCurveImpl.cpp +++ b/ApplicationCode/ProjectDataModel/RimWellLogExtractionCurveImpl.cpp @@ -19,8 +19,12 @@ #include "RimWellLogExtractionCurveImpl.h" +#include "cvfBase.h" +#include "cvfMath.h" #include "cvfAssert.h" +#include // Needed for HUGE_VAL on Linux + //-------------------------------------------------------------------------------------------------- /// //-------------------------------------------------------------------------------------------------- @@ -99,7 +103,7 @@ void RimWellLogExtractionCurveImpl::validDepthValuesIntervals(const std::vector< size_t intStartIdx = startIdx; for (size_t vIdx = startIdx + 1; vIdx < stopIdx; vIdx += 2) { - if (abs(depthValues[vIdx + 1] - depthValues[vIdx]) > depthDiffTolerance) + if (cvf::Math::abs(depthValues[vIdx + 1] - depthValues[vIdx]) > depthDiffTolerance) { intervals.push_back(std::make_pair(intStartIdx, vIdx)); intStartIdx = vIdx + 1; diff --git a/ApplicationCode/ProjectDataModel/RimWellLogExtractionCurveImpl.h b/ApplicationCode/ProjectDataModel/RimWellLogExtractionCurveImpl.h index a8266f1578..31ff8a63d2 100644 --- a/ApplicationCode/ProjectDataModel/RimWellLogExtractionCurveImpl.h +++ b/ApplicationCode/ProjectDataModel/RimWellLogExtractionCurveImpl.h @@ -20,6 +20,7 @@ #pragma once #include +#include //==================================================================================================