From 92d8856647a2bd2adbb5315d50c6f7360f0eb959 Mon Sep 17 00:00:00 2001 From: sigurdp Date: Wed, 13 Dec 2017 15:06:49 +0100 Subject: [PATCH] Fixes for GCC compile --- ApplicationCode/UserInterface/RiuPvtPlotPanel.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ApplicationCode/UserInterface/RiuPvtPlotPanel.cpp b/ApplicationCode/UserInterface/RiuPvtPlotPanel.cpp index d4c4b4b4a5..b518f3d6ea 100644 --- a/ApplicationCode/UserInterface/RiuPvtPlotPanel.cpp +++ b/ApplicationCode/UserInterface/RiuPvtPlotPanel.cpp @@ -272,7 +272,7 @@ void RiuPvtPlotWidget::updateTrackerPlotMarkerAndLabelFromPicker() if (curveIdx < m_pvtCurveArr.size()) { const RigFlowDiagSolverInterface::PvtCurve& pvtCurve = m_pvtCurveArr[curveIdx]; - if (pointSampleIdx < pvtCurve.mixRatVals.size()) + if (static_cast(pointSampleIdx) < pvtCurve.mixRatVals.size()) { mixRat = pvtCurve.mixRatVals[pointSampleIdx]; @@ -342,7 +342,7 @@ const QwtPlotCurve* RiuPvtPlotWidget::closestCurveSample(const QPoint& cursorPos if (closestSampleIndex) *closestSampleIndex = -1; const QwtPlotCurve* closestCurve = NULL; - double distMin = DBL_MAX; + double distMin = HUGE_VAL; int closestPointSampleIndex = -1; const QwtPlotItemList& itemList = plot.itemList(); @@ -351,7 +351,7 @@ const QwtPlotCurve* RiuPvtPlotWidget::closestCurveSample(const QPoint& cursorPos if ((*it)->rtti() == QwtPlotItem::Rtti_PlotCurve) { const QwtPlotCurve* candidateCurve = static_cast(*it); - double dist = DBL_MAX; + double dist = HUGE_VAL; int candidateSampleIndex = candidateCurve->closestPoint(cursorPosition, &dist); if (dist < distMin) {