mirror of
https://github.com/introlab/rtabmap.git
synced 2026-10-07 02:27:47 +08:00
integrating c++17 fixes from #959 (ref:https://github.com/flann-lib/flann/pull/392), fixed pop_t error (https://github.com/flann-lib/flann/commit/b6e37553de0dd47dc8fc9035ba5aef163981b6a4)
This commit is contained in:
@@ -80,7 +80,7 @@ void FlannIndex::release()
|
||||
UDEBUG("");
|
||||
}
|
||||
|
||||
unsigned int FlannIndex::indexedFeatures() const
|
||||
size_t FlannIndex::indexedFeatures() const
|
||||
{
|
||||
if(!index_)
|
||||
{
|
||||
@@ -108,13 +108,13 @@ unsigned int FlannIndex::indexedFeatures() const
|
||||
}
|
||||
|
||||
// return Bytes
|
||||
unsigned long FlannIndex::memoryUsed() const
|
||||
size_t FlannIndex::memoryUsed() const
|
||||
{
|
||||
if(!index_)
|
||||
{
|
||||
return 0;
|
||||
}
|
||||
unsigned long memoryUsage = sizeof(FlannIndex);
|
||||
size_t memoryUsage = sizeof(FlannIndex);
|
||||
memoryUsage += addedDescriptors_.size() * (sizeof(int) + sizeof(cv::Mat) + sizeof(std::map<int, cv::Mat>::iterator)) + sizeof(std::map<int, cv::Mat>);
|
||||
memoryUsage += sizeof(std::list<int>) + removedIndexes_.size() * sizeof(int);
|
||||
if(featuresType_ == CV_8UC1)
|
||||
|
||||
Reference in New Issue
Block a user