From 88ead1f986574aab1117465a0701d6e4593a80c1 Mon Sep 17 00:00:00 2001 From: Magne Sjaastad Date: Fri, 16 Feb 2018 16:56:39 +0100 Subject: [PATCH] Fix signed /unsigned compare --- .../Intersections/RivIntersectionGeometryGenerator.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/ApplicationCode/ModelVisualization/Intersections/RivIntersectionGeometryGenerator.cpp b/ApplicationCode/ModelVisualization/Intersections/RivIntersectionGeometryGenerator.cpp index b605ea648f..bfe95eaab7 100644 --- a/ApplicationCode/ModelVisualization/Intersections/RivIntersectionGeometryGenerator.cpp +++ b/ApplicationCode/ModelVisualization/Intersections/RivIntersectionGeometryGenerator.cpp @@ -613,16 +613,16 @@ cvf::Mat4d RivIntersectionGeometryGenerator::unflattenTransformMatrix(const cvf: int polyLineIdx = -1; int segIdx = -1; - for (int i = 0; i < m_flattenedOrOffsettedPolyLines.size(); i++) + for (size_t i = 0; i < m_flattenedOrOffsettedPolyLines.size(); i++) { std::vector pts = m_flattenedOrOffsettedPolyLines[i]; - for(int j = 0; j < pts.size(); j++) + for(size_t j = 0; j < pts.size(); j++) { // Assumes ascending sorted list if (j > 0 && intersectionPointUtm.x() < pts[j].x()) { - polyLineIdx = i; - segIdx = j - 1; + polyLineIdx = static_cast(i); + segIdx = static_cast(j) - 1; startPt = pts[segIdx]; break; }