From 3ca062c2ff264b56e74966a7d3026441fb79e437 Mon Sep 17 00:00:00 2001
From: rinkk <karsten.rink@ufz.de>
Date: Thu, 9 Mar 2017 15:25:19 +0100
Subject: [PATCH] fixed issue with loading tin-files with hash in path
---
GeoLib/IO/Legacy/OGSIOVer4.cpp | 7 +++----
1 file changed, 3 insertions(+), 4 deletions(-)
diff --git a/GeoLib/IO/Legacy/OGSIOVer4.cpp b/GeoLib/IO/Legacy/OGSIOVer4.cpp
index 4b9b966cb03..eb483416930 100644
--- a/GeoLib/IO/Legacy/OGSIOVer4.cpp
+++ b/GeoLib/IO/Legacy/OGSIOVer4.cpp
@@ -310,8 +310,8 @@ std::string readSurface(std::istream &in,
if (line.find("$TIN") != std::string::npos) // subkeyword found
{
in >> line; // read value (file name)
- line = path + line;
- sfc = GeoLib::IO::TINInterface::readTIN(line, pnt_vec, &errors);
+ std::string const file_name (path + line);
+ sfc = GeoLib::IO::TINInterface::readTIN(file_name, pnt_vec, &errors);
}
//....................................................................
if (line.find("$MAT_GROUP") != std::string::npos) // subkeyword found
@@ -325,8 +325,7 @@ std::string readSurface(std::istream &in,
&& (line.find('$') == std::string::npos))
{
// we did read the name of a polyline -> search the id for polyline
- std::map<std::string,std::size_t>::const_iterator it (ply_vec_names.find (
- line));
+ std::map<std::string,std::size_t>::const_iterator it (ply_vec_names.find (line));
if (it != ply_vec_names.end())
ply_id = it->second;
else
--
GitLab