fixed some warnings in Windows

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
+3 -2
View File
@@ -712,13 +712,14 @@ std::map<int, Transform> Memory::getNeighborLinks(int signatureId, bool ignoreNe
// maxCheckedInDatabase = -1 means no limit to check in database (default)
// maxCheckedInDatabase = 0 means don't check in database
std::map<int, int> Memory::getNeighborsId(int signatureId,
unsigned int margin, // 0 means infinite margin
int margin, // 0 means infinite margin
int maxCheckedInDatabase, // default -1 (no limit)
bool incrementMarginOnLoop, // default false
bool ignoreLoopIds, // default false
double * dbAccessTime
) const
{
UASSERT(margin >= 0);
//UDEBUG("signatureId=%d, neighborsMargin=%d", signatureId, margin);
if(dbAccessTime)
{
@@ -734,7 +735,7 @@ std::map<int, int> Memory::getNeighborsId(int signatureId,
std::set<int> currentMargin;
std::set<int> nextMargin;
nextMargin.insert(signatureId);
unsigned int m = 0;
int m = 0;
while((margin == 0 || m < margin) && nextMargin.size())
{
curentMarginList = std::list<int>(nextMargin.begin(), nextMargin.end());