From bd9e8d9fdaec7ced8ce03498f5a058ca8542f3ab Mon Sep 17 00:00:00 2001 From: Lucas Walter Date: Sat, 7 May 2022 13:16:33 -0700 Subject: [PATCH 1/4] eliminate ogre deprecation warnings including Ogre.h instead of OgreVector3.h --- fuse_viz/include/fuse_viz/conversions.h | 2 +- fuse_viz/include/fuse_viz/mapped_covariance_visual.h | 2 +- fuse_viz/include/fuse_viz/pose_2d_stamped_visual.h | 2 +- .../fuse_viz/relative_pose_2d_stamped_constraint_visual.h | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/fuse_viz/include/fuse_viz/conversions.h b/fuse_viz/include/fuse_viz/conversions.h index 8f8d16b41..b0bf87205 100644 --- a/fuse_viz/include/fuse_viz/conversions.h +++ b/fuse_viz/include/fuse_viz/conversions.h @@ -46,7 +46,7 @@ #include #include -#include +#include #include diff --git a/fuse_viz/include/fuse_viz/mapped_covariance_visual.h b/fuse_viz/include/fuse_viz/mapped_covariance_visual.h index d06df96f9..98c46df1d 100644 --- a/fuse_viz/include/fuse_viz/mapped_covariance_visual.h +++ b/fuse_viz/include/fuse_viz/mapped_covariance_visual.h @@ -41,7 +41,7 @@ #include #include -#include +#include namespace Ogre { diff --git a/fuse_viz/include/fuse_viz/pose_2d_stamped_visual.h b/fuse_viz/include/fuse_viz/pose_2d_stamped_visual.h index e3d4d6811..4bfa871b4 100644 --- a/fuse_viz/include/fuse_viz/pose_2d_stamped_visual.h +++ b/fuse_viz/include/fuse_viz/pose_2d_stamped_visual.h @@ -39,7 +39,7 @@ #include -#include +#include #include diff --git a/fuse_viz/include/fuse_viz/relative_pose_2d_stamped_constraint_visual.h b/fuse_viz/include/fuse_viz/relative_pose_2d_stamped_constraint_visual.h index 7c70d6662..2b81951bb 100644 --- a/fuse_viz/include/fuse_viz/relative_pose_2d_stamped_constraint_visual.h +++ b/fuse_viz/include/fuse_viz/relative_pose_2d_stamped_constraint_visual.h @@ -40,7 +40,7 @@ #include #include -#include +#include #include #include From ef8ff209b716adcacf2761d05967ebc308b6b845 Mon Sep 17 00:00:00 2001 From: Lucas Walter Date: Sat, 7 May 2022 13:16:33 -0700 Subject: [PATCH 2/4] eliminate some ogre deprecation warnings, make eigen and ogre warnings in fuse_viz not errors for now --- fuse_viz/CMakeLists.txt | 3 ++- fuse_viz/src/relative_pose_2d_stamped_constraint_visual.cpp | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/fuse_viz/CMakeLists.txt b/fuse_viz/CMakeLists.txt index bde535755..eff554221 100644 --- a/fuse_viz/CMakeLists.txt +++ b/fuse_viz/CMakeLists.txt @@ -33,7 +33,8 @@ add_definitions(-DQT_NO_KEYWORDS) ########### ## Build ## ########### -add_compile_options(-Wall -Werror) +# add_compile_options(-Wall -Werror) +add_compile_options(-Wall) catkin_package( INCLUDE_DIRS include diff --git a/fuse_viz/src/relative_pose_2d_stamped_constraint_visual.cpp b/fuse_viz/src/relative_pose_2d_stamped_constraint_visual.cpp index 36f7ce404..b85cfad1c 100644 --- a/fuse_viz/src/relative_pose_2d_stamped_constraint_visual.cpp +++ b/fuse_viz/src/relative_pose_2d_stamped_constraint_visual.cpp @@ -343,7 +343,7 @@ Ogre::ColourValue RelativePose2DStampedConstraintVisual::computeLossErrorLineCol // Get the error line color as HSB: Ogre::ColourValue error_line_color(color.r, color.g, color.b); Ogre::Real hue, saturation, brightness; - error_line_color.getHSB(&hue, &saturation, &brightness); + error_line_color.getHSB(hue, saturation, brightness); // We should correct the color brightness if it is smaller than minimum brightness. Otherwise, we would get an // incorrect loss brightness. From 31a51fcd284e32325271cac44b1b80d4258013b3 Mon Sep 17 00:00:00 2001 From: Lucas Walter Date: Sat, 4 Feb 2023 14:16:48 -0800 Subject: [PATCH 3/4] disabling Werror because of deprecation warnings from ceres in Ubuntu 22.10 --- fuse_optimizers/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fuse_optimizers/CMakeLists.txt b/fuse_optimizers/CMakeLists.txt index 3bb31f6f7..fac581c53 100644 --- a/fuse_optimizers/CMakeLists.txt +++ b/fuse_optimizers/CMakeLists.txt @@ -28,7 +28,7 @@ catkin_package( ########### ## Build ## ########### -add_compile_options(-Wall -Werror) +add_compile_options(-Wall) # -Werror) ## fuse_optimizers library add_library(${PROJECT_NAME} From 5b4dd949514cef2a89dbcd02003094ba186b5262 Mon Sep 17 00:00:00 2001 From: Lucas Walter Date: Wed, 17 Apr 2024 08:08:36 -0700 Subject: [PATCH 4/4] use the old getHSB if ogre 1.10 or earlier --- .../src/relative_pose_2d_stamped_constraint_visual.cpp | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/fuse_viz/src/relative_pose_2d_stamped_constraint_visual.cpp b/fuse_viz/src/relative_pose_2d_stamped_constraint_visual.cpp index b85cfad1c..0027f151d 100644 --- a/fuse_viz/src/relative_pose_2d_stamped_constraint_visual.cpp +++ b/fuse_viz/src/relative_pose_2d_stamped_constraint_visual.cpp @@ -46,6 +46,7 @@ #include #include +#include #include #include #include @@ -343,7 +344,13 @@ Ogre::ColourValue RelativePose2DStampedConstraintVisual::computeLossErrorLineCol // Get the error line color as HSB: Ogre::ColourValue error_line_color(color.r, color.g, color.b); Ogre::Real hue, saturation, brightness; +#if (OGRE_VERSION < ((1 << 16) | (11 << 8) | 0)) + // 1.10 or earlier + error_line_color.getHSB(&hue, &saturation, &brightness); +# else + // 1.11 or later error_line_color.getHSB(hue, saturation, brightness); +#endif // We should correct the color brightness if it is smaller than minimum brightness. Otherwise, we would get an // incorrect loss brightness.