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

fixed crash from #79

Browse Source
This commit is contained in:
matlabbe
2016-05-05 11:53:09 -04:00
parent 74d0bfa1bb
commit 7c8583f025
2 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
corelib/src/Memory.cpp
View File

@@ -2508,10 +2508,10 @@ void Memory::removeVirtualLinks(int signatureId)
void Memory::dumpMemory(std::string directory) const void Memory::dumpMemory(std::string directory) const
{ {
UINFO("Dumping memory to directory \"%s\"", directory.c_str()); UINFO("Dumping memory to directory \"%s\"", directory.c_str());
this->dumpDictionary((directory+"DumpMemoryWordRef.txt").c_str(), (directory+"DumpMemoryWordDesc.txt").c_str()); this->dumpDictionary((directory+"/DumpMemoryWordRef.txt").c_str(), (directory+"/DumpMemoryWordDesc.txt").c_str());
this->dumpSignatures((directory + "DumpMemorySign.txt").c_str(), false); this->dumpSignatures((directory + "/DumpMemorySign.txt").c_str(), false);
this->dumpSignatures((directory + "DumpMemorySign3.txt").c_str(), true); this->dumpSignatures((directory + "/DumpMemorySign3.txt").c_str(), true);
this->dumpMemoryTree((directory + "DumpMemoryTree.txt").c_str()); this->dumpMemoryTree((directory + "/DumpMemoryTree.txt").c_str());
} }
void Memory::dumpDictionary(const char * fileNameRef, const char * fileNameDesc) const void Memory::dumpDictionary(const char * fileNameRef, const char * fileNameDesc) const
@@ -2524,6 +2524,7 @@ void Memory::dumpDictionary(const char * fileNameRef, const char * fileNameDesc)
void Memory::dumpSignatures(const char * fileNameSign, bool words3D) const void Memory::dumpSignatures(const char * fileNameSign, bool words3D) const
{ {
UDEBUG("");
FILE* foutSign = 0; FILE* foutSign = 0;
#ifdef _MSC_VER #ifdef _MSC_VER
fopen_s(&foutSign, fileNameSign, "w"); fopen_s(&foutSign, fileNameSign, "w");
@@ -2571,6 +2572,7 @@ void Memory::dumpSignatures(const char * fileNameSign, bool words3D) const
void Memory::dumpMemoryTree(const char * fileNameTree) const void Memory::dumpMemoryTree(const char * fileNameTree) const
{ {
UDEBUG("");
FILE* foutTree = 0; FILE* foutTree = 0;
#ifdef _MSC_VER #ifdef _MSC_VER
fopen_s(&foutTree, fileNameTree, "w"); fopen_s(&foutTree, fileNameTree, "w");

7
corelib/src/VWDictionary.cpp
View File

@@ -1546,18 +1546,17 @@ void VWDictionary::deleteUnusedWords()
void VWDictionary::exportDictionary(const char * fileNameReferences, const char * fileNameDescriptors) const void VWDictionary::exportDictionary(const char * fileNameReferences, const char * fileNameDescriptors) const
{ {
UDEBUG("");
if(_visualWords.empty()) if(_visualWords.empty())
{ {
UWARN("Dictionary is empty, cannot export it!"); UWARN("Dictionary is empty, cannot export it!");
return; return;
} }
if(_visualWords.begin()->second->getDescriptor().type() != CV_32FC1)
if(_visualWords.at(0)->getDescriptor().type() != CV_32FC1)
{ {
UERROR("Exporting binary descriptors is not implemented!"); UERROR("Exporting binary descriptors is not implemented!");
return; return;
} }
FILE* foutRef = 0; FILE* foutRef = 0;
FILE* foutDesc = 0; FILE* foutDesc = 0;
#ifdef _MSC_VER #ifdef _MSC_VER
@@ -1580,10 +1579,12 @@ void VWDictionary::exportDictionary(const char * fileNameReferences, const char
} }
else else
{ {
UDEBUG("");
fprintf(foutDesc, "WordID Descriptors...%d\n", (*_visualWords.begin()).second->getDescriptor().cols); fprintf(foutDesc, "WordID Descriptors...%d\n", (*_visualWords.begin()).second->getDescriptor().cols);
} }
} }
UDEBUG("Export %d words...", _visualWords.size());
for(std::map<int, VisualWord *>::const_iterator iter=_visualWords.begin(); iter!=_visualWords.end(); ++iter) for(std::map<int, VisualWord *>::const_iterator iter=_visualWords.begin(); iter!=_visualWords.end(); ++iter)
{ {
// References // References