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

caf::Viewer: Fixed linux warnings and a bogus comparison

Browse Source
This commit is contained in:
Jacob Støren 2019-10-31 14:58:11 +01:00
parent 1ef4d49f14
commit 720c83d2e3
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Fwk/AppFwk/cafViewer/cafViewer.cpp
View File

@ -551,7 +551,7 @@ bool caf::Viewer::calculateNearFarPlanes(const cvf::Rendering* rendering,
} }
// Guard against the zero nearplane possibility // Guard against the zero nearplane possibility
if ( nearPlaneDist <= 0 ) (*nearPlaneDist) = m_defaultPerspectiveNearPlaneDistance; if ( (*nearPlaneDist) <= 0 ) (*nearPlaneDist) = m_defaultPerspectiveNearPlaneDistance;
} }
else // Orthographic projection. Set to encapsulate the complete boundingbox, possibly setting a negative nearplane else // Orthographic projection. Set to encapsulate the complete boundingbox, possibly setting a negative nearplane
{ {
@ -986,7 +986,7 @@ void caf::Viewer::setCurrentComparisonFrame(int frameIndex)
{ {
if (m_frameScenes.size() == 0) return; if (m_frameScenes.size() == 0) return;
int clampedFrameIndex = clampFrameIndex(frameIndex); unsigned clampedFrameIndex = static_cast<unsigned>(clampFrameIndex(frameIndex));
if (m_releaseOGLResourcesEachFrame) if (m_releaseOGLResourcesEachFrame)
{ {
@ -1020,9 +1020,7 @@ void caf::Viewer::slotSetCurrentFrame(int frameIndex)
{ {
if (m_frameScenes.size() == 0) return; if (m_frameScenes.size() == 0) return;
int clampedFrameIndex = clampFrameIndex(frameIndex); unsigned clampedFrameIndex = static_cast<unsigned>(clampFrameIndex(frameIndex));
//if (m_frameScenes.at(clampedFrameIndex) == nullptr) return;
if (m_releaseOGLResourcesEachFrame) if (m_releaseOGLResourcesEachFrame)
{ {