diff --git a/Code/Mantid/Vates/ParaviewPlugins/ParaViewReaders/MDHWNexusReader/vtkMDHWNexusReader.cxx b/Code/Mantid/Vates/ParaviewPlugins/ParaViewReaders/MDHWNexusReader/vtkMDHWNexusReader.cxx index ce0957bdee75685160d0bae3d56e1b11058e630a..d5fc3f1ecd90bf8286eb31eb5521fdab56cbfff8 100644 --- a/Code/Mantid/Vates/ParaviewPlugins/ParaViewReaders/MDHWNexusReader/vtkMDHWNexusReader.cxx +++ b/Code/Mantid/Vates/ParaviewPlugins/ParaViewReaders/MDHWNexusReader/vtkMDHWNexusReader.cxx @@ -181,7 +181,9 @@ int vtkMDHWNexusReader::RequestInformation( m_presenter->executeLoadMetadata(); setTimeRange(outputVector); std::vector<int> extents = dynamic_cast<MDHWNexusLoadingPresenter*>(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/ParaviewPlugins/ParaViewSources/MDHWSource/vtkMDHWSource.cxx b/Code/Mantid/Vates/ParaviewPlugins/ParaViewSources/MDHWSource/vtkMDHWSource.cxx index f9461a4f35471e537414923c40243e5e20901620..ca9d0fb7dbe5feba4a935959f1c1dd78b5f688f2 100644 --- a/Code/Mantid/Vates/ParaviewPlugins/ParaViewSources/MDHWSource/vtkMDHWSource.cxx +++ b/Code/Mantid/Vates/ParaviewPlugins/ParaViewSources/MDHWSource/vtkMDHWSource.cxx @@ -240,8 +240,10 @@ 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/MDHWNexusLoadingPresenter.cpp b/Code/Mantid/Vates/VatesAPI/src/MDHWNexusLoadingPresenter.cpp index 3184d098c42ca2a6005f36e3ac763ac06fa7041d..76096de74155c844b3ea43537eb8b20b1852d84a 100644 --- a/Code/Mantid/Vates/VatesAPI/src/MDHWNexusLoadingPresenter.cpp +++ b/Code/Mantid/Vates/VatesAPI/src/MDHWNexusLoadingPresenter.cpp @@ -137,9 +137,9 @@ std::vector<int> MDHWNexusLoadingPresenter::getExtents() if(m_histoWs) { - extents[1] = m_histoWs->getXDimension()->getNBins(); - extents[3] = m_histoWs->getYDimension()->getNBins(); - extents[5] = m_histoWs->getZDimension()->getNBins(); + extents[1] = static_cast<int>(m_histoWs->getXDimension()->getNBins()); + extents[3] = static_cast<int>(m_histoWs->getYDimension()->getNBins()); + extents[5] = static_cast<int>(m_histoWs->getZDimension()->getNBins()); } return extents; diff --git a/Code/Mantid/Vates/VatesAPI/src/Normalization.cpp b/Code/Mantid/Vates/VatesAPI/src/Normalization.cpp index f0efbb82f01a906af9a95f5085fae3d64480c8b2..8729b3a66d4fae2815ef1ea3c41cb87df6eb2c13 100644 --- a/Code/Mantid/Vates/VatesAPI/src/Normalization.cpp +++ b/Code/Mantid/Vates/VatesAPI/src/Normalization.cpp @@ -46,9 +46,9 @@ Create iterators with correct normalization normalization to an IMDIterator. @param ws : workspace to fetch defaults from if needed @return new IMDIterator */ -Mantid::API::IMDIterator * createIteratorWithNormalization( - const VisualNormalization normalizationOption, - Mantid::API::IMDWorkspace const * const ws) { +DLLExport Mantid::API::IMDIterator * +createIteratorWithNormalization(const VisualNormalization normalizationOption, + Mantid::API::IMDWorkspace const *const ws) { using namespace Mantid::API;