i/rtabmap
1
0
Fork 0
mirror of https://github.com/introlab/rtabmap.git synced 2026-09-02 09:30:25 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fixed many compilation warnings (c++14, like pedantic warnings)

Browse Source
This commit is contained in:
matlabbe
2020-01-30 17:23:02 -05:00
parent ccc5a5be5a
commit f7540196d4
10 changed files with 21 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
corelib/include/rtabmap/core/Features2d.h
View File

@@ -278,7 +278,7 @@ public:
private:
virtual std::vector<cv::KeyPoint> generateKeypointsImpl(const cv::Mat & image, const cv::Rect & roi, const cv::Mat & mask = cv::Mat());
virtual cv::Mat generateDescriptorsImpl(const cv::Mat & image, std::vector<cv::KeyPoint> & keypoints) const {return cv::Mat();}
virtual cv::Mat generateDescriptorsImpl(const cv::Mat &, std::vector<cv::KeyPoint> &) const {return cv::Mat();}
private:
int threshold_;

2
corelib/include/rtabmap/core/Memory.h
View File

@@ -346,7 +346,7 @@ private:
//Keypoint stuff
VWDictionary * _vwd;
Feature2D * _feature2D;
float _badSignRatio;;
float _badSignRatio;
bool _tfIdfLikelihoodUsed;
bool _parallelized;

6
corelib/include/rtabmap/core/Parameters.h
View File

@@ -71,7 +71,7 @@ typedef std::pair<std::string, std::string> ParametersPair;
parametersType_.insert(ParametersPair(#PREFIX "/" #NAME, #TYPE)); \
descriptions_.insert(ParametersPair(#PREFIX "/" #NAME, DESCRIPTION));} \
}; \
Dummy##PREFIX##NAME dummy##PREFIX##NAME;
Dummy##PREFIX##NAME dummy##PREFIX##NAME
// end define PARAM
/**
@@ -105,7 +105,7 @@ typedef std::pair<std::string, std::string> ParametersPair;
parametersType_.insert(ParametersPair(#PREFIX "/" #NAME, "string")); \
descriptions_.insert(ParametersPair(#PREFIX "/" #NAME, DESCRIPTION));} \
}; \
Dummy##PREFIX##NAME dummy##PREFIX##NAME;
Dummy##PREFIX##NAME dummy##PREFIX##NAME
// end define PARAM
/**
@@ -138,7 +138,7 @@ typedef std::pair<std::string, std::string> ParametersPair;
parametersType_.insert(ParametersPair(#PREFIX "/" #NAME, #TYPE)); \
descriptions_.insert(ParametersPair(#PREFIX "/" #NAME, DESCRIPTION));} \
}; \
Dummy##PREFIX##NAME dummy##PREFIX##NAME;
Dummy##PREFIX##NAME dummy##PREFIX##NAME
// end define PARAM
/**

2
corelib/include/rtabmap/core/Statistics.h
View File

@@ -48,7 +48,7 @@ namespace rtabmap {
public: \
Dummy##PREFIX##NAME() {if(!_defaultDataInitialized)_defaultData.insert(std::pair<std::string, float>(#PREFIX "/" #NAME "/" #UNIT, 0.0f));} \
}; \
Dummy##PREFIX##NAME dummy##PREFIX##NAME;
Dummy##PREFIX##NAME dummy##PREFIX##NAME
class RTABMAP_EXP Statistics
{

7
corelib/src/Memory.cpp
View File

@@ -4001,9 +4001,14 @@ Signature * Memory::createSignature(const SensorData & inputData, const Transfor
( (data.imageRaw().empty() && data.depthOrRightRaw().type() != CV_8UC1) ||
(data.imageRaw().rows % data.depthOrRightRaw().rows == 0 && data.imageRaw().cols % data.depthOrRightRaw().cols == 0 &&
data.depthOrRightRaw().rows <= data.imageRaw().rows && data.depthOrRightRaw().cols <= data.imageRaw().cols))),
uFormat("image=(%d/%d) depth=(%d/%d, type=%d [accepted=%d,%d,%d]) RGB should be",
uFormat("image=(%d/%d, type=%d, [accepted=%d,%d]) depth=(%d/%d, type=%d [accepted=%d(depth mm),%d(depth m),%d(stereo)]). "
"For stereo, left and right images should be same size. "
"For RGB-D, depth can be X times smaller than RGB (where X is an integer).",
data.imageRaw().cols,
data.imageRaw().rows,
data.imageRaw().type(),
CV_8UC1,
CV_8UC3,
data.depthOrRightRaw().cols,
data.depthOrRightRaw().rows,
data.depthOrRightRaw().type(),