Use Polygon constructor that avoids internal delete #359
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
rouault
reviewed
Dec 19, 2020
capi/geos_ts_c.cpp
Outdated
| LinearRing* nshell = dynamic_cast<LinearRing*>(shell); | ||
| if(! nshell) { | ||
| handle->ERROR_MESSAGE("Shell is not a LinearRing"); | ||
| return NULL; | ||
| } | ||
| const GeometryFactory* gf = handle->geomFactory; | ||
|
|
||
| return gf->createPolygon(nshell, vholes.release()); | ||
| /* Create unique_ptr version for constructor */ | ||
| std::vector<std::unique_ptr<LinearRing>> vholes(nholes); |
There was a problem hiding this comment.
Unless I'm wrong the current code will have vholes with nholes first elements at nullptr, followed by the content of tmpholes.
You'd probably want to do instead
Suggested change
| std::vector<std::unique_ptr<LinearRing>> vholes(nholes); | |
| std::vector<std::unique_ptr<LinearRing>> vholes; | |
| vholes.reserve(nholes); |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The constructor that purely uses unique_ptr inputs seems to both avoid bulk copy and also the internal delete of the vector containing the rings. Failing that, a whole extra Polygon constructor will be needed.