SFCGAL: Use WKB instead of WKT #11006
Draft
+150
−5
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
Oct 14, 2024
Comment on lines
+7908
to
+7909
| #if SFCGAL_VERSION_MAJOR >= 1 && SFCGAL_VERSION_MINOR >= 5 && \ | ||
| SFCGAL_VERSION_PATCH >= 2 |
There was a problem hiding this comment.
That will break for 1.6.0 or 2.0.0
So more something like:
Suggested change
| #if SFCGAL_VERSION_MAJOR >= 1 && SFCGAL_VERSION_MINOR >= 5 && \ | |
| SFCGAL_VERSION_PATCH >= 2 | |
| #if SFCGAL_VERSION_MAJOR * 10000 + SFCGAL_VERSION_MINOR * 100 + SFCGAL_VERSION_PATCH >= 1 * 10000 + 5 * 100 + 2 |
(would be better to hav a SFCGAL_MAKE_VERSION(major, minor, path) macro that does that math :-)
Same below
Comment on lines
+7918
to
+7936
| size_t nSize = poLS->WkbSize(); | ||
| unsigned char *pabyWkb = static_cast<unsigned char *>(CPLMalloc(nSize)); | ||
|
|
||
| // Create export options and set byte order | ||
| OGRwkbExportOptions oOptions; | ||
| oOptions.eByteOrder = wkbNDR; | ||
|
|
||
| if (poLS->exportToWkb(pabyWkb, &oOptions) == OGRERR_NONE) | ||
| { | ||
| sfcgal_geometry_t *_geometry = sfcgal_io_read_wkb( | ||
| reinterpret_cast<const char *>(pabyWkb), nSize); | ||
| CPLFree(pabyWkb); | ||
| return _geometry; | ||
| } | ||
| else | ||
| { | ||
| CPLFree(pabyWkb); | ||
| return nullptr; | ||
| } |
There was a problem hiding this comment.
can we have a lambda or a static method that does this job of exporting to Wkb and calling sfcgal_io_read_wkb(), that can be used by this case, and the 3 below ones?
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.
What does this PR do?
This PR adds support for WKB (Well-Known Binary) instead of WKT (Well-Known Text) for SFCGAL versions greater than or equal to 1.5.2.
It is noted that SFCGAL introduced support for WKB in version 1.5.1, but full binary support is available starting from version 1.5.2. Therefore, this update ensures that WKB is utilized for SFCGAL versions 1.5.2 and above.
Additionally, the PR includes a check for the SFCGAL version using a configure_file to generate the ogr_sfcgal.h file, and modifications are made to the CMakeLists.txt to handle this versioning logic properly.
This PR is currently opened as a draft because I still need to verify some parts of the GDAL code to ensure everything is properly implemented and handled as expected.
What are related issues/pull requests?
Tasklist
Environment
Provide environment details, if relevant: