From 1ee6098369c2582a4b1f767cd2b099f5fb449f36 Mon Sep 17 00:00:00 2001
From: rinkk <karsten.rink@ufz.de>
Date: Tue, 20 Aug 2019 17:02:22 +0200
Subject: [PATCH] adjusting signature of raster ctor
---
Applications/Utils/MeshGeoTools/createIntermediateRasters.cpp | 3 +--
GeoLib/Raster.h | 2 +-
2 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/Applications/Utils/MeshGeoTools/createIntermediateRasters.cpp b/Applications/Utils/MeshGeoTools/createIntermediateRasters.cpp
index 1945f6572a8..8beb20447a1 100644
--- a/Applications/Utils/MeshGeoTools/createIntermediateRasters.cpp
+++ b/Applications/Utils/MeshGeoTools/createIntermediateRasters.cpp
@@ -132,8 +132,7 @@ int main(int argc, char* argv[])
std::string const basename = BaseLib::dropFileExtension(filename);
std::string const ext = BaseLib::getFileExtension(filename);
- GeoLib::RasterHeader h (h1);
- GeoLib::Raster r(std::move(h), raster[i].begin(), raster[i].end());
+ GeoLib::Raster r(h1, raster[i].begin(), raster[i].end());
FileIO::AsciiRasterInterface::writeRasterAsASC(r, basename + std::to_string(i) + "." + ext);
INFO("Layer %d written.", i+1);
}
diff --git a/GeoLib/Raster.h b/GeoLib/Raster.h
index ce1c8d28b12..5a2cbe91151 100644
--- a/GeoLib/Raster.h
+++ b/GeoLib/Raster.h
@@ -54,7 +54,7 @@ public:
* @param end input iterator pointing to the last element of the data, end have to be reachable from begin
*/
template <typename InputIterator>
- Raster(RasterHeader&& header, InputIterator begin, InputIterator end)
+ Raster(RasterHeader header, InputIterator begin, InputIterator end)
: _header(std::move(header)),
_raster_data(new double[_header.n_cols * _header.n_rows])
{
--
GitLab