Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
O
ogs
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Özgür Ozan Sen
ogs
Commits
9e97f69b
Commit
9e97f69b
authored
1 year ago
by
Dmitri Naumov
Browse files
Options
Downloads
Patches
Plain Diff
[GL] mergePoints never returns anything but 'true'
Removing the return value.
parent
56832d02
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
GeoLib/GEOObjects.cpp
+2
-6
2 additions, 6 deletions
GeoLib/GEOObjects.cpp
GeoLib/GEOObjects.h
+1
-2
1 addition, 2 deletions
GeoLib/GEOObjects.h
with
3 additions
and
8 deletions
GeoLib/GEOObjects.cpp
+
2
−
6
View file @
9e97f69b
...
@@ -385,10 +385,7 @@ int GEOObjects::mergeGeometries(std::vector<std::string> const& geo_names,
...
@@ -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
);
std
::
vector
<
std
::
size_t
>
pnt_offsets
(
n_geo_names
,
0
);
if
(
!
mergePoints
(
geo_names
,
merged_geo_name
,
pnt_offsets
))
mergePoints
(
geo_names
,
merged_geo_name
,
pnt_offsets
);
{
return
1
;
}
mergePolylines
(
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,
...
@@ -397,7 +394,7 @@ int GEOObjects::mergeGeometries(std::vector<std::string> const& geo_names,
return
0
;
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
::
string
&
merged_geo_name
,
std
::
vector
<
std
::
size_t
>&
pnt_offsets
)
std
::
vector
<
std
::
size_t
>&
pnt_offsets
)
{
{
...
@@ -442,7 +439,6 @@ bool GEOObjects::mergePoints(std::vector<std::string> const& geo_names,
...
@@ -442,7 +439,6 @@ bool GEOObjects::mergePoints(std::vector<std::string> const& geo_names,
addPointVec
(
std
::
move
(
merged_points
),
merged_geo_name
,
addPointVec
(
std
::
move
(
merged_points
),
merged_geo_name
,
std
::
move
(
merged_pnt_names
),
1e-6
);
std
::
move
(
merged_pnt_names
),
1e-6
);
return
true
;
}
}
void
GEOObjects
::
mergePolylines
(
std
::
vector
<
std
::
string
>
const
&
geo_names
,
void
GEOObjects
::
mergePolylines
(
std
::
vector
<
std
::
string
>
const
&
geo_names
,
...
...
This diff is collapsed.
Click to expand it.
GeoLib/GEOObjects.h
+
1
−
2
View file @
9e97f69b
...
@@ -323,9 +323,8 @@ private:
...
@@ -323,9 +323,8 @@ private:
* @param merged_geo_name The (new) name of the geometry resulting from
* @param merged_geo_name The (new) name of the geometry resulting from
* merging.
* merging.
* @param pnt_offsets offsets in the merged vector storing the points
* @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
::
string
&
merged_geo_name
,
std
::
vector
<
std
::
size_t
>&
pnt_offsets
);
std
::
vector
<
std
::
size_t
>&
pnt_offsets
);
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment