i/rtabmap_ros
1
0
Fork 0
mirror of https://github.com/introlab/rtabmap_ros.git synced 2026-10-03 16:27:46 +08:00
Code Issues Packages Projects Releases Wiki Activity

Increased required rtabmap version to 0.10.6

Browse Source
This commit is contained in:
matlabbe
2015-08-27 17:29:47 -04:00
parent a81ef39723
commit 2abf28d424
4 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
CMakeLists.txt
+1 -1
View File
@@ -17,7 +17,7 @@ find_package(octomap_ros)
## System dependencies are found with CMake's conventions ## System dependencies are found with CMake's conventions
# find_package(Boost REQUIRED COMPONENTS system) # find_package(Boost REQUIRED COMPONENTS system)
find_package(RTABMap 0.10.5 REQUIRED) find_package(RTABMap 0.10.6 REQUIRED)
find_package(OpenCV REQUIRED) find_package(OpenCV REQUIRED)
src/CoreWrapper.cpp
+2 -1
View File
@@ -45,6 +45,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include <rtabmap/utilite/UStl.h> #include <rtabmap/utilite/UStl.h>
#include <rtabmap/utilite/UMath.h> #include <rtabmap/utilite/UMath.h>
#include <rtabmap/core/util2d.h>
#include <rtabmap/core/util3d.h> #include <rtabmap/core/util3d.h>
#include <rtabmap/core/util3d_transforms.h> #include <rtabmap/core/util3d_transforms.h>
#include <rtabmap/core/Memory.h> #include <rtabmap/core/Memory.h>
@@ -814,7 +815,7 @@ void CoreWrapper::commonDepthCallback(
cv::Mat subDepth = ptrDepth->image; cv::Mat subDepth = ptrDepth->image;
if(subDepth.type() == CV_32FC1) if(subDepth.type() == CV_32FC1)
{ {
subDepth = util3d::cvtDepthFromFloat(subDepth); subDepth = util2d::cvtDepthFromFloat(subDepth);
static bool shown = false; static bool shown = false;
if(!shown) if(!shown)
{ {
src/GuiWrapper.cpp
+2 -1
View File
@@ -47,6 +47,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include <rtabmap/core/Parameters.h> #include <rtabmap/core/Parameters.h>
#include <rtabmap/core/ParamEvent.h> #include <rtabmap/core/ParamEvent.h>
#include <rtabmap/core/OdometryEvent.h> #include <rtabmap/core/OdometryEvent.h>
#include <rtabmap/core/util2d.h>
#include <rtabmap/core/util3d.h> #include <rtabmap/core/util3d.h>
#include <rtabmap/core/util3d_transforms.h> #include <rtabmap/core/util3d_transforms.h>
#include <rtabmap/utilite/UTimer.h> #include <rtabmap/utilite/UTimer.h>
@@ -580,7 +581,7 @@ void GuiWrapper::commonDepthCallback(
cv::Mat subDepth = ptrDepth->image; cv::Mat subDepth = ptrDepth->image;
if(subDepth.type() == CV_32FC1) if(subDepth.type() == CV_32FC1)
{ {
subDepth = util3d::cvtDepthFromFloat(subDepth); subDepth = util2d::cvtDepthFromFloat(subDepth);
static bool shown = false; static bool shown = false;
if(!shown) if(!shown)
{ {
src/RGBDOdometryNode.cpp
+2 -1
View File
@@ -43,6 +43,7 @@ SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#include "rtabmap_ros/MsgConversion.h" #include "rtabmap_ros/MsgConversion.h"
#include <rtabmap/core/util3d.h> #include <rtabmap/core/util3d.h>
#include <rtabmap/core/util2d.h>
#include <rtabmap/utilite/ULogger.h> #include <rtabmap/utilite/ULogger.h>
using namespace rtabmap; using namespace rtabmap;
@@ -301,7 +302,7 @@ public:
cv::Mat subDepth = ptrDepth->image; cv::Mat subDepth = ptrDepth->image;
if(subDepth.type() == CV_32FC1) if(subDepth.type() == CV_32FC1)
{ {
subDepth = rtabmap::util3d::cvtDepthFromFloat(subDepth); subDepth = rtabmap::util2d::cvtDepthFromFloat(subDepth);
static bool shown = false; static bool shown = false;
if(!shown) if(!shown)
{ {