generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

some bugfixes & improvements in openfabmap code, docs and samples by Arren Glover

Browse Source
This commit is contained in:
Vadim Pisarevsky
2012-09-23 20:57:34 +04:00
parent b7b32e74a5
commit 427ce1247a
3 changed files with 27 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
modules/contrib/src/openfabmap.cpp
View File

@@ -202,14 +202,13 @@ void FabMap::compare(const vector<Mat>& queryImgDescriptors,
void FabMap::compare(const vector<Mat>& queryImgDescriptors,
const vector<Mat>& _testImgDescriptors,
vector<IMatch>& matches, const Mat& /*mask*/) {
if (_testImgDescriptors[0].data != this->testImgDescriptors[0].data) {
CV_Assert(!(flags & MOTION_MODEL));
for (size_t i = 0; i < _testImgDescriptors.size(); i++) {
CV_Assert(!_testImgDescriptors[i].empty());
CV_Assert(_testImgDescriptors[i].rows == 1);
CV_Assert(_testImgDescriptors[i].cols == clTree.cols);
CV_Assert(_testImgDescriptors[i].type() == CV_32F);
}
CV_Assert(!(flags & MOTION_MODEL));
for (size_t i = 0; i < _testImgDescriptors.size(); i++) {
CV_Assert(!_testImgDescriptors[i].empty());
CV_Assert(_testImgDescriptors[i].rows == 1);
CV_Assert(_testImgDescriptors[i].cols == clTree.cols);
CV_Assert(_testImgDescriptors[i].type() == CV_32F);
}
for (size_t i = 0; i < queryImgDescriptors.size(); i++) {