mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-11-27 19:59:06 +08:00
[flann] Fix pop_t is not defined under non-gunc platform. (#32468)
This commit is contained in:
parent
5ac89392d7
commit
5d94ad783a
13
ports/flann/fix_undefined_pot_t.patch
Normal file
13
ports/flann/fix_undefined_pot_t.patch
Normal file
@ -0,0 +1,13 @@
|
||||
diff --git a/src/cpp/flann/algorithms/dist.h b/src/cpp/flann/algorithms/dist.h
|
||||
index 4e6eb73..bbcdda1 100644
|
||||
--- a/src/cpp/flann/algorithms/dist.h
|
||||
+++ b/src/cpp/flann/algorithms/dist.h
|
||||
@@ -519,7 +519,7 @@ struct HammingPopcnt
|
||||
#else
|
||||
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);
|
||||
#endif
|
||||
return result;
|
||||
}
|
@ -9,6 +9,7 @@ vcpkg_from_github(
|
||||
PATCHES
|
||||
fix-build-error.patch
|
||||
fix-dependency-hdf5.patch
|
||||
fix_undefined_pot_t.patch # https://github.com/opencv/opencv/pull/13270/
|
||||
)
|
||||
|
||||
vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS
|
||||
@ -37,6 +38,6 @@ vcpkg_cmake_config_fixup(CONFIG_PATH lib/cmake/${PORT})
|
||||
file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/debug/include)
|
||||
|
||||
# Handle copyright
|
||||
file(INSTALL ${SOURCE_PATH}/COPYING DESTINATION ${CURRENT_PACKAGES_DIR}/share/flann RENAME copyright)
|
||||
vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/COPYING")
|
||||
|
||||
vcpkg_fixup_pkgconfig()
|
||||
|
@ -1,7 +1,7 @@
|
||||
{
|
||||
"name": "flann",
|
||||
"version-date": "2019-04-07",
|
||||
"port-version": 6,
|
||||
"port-version": 7,
|
||||
"description": "Fast Library for Approximate Nearest Neighbors",
|
||||
"homepage": "https://github.com/mariusmuja/flann",
|
||||
"license": "BSD-3-Clause",
|
||||
|
@ -2518,7 +2518,7 @@
|
||||
},
|
||||
"flann": {
|
||||
"baseline": "2019-04-07",
|
||||
"port-version": 6
|
||||
"port-version": 7
|
||||
},
|
||||
"flash-runtime-extensions": {
|
||||
"baseline": "2.4",
|
||||
|
@ -1,5 +1,10 @@
|
||||
{
|
||||
"versions": [
|
||||
{
|
||||
"git-tree": "827bba7345ec924adeee28bacb5b0a79f705920d",
|
||||
"version-date": "2019-04-07",
|
||||
"port-version": 7
|
||||
},
|
||||
{
|
||||
"git-tree": "300415ad416640a5b4a4f0895a3250b306726181",
|
||||
"version-date": "2019-04-07",
|
||||
|
Loading…
Reference in New Issue
Block a user