[flann] Fix pop_t is not defined under non-gunc platform. #32468
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
jimwang118
added
category:port-bug
|
No, the correct fix is to remove its usage: |
OK, I'll fix it. |
Adela0814
previously approved these changes
Jul 11, 2023
BillyONeal
requested changes
Jul 11, 2023
ports/flann/portfile.cmake
Outdated
| @@ -9,6 +9,7 @@ vcpkg_from_github( | |||
| PATCHES | |||
| fix-build-error.patch | |||
| fix-dependency-hdf5.patch | |||
| fix_undefined_pot_t.patch #https://github.com/flann-lib/flann/pull/405 | |||
There was a problem hiding this comment.
The changes in this patch are not the changes in that PR.
| HammingLUT lut; | ||
| result = lut(reinterpret_cast<const unsigned char*> (a), | ||
| - reinterpret_cast<const unsigned char*> (b), size * sizeof(pop_t)); | ||
| + reinterpret_cast<const unsigned char*> (b), size); |
There was a problem hiding this comment.
This seems broken as the linked PR suggests that pop_t should be either unsigned long or unsigned long long, which means size will be too small with this change.
There was a problem hiding this comment.
There was a problem hiding this comment.
I see, so the patch is correct because the original code was bogus, and the comment is wrong.
BillyONeal
removed
the
info:reviewed
BillyONeal
approved these changes
Jul 11, 2023
|
Thanks! |
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.
Fixes #32448
Add fix_undefined_pop_t.patch.（https://github.com/opencv/opencv/pull/13270）
Usage test pass with following triplets:
SHA512s are updated for each updated downloadThe "supports" clause reflects platforms that may be fixed by this new versionAny fixed CI baseline entries are removed from that file.Any patches that are no longer applied are deleted from the port's directory../vcpkg x-add-version --alland committing the result.