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

Fixed some size_t/int warnings.

Browse Source 
Fixed compilation error on Windows for ExtractObject tool (include pcl_ros/transform.h missing).

git-svn-id: http://rtabmap.googlecode.com/svn/trunk/rtabmap@1295 f169173b-cf89-36c8-b27e-44dbe73f0c83
This commit is contained in:
matlabbe
2014-05-05 15:18:41 +00:00
parent 2d7ba1b9f4
commit e6f24dfcc5
4 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -38,7 +38,7 @@ public:
const float * data() const {return data_.data();} const float * data() const {return data_.data();}
float * data() {return data_.data();} float * data() {return data_.data();}
int size() const {return data_.size();} int size() const {return (int)data_.size();}
float & x() {return data_[3];} float & x() {return data_[3];}
float & y() {return data_[7];} float & y() {return data_[7];}

4
corelib/include/rtabmap/core/VWDictionary.h
View File

@@ -71,7 +71,7 @@ public:
void setNndrUsed(bool used) {_nndrUsed = used;} void setNndrUsed(bool used) {_nndrUsed = used;}
bool isNndrUsed() const {return _nndrUsed;} bool isNndrUsed() const {return _nndrUsed;}
float getNndrRatio() {return _nndrRatio;} float getNndrRatio() {return _nndrRatio;}
unsigned int getNotIndexedWordsCount() const {return _notIndexedWords.size();} unsigned int getNotIndexedWordsCount() const {return (int)_notIndexedWords.size();}
int getLastIndexedWordId() const; int getLastIndexedWordId() const;
int getTotalActiveReferences() const {return _totalActiveReferences;} int getTotalActiveReferences() const {return _totalActiveReferences;}
void setNNStrategy(NNStrategy strategy, const ParametersMap & parameters = ParametersMap()); void setNNStrategy(NNStrategy strategy, const ParametersMap & parameters = ParametersMap());
@@ -83,7 +83,7 @@ public:
void clear(); void clear();
std::vector<VisualWord *> getUnusedWords() const; std::vector<VisualWord *> getUnusedWords() const;
unsigned int getUnusedWordsSize() const {return _unusedWords.size();} unsigned int getUnusedWordsSize() const {return (int)_unusedWords.size();}
void removeWords(const std::vector<VisualWord*> & words); // caller must delete the words void removeWords(const std::vector<VisualWord*> & words); // caller must delete the words
protected: protected:

10
corelib/src/Rtabmap.cpp
View File

@@ -443,7 +443,7 @@ int Rtabmap::getWMSize() const
{ {
if(_memory) if(_memory)
{ {
return _memory->getWorkingMem().size()-1; // remove virtual place return (int)_memory->getWorkingMem().size()-1; // remove virtual place
} }
return 0; return 0;
} }
@@ -472,7 +472,7 @@ int Rtabmap::getSTMSize() const
{ {
if(_memory) if(_memory)
{ {
return _memory->getStMem().size(); return (int)_memory->getStMem().size();
} }
return 0; return 0;
} }
@@ -1320,7 +1320,7 @@ bool Rtabmap::process(const Image & image)
UASSERT(_optimizedPoses.find(signature->id()) != _optimizedPoses.end()); UASSERT(_optimizedPoses.find(signature->id()) != _optimizedPoses.end());
poses.insert(std::make_pair(signature->id(), _optimizedPoses.at(signature->id()))); poses.insert(std::make_pair(signature->id(), _optimizedPoses.at(signature->id())));
localSpaceDetectionPosesCount = poses.size()-1; localSpaceDetectionPosesCount = (int)poses.size()-1;
//The nearest will be the reference for a loop closure transform //The nearest will be the reference for a loop closure transform
if(poses.size() && if(poses.size() &&
localSpaceNearestId && localSpaceNearestId &&
@@ -1407,8 +1407,8 @@ bool Rtabmap::process(const Image & image)
lcHypothesisReactivated = sLoop->isSaved()?1.0f:0.0f; lcHypothesisReactivated = sLoop->isSaved()?1.0f:0.0f;
} }
dictionarySize = _memory->getVWDictionarySize(); dictionarySize = _memory->getVWDictionarySize();
refWordsCount = signature->getWords().size(); refWordsCount = (int)signature->getWords().size();
refUniqueWordsCount = uUniqueKeys(signature->getWords()).size(); refUniqueWordsCount = (int)uUniqueKeys(signature->getWords()).size();
// Posterior is empty if a bad signature is detected // Posterior is empty if a bad signature is detected
float vpHypothesis = posterior.size()?posterior.at(Memory::kIdVirtual):0.0f; float vpHypothesis = posterior.size()?posterior.at(Memory::kIdVirtual):0.0f;

1
tools/ExtractObject/main.cpp
View File

@@ -3,7 +3,6 @@
#include <pcl/point_types.h> #include <pcl/point_types.h>
#include <pcl/point_cloud.h> #include <pcl/point_cloud.h>
#include <pcl/io/pcd_io.h> #include <pcl/io/pcd_io.h>
#include <pcl_ros/transforms.h>
#include <pcl/ModelCoefficients.h> #include <pcl/ModelCoefficients.h>
#include <pcl/common/common.h> #include <pcl/common/common.h>
#include <pcl/common/pca.h> #include <pcl/common/pca.h>