mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-11-27 20:09:00 +08:00
[octomap] update to 1.10.0 (#37706)
This commit is contained in:
parent
ba5364d24e
commit
1daec834f2
@ -1,22 +0,0 @@
|
||||
diff --git a/octomap/include/octomap/ScanGraph.h b/octomap/include/octomap/ScanGraph.h
|
||||
index 07c7436..e54eaf5 100644
|
||||
--- a/octomap/include/octomap/ScanGraph.h
|
||||
+++ b/octomap/include/octomap/ScanGraph.h
|
||||
@@ -60,7 +60,7 @@ namespace octomap {
|
||||
|
||||
~ScanNode();
|
||||
|
||||
- bool operator == (const ScanNode& other) {
|
||||
+ bool operator == (const ScanNode& other) const {
|
||||
return (id == other.id);
|
||||
}
|
||||
|
||||
@@ -87,7 +87,7 @@ namespace octomap {
|
||||
: first(_first), second(_second), constraint(_constraint), weight(1.0) { }
|
||||
ScanEdge() {}
|
||||
|
||||
- bool operator == (const ScanEdge& other) {
|
||||
+ bool operator == (const ScanEdge& other) const {
|
||||
return ( (*first == *(other.first) ) && ( *second == *(other.second) ) );
|
||||
}
|
||||
|
25
ports/octomap/fix-isnan.patch
Normal file
25
ports/octomap/fix-isnan.patch
Normal file
@ -0,0 +1,25 @@
|
||||
diff --git a/octomap/src/compare_octrees.cpp b/octomap/src/compare_octrees.cpp
|
||||
index c02ceea8..e6890f59 100644
|
||||
--- a/octomap/src/compare_octrees.cpp
|
||||
+++ b/octomap/src/compare_octrees.cpp
|
||||
@@ -39,7 +39,7 @@
|
||||
#include <list>
|
||||
#include <cmath>
|
||||
|
||||
-#ifdef _MSC_VER // fix missing isnan for VC++
|
||||
+#if defined(_MSC_VER) && !((defined(_MSVC_LANG) && _MSVC_LANG >= 201103L) || __cplusplus >= 201103L)
|
||||
#define isnan(x) _isnan(x)
|
||||
#endif
|
||||
|
||||
@@ -132,11 +132,7 @@ int main(int argc, char** argv) {
|
||||
else
|
||||
kld +=log(p1/p2)*p1 + log((1-p1)/(1-p2))*(1-p1);
|
||||
|
||||
-#if ((defined(_MSVC_LANG) && _MSVC_LANG >= 201103L) || __cplusplus >= 201103L)
|
||||
- if (std::isnan(kld)){
|
||||
-#else
|
||||
if (isnan(kld)){
|
||||
-#endif
|
||||
OCTOMAP_ERROR("KLD is nan! KLD(%f,%f)=%f; sum = %f", p1, p2, kld, kld_sum);
|
||||
exit(-1);
|
||||
}
|
@ -4,11 +4,11 @@ vcpkg_from_github(
|
||||
OUT_SOURCE_PATH SOURCE_PATH
|
||||
REPO OctoMap/octomap
|
||||
REF "v${VERSION}"
|
||||
SHA512 60afeecc36a190f136dcbe33cb9cd6c06c16233988b383b0b010f65f81e6a3630b55902c5b5ad756ac35dee4c4ec26ec5722d6bd9b8e079f70b7d286293c518e
|
||||
HEAD_REF master
|
||||
SHA512 1cbee4f6b3569587986774447ad9ec4190f597310c4d6865ffa7cd8865ece2492e4a42fa369b633d9d7a9da782560d49deaa62a18601ea4f56396bdf1a6a5f52
|
||||
HEAD_REF devel
|
||||
PATCHES
|
||||
001-fix-exported-targets.patch
|
||||
fix-compilation.patch
|
||||
fix-isnan.patch # Remove this patch in the next update
|
||||
)
|
||||
|
||||
vcpkg_cmake_configure(
|
||||
|
@ -1,7 +1,6 @@
|
||||
{
|
||||
"name": "octomap",
|
||||
"version": "1.9.8",
|
||||
"port-version": 1,
|
||||
"version": "1.10.0",
|
||||
"description": "An Efficient Probabilistic 3D Mapping Framework Based on Octrees",
|
||||
"homepage": "https://octomap.github.io/",
|
||||
"license": "BSD-3-Clause",
|
||||
|
@ -6293,8 +6293,8 @@
|
||||
"port-version": 0
|
||||
},
|
||||
"octomap": {
|
||||
"baseline": "1.9.8",
|
||||
"port-version": 1
|
||||
"baseline": "1.10.0",
|
||||
"port-version": 0
|
||||
},
|
||||
"ode": {
|
||||
"baseline": "0.16.4",
|
||||
|
@ -1,5 +1,10 @@
|
||||
{
|
||||
"versions": [
|
||||
{
|
||||
"git-tree": "ff492e256718daa9fb2245c135959d6a812f938d",
|
||||
"version": "1.10.0",
|
||||
"port-version": 0
|
||||
},
|
||||
{
|
||||
"git-tree": "18c703e99a9e7da9184b9ebcee3ddfa80d66502e",
|
||||
"version": "1.9.8",
|
||||
|
Loading…
Reference in New Issue
Block a user