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

Merge branch 'master' of github.com:introlab/rtabmap

Browse Source
This commit is contained in:
matlabbe
2015-09-11 22:00:11 -04:00
parent 1f05cf3299 567c6a8a51
commit 5cc17704d3
2 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
corelib/src/Memory.cpp
View File

@@ -990,7 +990,7 @@ std::map<int, int> Memory::getNeighborsId(int signatureId,
ids.insert(std::pair<int, int>(*jter, m)); ids.insert(std::pair<int, int>(*jter, m));
UTimer timer; UTimer timer;
_dbDriver->loadLinks(*jter, tmpLinks); _dbDriver->loadLinks(*jter, tmpLinks, ignoreLoopIds?Link::kNeighbor:Link::kUndef);
if(dbAccessTime) if(dbAccessTime)
{ {
*dbAccessTime += timer.getElapsedTime(); *dbAccessTime += timer.getElapsedTime();

6
corelib/src/VWDictionary.cpp
View File

@@ -249,6 +249,12 @@ public:
UERROR("Flann index not yet created!"); UERROR("Flann index not yet created!");
return; return;
} }
// If a Segmentation fault occurs in removePoint(), verify that you have this fix in your installed "flann/algorithms/nn_index.h":
// 707 - if (ids_[id]==id) {
// 707 + if (id < ids_.size() && ids_[id]==id) {
// ref: https://github.com/mariusmuja/flann/commit/23051820b2314f07cf40ba633a4067782a982ff3#diff-33762b7383f957c2df17301639af5151
if(featuresType_ == CV_8UC1) if(featuresType_ == CV_8UC1)
{ {
((flann::Index<flann::Hamming<unsigned char> >*)index_)->removePoint(index); ((flann::Index<flann::Hamming<unsigned char> >*)index_)->removePoint(index);