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

System : Introduce compiler warning C4457 with fixes

Browse Source
This commit is contained in:
Magne Sjaastad
2018-09-24 21:20:35 +02:00
parent 5a9a5ba803
commit 4009d4d63b
7 changed files with 30 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ApplicationCode/ReservoirDataModel/RigReservoirBuilderMock.cpp
View File

@@ -83,10 +83,10 @@ void RigReservoirBuilderMock::appendNodes(const cvf::Vec3d& min, const cvf::Vec3
size_t i;
for (i = 0; i < cubeDimension.x(); i++)
{
cvf::Vec3d min(xPos, yPos, zPos);
cvf::Vec3d max(xPos + dx, yPos + dy, zPos + dz);
cvf::Vec3d cornerA(xPos, yPos, zPos);
cvf::Vec3d cornerB(xPos + dx, yPos + dy, zPos + dz);
appendCubeNodes(min, max, nodes);
appendCubeNodes(cornerA, cornerB, nodes);
xPos += dx;
}

6
ApplicationCode/ReservoirDataModel/RigWellPath.cpp
View File

@@ -208,10 +208,10 @@ void RigWellPath::twoClosestPoints(const cvf::Vec3d& position, cvf::Vec3d* p1, c
for ( size_t i = 1; i < m_wellPathPoints.size(); i++ )
{
cvf::Vec3d p1 = m_wellPathPoints[i - 1];
cvf::Vec3d p2 = m_wellPathPoints[i - 0];
cvf::Vec3d point1 = m_wellPathPoints[i - 1];
cvf::Vec3d point2 = m_wellPathPoints[i - 0];
double candidateDistance = cvf::GeometryTools::linePointSquareDist(p1, p2, position);
double candidateDistance = cvf::GeometryTools::linePointSquareDist(point1, point2, position);
if ( candidateDistance < closestDistance )
{
closestDistance = candidateDistance;