Linux compile warning fixes

p4#: 21189
This commit is contained in:
CeetronResInsight
2013-04-09 07:59:41 +02:00
parent 812aee9be4
commit 1cfd103f30
3 changed files with 3 additions and 3 deletions
@@ -99,7 +99,7 @@ void RifEclipseRestartFilesetAccess::close()
//-------------------------------------------------------------------------------------------------- //--------------------------------------------------------------------------------------------------
void RifEclipseRestartFilesetAccess::setTimeSteps(const std::vector<QDateTime>& timeSteps) void RifEclipseRestartFilesetAccess::setTimeSteps(const std::vector<QDateTime>& timeSteps)
{ {
CVF_ASSERT(m_fileNames.size() == timeSteps.size()); CVF_ASSERT((size_t)m_fileNames.size() == timeSteps.size());
m_timeSteps = timeSteps; m_timeSteps = timeSteps;
} }
@@ -102,7 +102,7 @@ std::vector<double> RigStatisticsMath::calculateNearestRankPercentiles(const std
{ {
double pVal = HUGE_VAL; double pVal = HUGE_VAL;
size_t pValIndex = static_cast<size_t>(sortedValues.size() * abs(pValPositions[i]) / 100); size_t pValIndex = static_cast<size_t>(sortedValues.size() * fabs(pValPositions[i]) / 100);
if (pValIndex >= sortedValues.size() ) pValIndex = sortedValues.size() - 1; if (pValIndex >= sortedValues.size() ) pValIndex = sortedValues.size() - 1;
+1 -1
View File
@@ -436,7 +436,7 @@ void caf::Viewer::paintEvent(QPaintEvent* event)
// Convert the QImage into the cvf::TextureImage, // Convert the QImage into the cvf::TextureImage,
// handling vertical mirroring and (possible) byteswapping // handling vertical mirroring and (possible) byteswapping
if (m_overlayTextureImage->height() != this->height() || m_overlayTextureImage->width() != this->width()) if (((int)m_overlayTextureImage->height()) != this->height() || ((int)m_overlayTextureImage->width() != this->width()))
{ {
m_overlayTextureImage->allocate(this->width(), this->height()); m_overlayTextureImage->allocate(this->width(), this->height());
} }