Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[octomap] update to 1.10.0 #37706

Merged
merged 5 commits into from
Apr 2, 2024
Merged

[octomap] update to 1.10.0 #37706

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
a8b9912
[octomap] update to 1.10.0
jiayuehua Mar 26, 2024
4a40805
[octomap] update to 1.10.0
jiayuehua Mar 26, 2024
ea42a80
bde tmp
jiayuehua Mar 26, 2024
0b7d73f
update fix-isnan
jiayuehua Apr 1, 2024
8399d9a
bde tmp
jiayuehua Apr 1, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 0 additions & 22 deletions ports/octomap/fix-compilation.patch
View file
Open in desktop

This file was deleted.

25 changes: 25 additions & 0 deletions ports/octomap/fix-isnan.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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);
}
6 changes: 3 additions & 3 deletions ports/octomap/portfile.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down
3 changes: 1 addition & 2 deletions ports/octomap/vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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",
Expand Down
4 changes: 2 additions & 2 deletions versions/baseline.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6281,8 +6281,8 @@
"port-version": 0
},
"octomap": {
"baseline": "1.9.8",
"port-version": 1
"baseline": "1.10.0",
"port-version": 0
},
"ode": {
"baseline": "0.16.4",
Expand Down
5 changes: 5 additions & 0 deletions versions/o-/octomap.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "ff492e256718daa9fb2245c135959d6a812f938d",
"version": "1.10.0",
"port-version": 0
},
{
"git-tree": "18c703e99a9e7da9184b9ebcee3ddfa80d66502e",
"version": "1.9.8",
Expand Down