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

fixed some warnings in Windows

Browse Source 
fixed Transform::getNorm()

git-svn-id: http://rtabmap.googlecode.com/svn/trunk/rtabmap@1436 f169173b-cf89-36c8-b27e-44dbe73f0c83
This commit is contained in:
matlabbe
2014-06-23 15:19:17 +00:00
parent d1df15efdd
commit e9ae29f909
12 changed files with 49 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files
corelib/src/Rtabmap.cpp
+7 -6
View File
@@ -1094,8 +1094,9 @@ bool Rtabmap::process(const Image & image)
{
//Load neighbors
ULOGGER_INFO("Retrieving locations... around id=%d", _retrievedId);
unsigned int neighborhoodSize = _bayesFilter->getPredictionLC().size()-1;
unsigned int margin = neighborhoodSize;
int neighborhoodSize = (int)_bayesFilter->getPredictionLC().size()-1;
UASSERT(neighborhoodSize >= 0);
int margin = neighborhoodSize;
UTimer timeGetN;
unsigned int nbLoadedFromDb = 0;
@@ -1105,7 +1106,7 @@ bool Rtabmap::process(const Image & image)
double timeGetNeighborsSpaceDb = 0.0;
std::map<int, int> neighbors;
bool firstPassDone = false;
unsigned int m = 0;
int m = 0;
int nbDirectNeighborsInDb = 0;
// priority in time
@@ -1127,7 +1128,7 @@ bool Rtabmap::process(const Image & image)
{
neighbors.erase(iter++);
}
else if((unsigned int)iter->second == m)
else if(iter->second == m)
{
if(reactivatedIdsSet.find(iter->first) == reactivatedIdsSet.end())
{
@@ -1178,7 +1179,7 @@ bool Rtabmap::process(const Image & image)
{
neighbors.erase(iter++);
}
else if((unsigned int)iter->second == m)
else if(iter->second == m)
{
if(reactivatedIdsSet.find(iter->first) == reactivatedIdsSet.end())
{
@@ -1407,7 +1408,7 @@ bool Rtabmap::process(const Image & image)
{
lcHypothesisReactivated = sLoop->isSaved()?1.0f:0.0f;
}
dictionarySize = _memory->getVWDictionary()->getVisualWords().size();
dictionarySize = (int)_memory->getVWDictionary()->getVisualWords().size();
refWordsCount = (int)signature->getWords().size();
refUniqueWordsCount = (int)uUniqueKeys(signature->getWords()).size();