eliminate some ogre deprecation warnings, make eigen and ogre warnings in fuse_viz not errors for now

lucasw · lucasw · commit 507c9295009d · 2022-05-07T13:16:33.000-07:00
diff --git 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/include/fuse_viz/conversions.h b/fuse_viz/include/fuse_viz/conversions.h
@@ -46,7 +46,7 @@
 
 #include <OgreColourValue.h>
 #include <OgreQuaternion.h>
-#include <OgreVector3.h>
+#include <Ogre.h>
 
 #include <boost/array.hpp>
 
diff --git 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 <Eigen/Dense>
 
 #include <OgreColourValue.h>
-#include <OgreVector3.h>
+#include <Ogre.h>
 
 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
@@ -39,7 +39,7 @@
 
 #include <tf2/LinearMath/Transform.h>
 
-#include <OgreVector3.h>
+#include <Ogre.h>
 
 #include <memory>
 
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
@@ -40,7 +40,7 @@
 #include <rviz/ogre_helpers/object.h>
 
 #include <OgreColourValue.h>
-#include <OgreVector3.h>
+#include <Ogre.h>
 
 #include <memory>
 #include <string>
diff --git 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.

Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,7 @@`
`41`	`41`	`#include <Eigen/Dense>`
`42`	`42`
`43`	`43`	`#include <OgreColourValue.h>`
`44`		`-#include <OgreVector3.h>`
	`44`	`+#include <Ogre.h>`
`45`	`45`
`46`	`46`	`namespace Ogre`
`47`	`47`	`{`