From a278230abb24c87c99746c34a292685c0fc72f1c Mon Sep 17 00:00:00 2001
From: Andrei Savici <saviciat@ornl.gov>
Date: Thu, 9 Apr 2015 13:28:35 -0400
Subject: [PATCH] Fix conversion warnings. Refs #7363
---
.../ParaViewSources/MDHWSource/vtkMDHWSource.cxx | 2 +-
.../Vates/VatesAPI/src/MDHWInMemoryLoadingPresenter.cpp | 6 +++---
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/Code/Mantid/Vates/ParaviewPlugins/ParaViewSources/MDHWSource/vtkMDHWSource.cxx b/Code/Mantid/Vates/ParaviewPlugins/ParaViewSources/MDHWSource/vtkMDHWSource.cxx
index 16c46f31c7e..3208837d9e4 100644
--- a/Code/Mantid/Vates/ParaviewPlugins/ParaViewSources/MDHWSource/vtkMDHWSource.cxx
+++ b/Code/Mantid/Vates/ParaviewPlugins/ParaViewSources/MDHWSource/vtkMDHWSource.cxx
@@ -234,7 +234,7 @@ int vtkMDHWSource::RequestInformation(vtkInformation *vtkNotUsed(request), vtkIn
m_presenter->executeLoadMetadata();
setTimeRange(outputVector);
std::vector<int> extents = dynamic_cast<MDHWInMemoryLoadingPresenter*>(m_presenter)->getExtents();
- outputVector->GetInformationObject(0)->Set(vtkStreamingDemandDrivenPipeline::WHOLE_EXTENT(),&extents[0],extents.size());
+ outputVector->GetInformationObject(0)->Set(vtkStreamingDemandDrivenPipeline::WHOLE_EXTENT(),&extents[0],static_cast<int>(extents.size()));
return 1;
}
diff --git a/Code/Mantid/Vates/VatesAPI/src/MDHWInMemoryLoadingPresenter.cpp b/Code/Mantid/Vates/VatesAPI/src/MDHWInMemoryLoadingPresenter.cpp
index 38c96d935cb..ea2ea5396a3 100644
--- a/Code/Mantid/Vates/VatesAPI/src/MDHWInMemoryLoadingPresenter.cpp
+++ b/Code/Mantid/Vates/VatesAPI/src/MDHWInMemoryLoadingPresenter.cpp
@@ -158,9 +158,9 @@ namespace Mantid
Workspace_sptr ws = m_repository->fetchWorkspace(m_wsName);
IMDHistoWorkspace_sptr histoWs = boost::dynamic_pointer_cast<Mantid::API::IMDHistoWorkspace>(ws);
std::vector<int> extents(6, 0);
- extents[1] = histoWs->getDimension(0)->getNBins();
- extents[3] = histoWs->getDimension(1)->getNBins();
- extents[5] = histoWs->getDimension(2)->getNBins();
+ extents[1] = static_cast<int>(histoWs->getDimension(0)->getNBins());
+ extents[3] = static_cast<int>(histoWs->getDimension(1)->getNBins());
+ extents[5] = static_cast<int>(histoWs->getDimension(2)->getNBins());
return extents;
}
--
GitLab