From a107fbb3865eedf9d57e08a15ef72e49e355c878 Mon Sep 17 00:00:00 2001
From: rinkk <karsten.rink@ufz.de>
Date: Mon, 1 Feb 2016 14:08:55 +0100
Subject: [PATCH] changed calls for tests
---
Tests/MeshLib/TestMeshValidation.cpp | 4 +++-
Tests/MeshLib/TestNodeSearch.cpp | 4 +++-
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/Tests/MeshLib/TestMeshValidation.cpp b/Tests/MeshLib/TestMeshValidation.cpp
index df487cb3639..f89308a6204 100644
--- a/Tests/MeshLib/TestMeshValidation.cpp
+++ b/Tests/MeshLib/TestMeshValidation.cpp
@@ -44,7 +44,9 @@ detectHoles(MeshLib::Mesh const& mesh,
TEST(MeshValidation, DetectHolesTri)
{
std::array<double, 12> pix = {{0,0.1,0.2,0.1,0,0,0.1,0,0,0,-0.1,0}};
- GeoLib::Raster raster(4,3,0,0,1,pix.begin(), pix.end());
+ GeoLib::RasterHeader const header =
+ {4,3,MathLib::Point3d(std::array<double,3>{{0,0,0}}),1,-9999};
+ GeoLib::Raster const raster(header ,pix.begin(), pix.end());
MeshLib::ConvertRasterToMesh conv(raster, MeshLib::MeshElemType::TRIANGLE, MeshLib::UseIntensityAs::ELEVATION);
auto mesh = std::unique_ptr<MeshLib::Mesh>{conv.execute()};
ASSERT_EQ(0, MeshLib::MeshValidation::detectHoles(*mesh));
diff --git a/Tests/MeshLib/TestNodeSearch.cpp b/Tests/MeshLib/TestNodeSearch.cpp
index 5b0e4b1e3f4..0510c904831 100644
--- a/Tests/MeshLib/TestNodeSearch.cpp
+++ b/Tests/MeshLib/TestNodeSearch.cpp
@@ -22,7 +22,9 @@
TEST(NodeSearch, UnusedNodes)
{
std::array<double, 12> pix = {{0,0.1,0.2,0.1,0,0,0.1,0,0,0,-0.1,0}};
- GeoLib::Raster raster(4,3,0,0,1,pix.begin(), pix.end());
+ GeoLib::RasterHeader const header =
+ {4,3,MathLib::Point3d(std::array<double,3>{{0,0,0}}),1,-9999};
+ GeoLib::Raster const raster(header,pix.begin(), pix.end());
MeshLib::ConvertRasterToMesh conv(raster, MeshLib::MeshElemType::TRIANGLE, MeshLib::UseIntensityAs::ELEVATION);
MeshLib::Mesh* mesh = conv.execute();
MeshLib::NodeSearch ns(*mesh);
--
GitLab