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

fixed Windows build and some warnings

Browse Source
This commit is contained in:
Mathieu Labbé
2015-04-29 00:38:00 -04:00
parent 24e79ad9d7
commit d09e8f237a
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
corelib/src/Memory.cpp
+1 -1
View File
@@ -1880,7 +1880,7 @@ Transform Memory::computeVisualTransform(
} }
if(inliers) if(inliers)
{ {
*inliers = inliers3D.size(); *inliers = (int)inliers3D.size();
} }
if(!cameraTransform.isNull()) if(!cameraTransform.isNull())
corelib/src/Rtabmap.cpp
+3 -3
View File
@@ -1349,7 +1349,7 @@ bool Rtabmap::process(const SensorData & data)
{ {
nearNodesByDist.insert(std::make_pair(iter->second, iter->first)); nearNodesByDist.insert(std::make_pair(iter->second, iter->first));
} }
for(std::map<float, int>::iterator iter=nearNodesByDist.begin(); for(std::multimap<float, int>::iterator iter=nearNodesByDist.begin();
iter!=nearNodesByDist.end() && retrievalLocalIds.size() < _maxLocalRetrieved; iter!=nearNodesByDist.end() && retrievalLocalIds.size() < _maxLocalRetrieved;
++iter) ++iter)
{ {
@@ -1389,7 +1389,7 @@ bool Rtabmap::process(const SensorData & data)
// only a loop closure link is added... // only a loop closure link is added...
signaturesRetrieved = _memory->reactivateSignatures( signaturesRetrieved = _memory->reactivateSignatures(
reactivatedIds, reactivatedIds,
_maxRetrieved+retrievalLocalIds.size(), // add path retrieved _maxRetrieved+(unsigned int)retrievalLocalIds.size(), // add path retrieved
timeRetrievalDbAccess); timeRetrievalDbAccess);
ULOGGER_INFO("retrieval of %d (db time = %fs)", (int)signaturesRetrieved.size(), timeRetrievalDbAccess); ULOGGER_INFO("retrieval of %d (db time = %fs)", (int)signaturesRetrieved.size(), timeRetrievalDbAccess);
@@ -1535,7 +1535,7 @@ bool Rtabmap::process(const SensorData & data)
_localDetectMaxDiffID); _localDetectMaxDiffID);
std::list<std::map<int, Transform> > forwardPaths = getPaths(forwardPoses); std::list<std::map<int, Transform> > forwardPaths = getPaths(forwardPoses);
localSpacePaths = forwardPaths.size(); localSpacePaths = (int)forwardPaths.size();
for(std::list<std::map<int, Transform> >::iterator iter=forwardPaths.begin(); iter!=forwardPaths.end(); ++iter) for(std::list<std::map<int, Transform> >::iterator iter=forwardPaths.begin(); iter!=forwardPaths.end(); ++iter)
{ {