From 43a1f4dbbe7d647faa9f62e7ced618c08eb3fe24 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jacob=20St=C3=B8ren?= Date: Tue, 9 Aug 2016 07:41:08 +0200 Subject: [PATCH] Linux compile fixes --- .../ProjectDataModel/RimCurveAppearanceCalculator.cpp | 4 ++-- .../ProjectDataModel/RimCurveAppearanceCalculator.h | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/ApplicationCode/ProjectDataModel/RimCurveAppearanceCalculator.cpp b/ApplicationCode/ProjectDataModel/RimCurveAppearanceCalculator.cpp index 56474ef154..0a4663dd9c 100644 --- a/ApplicationCode/ProjectDataModel/RimCurveAppearanceCalculator.cpp +++ b/ApplicationCode/ProjectDataModel/RimCurveAppearanceCalculator.cpp @@ -20,7 +20,7 @@ #include "RimSummaryCurve.h" #include "cvfVector3.h" - +#include //-------------------------------------------------------------------------------------------------- /// @@ -212,7 +212,7 @@ cvf::Color3f RimCurveLookCalculator::gradeColor(const cvf::Color3f& color, float targetC = cvf::Vec3f(1, 1, 1); } - cvf::Vec3f newColor = fabs(factor) * (targetC - orgC) + orgC; + cvf::Vec3f newColor = ((float)fabs(factor)) * (targetC - orgC) + orgC; return cvf::Color3f(newColor[0], newColor[1], newColor[2]); } diff --git a/ApplicationCode/ProjectDataModel/RimCurveAppearanceCalculator.h b/ApplicationCode/ProjectDataModel/RimCurveAppearanceCalculator.h index 6c81064d33..f0ef8b56d5 100644 --- a/ApplicationCode/ProjectDataModel/RimCurveAppearanceCalculator.h +++ b/ApplicationCode/ProjectDataModel/RimCurveAppearanceCalculator.h @@ -16,6 +16,7 @@ // ///////////////////////////////////////////////////////////////////////////////// #pragma once +#include "cvfBase.h" #include "cvfColor3.h" #include #include "RifEclipseSummaryAddress.h"