diff --git a/GeoLib/GEOObjects.cpp b/GeoLib/GEOObjects.cpp index 6964d6891c1c0189ca70f0fbfbb4996380ff86a7..ad16d68e75dbe9a67021f72b8872c089ee32ef5c 100644 --- a/GeoLib/GEOObjects.cpp +++ b/GeoLib/GEOObjects.cpp @@ -385,10 +385,7 @@ int GEOObjects::mergeGeometries(std::vector<std::string> const& geo_names, std::vector<std::size_t> pnt_offsets(n_geo_names, 0); - if (!mergePoints(geo_names, merged_geo_name, pnt_offsets)) - { - return 1; - } + mergePoints(geo_names, merged_geo_name, pnt_offsets); mergePolylines(geo_names, merged_geo_name, pnt_offsets); @@ -397,7 +394,7 @@ int GEOObjects::mergeGeometries(std::vector<std::string> const& geo_names, return 0; } -bool GEOObjects::mergePoints(std::vector<std::string> const& geo_names, +void GEOObjects::mergePoints(std::vector<std::string> const& geo_names, std::string& merged_geo_name, std::vector<std::size_t>& pnt_offsets) { @@ -442,7 +439,6 @@ bool GEOObjects::mergePoints(std::vector<std::string> const& geo_names, addPointVec(std::move(merged_points), merged_geo_name, std::move(merged_pnt_names), 1e-6); - return true; } void GEOObjects::mergePolylines(std::vector<std::string> const& geo_names, diff --git a/GeoLib/GEOObjects.h b/GeoLib/GEOObjects.h index 39eb3ea762a387a86e6c1b80853d345fca9c45b8..a132ef8206291abefbb1a0dcf3126fce49675501 100644 --- a/GeoLib/GEOObjects.h +++ b/GeoLib/GEOObjects.h @@ -323,9 +323,8 @@ private: * @param merged_geo_name The (new) name of the geometry resulting from * merging. * @param pnt_offsets offsets in the merged vector storing the points - * @return true, if merging the points succeeded, else false */ - bool mergePoints(std::vector<std::string> const& geo_names, + void mergePoints(std::vector<std::string> const& geo_names, std::string& merged_geo_name, std::vector<std::size_t>& pnt_offsets);