From f097d6addd04227fafb233ce591e689e8092a7d2 Mon Sep 17 00:00:00 2001
From: Thomas Fischer <thomas.fischer@ufz.de>
Date: Tue, 5 May 2015 10:34:45 +0200
Subject: [PATCH] [GL] Using much faster getItemNameByID().
---
GeoLib/GEOObjects.cpp | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/GeoLib/GEOObjects.cpp b/GeoLib/GEOObjects.cpp
index dfc2b96aaaf..afa1ac054d0 100644
--- a/GeoLib/GEOObjects.cpp
+++ b/GeoLib/GEOObjects.cpp
@@ -418,13 +418,13 @@ bool GEOObjects::mergePoints(std::vector<std::string> const & geo_names,
continue;
}
- std::string tmp_name;
std::size_t const n_pnts(pnts->size());
for (std::size_t k(0); k < n_pnts; ++k) {
merged_points->push_back(new GeoLib::Point(*(*pnts)[k]));
- if (pnt_vec->getNameOfElementByID(k, tmp_name)) {
+ std::string const& item_name(pnt_vec->getItemNameByID(k));
+ if (! item_name.empty()) {
merged_pnt_names->insert(
- std::make_pair(tmp_name, pnt_offsets[j] + k));
+ std::make_pair(item_name, pnt_offsets[j] + k));
}
}
if (n_geo_names - 1 > j) {
--
GitLab