Skip to content

Commit d09e8f2

Browse files
committed
fixed Windows build and some warnings
1 parent 24e79ad commit d09e8f2

File tree

2 files changed

+4
-4
lines changed

2 files changed

+4
-4
lines changed

corelib/src/Memory.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1880,7 +1880,7 @@ Transform Memory::computeVisualTransform(
18801880
}
18811881
if(inliers)
18821882
{
1883-
*inliers = inliers3D.size();
1883+
*inliers = (int)inliers3D.size();
18841884
}
18851885

18861886
if(!cameraTransform.isNull())

corelib/src/Rtabmap.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1349,7 +1349,7 @@ bool Rtabmap::process(const SensorData & data)
13491349
{
13501350
nearNodesByDist.insert(std::make_pair(iter->second, iter->first));
13511351
}
1352-
for(std::map<float, int>::iterator iter=nearNodesByDist.begin();
1352+
for(std::multimap<float, int>::iterator iter=nearNodesByDist.begin();
13531353
iter!=nearNodesByDist.end() && retrievalLocalIds.size() < _maxLocalRetrieved;
13541354
++iter)
13551355
{
@@ -1389,7 +1389,7 @@ bool Rtabmap::process(const SensorData & data)
13891389
// only a loop closure link is added...
13901390
signaturesRetrieved = _memory->reactivateSignatures(
13911391
reactivatedIds,
1392-
_maxRetrieved+retrievalLocalIds.size(), // add path retrieved
1392+
_maxRetrieved+(unsigned int)retrievalLocalIds.size(), // add path retrieved
13931393
timeRetrievalDbAccess);
13941394

13951395
ULOGGER_INFO("retrieval of %d (db time = %fs)", (int)signaturesRetrieved.size(), timeRetrievalDbAccess);
@@ -1535,7 +1535,7 @@ bool Rtabmap::process(const SensorData & data)
15351535
_localDetectMaxDiffID);
15361536

15371537
std::list<std::map<int, Transform> > forwardPaths = getPaths(forwardPoses);
1538-
localSpacePaths = forwardPaths.size();
1538+
localSpacePaths = (int)forwardPaths.size();
15391539

15401540
for(std::list<std::map<int, Transform> >::iterator iter=forwardPaths.begin(); iter!=forwardPaths.end(); ++iter)
15411541
{

0 commit comments

Comments
 (0)