From 2c472816f98c157f2ae344a2869abc576295f8d5 Mon Sep 17 00:00:00 2001
From: Karsten Rink <karsten.rink@ufz.de>
Date: Fri, 14 Mar 2014 11:41:38 +0100
Subject: [PATCH] fixed two gcc warnings in GUI
---
Gui/DataView/ElementTreeModel.cpp | 2 +-
Gui/VtkVis/VtkRaster.cpp | 3 ++-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/Gui/DataView/ElementTreeModel.cpp b/Gui/DataView/ElementTreeModel.cpp
index e5c3d1ecf72..d5e084774a5 100644
--- a/Gui/DataView/ElementTreeModel.cpp
+++ b/Gui/DataView/ElementTreeModel.cpp
@@ -121,7 +121,7 @@ void ElementTreeModel::setMesh(MeshLib::Mesh const*const mesh)
TreeItem* elements_item = new TreeItem(elements_number, _rootItem);
_rootItem->appendChild(elements_item);
- const std::array<QString, 7> n_element_names = { "Lines:", "Triangles:", "Quads:", "Tetrahedra:", "Hexahedra:", "Pyramids:", "Prisms:" };
+ const std::array<QString, 7> n_element_names = {{ "Lines:", "Triangles:", "Quads:", "Tetrahedra:", "Hexahedra:", "Pyramids:", "Prisms:" }};
const std::array<unsigned, 7>& n_element_types (MeshInformation::getNumberOfElementTypes(*mesh));
for (std::size_t i=0; i<n_element_types.size(); ++i)
{
diff --git a/Gui/VtkVis/VtkRaster.cpp b/Gui/VtkVis/VtkRaster.cpp
index b40f763546e..b31902955fd 100644
--- a/Gui/VtkVis/VtkRaster.cpp
+++ b/Gui/VtkVis/VtkRaster.cpp
@@ -62,9 +62,10 @@ vtkImageAlgorithm* VtkRaster::loadImage(const std::string &fileName,
if (raster) {
x0 = raster->getOrigin()[0];
y0 = raster->getOrigin()[1];
+ delta = raster->getRasterPixelDistance();
double const*const data (raster->begin());
return VtkRaster::loadImageFromArray(data, x0, y0,
- raster->getNCols(), raster->getNRows(), raster->getRasterPixelDistance(),
+ raster->getNCols(), raster->getNRows(), delta,
raster->getNoDataValue());
}
else if ((fileInfo.suffix().toLower() == "tif") || (fileInfo.suffix().toLower() == "tiff"))
--
GitLab