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

Merge pull request #3151 from PhilLab:orbNoKeypoints

Browse Source
This commit is contained in:
Vadim Pisarevsky 2014-08-25 17:10:45 +00:00
commit 2211cfe783
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
modules/features2d/src/orb.cpp
View File

@ -49,6 +49,7 @@ template<typename _Tp> inline void copyVectorToUMat(const std::vector<_Tp>& v, O
{ {
if(v.empty()) if(v.empty())
um.release(); um.release();
else
Mat(1, (int)(v.size()*sizeof(v[0])), CV_8U, (void*)&v[0]).copyTo(um); Mat(1, (int)(v.size()*sizeof(v[0])), CV_8U, (void*)&v[0]).copyTo(um);
} }
@ -805,6 +806,10 @@ static void computeKeyPoints(const Mat& imagePyramid,
std::vector<Vec3i> ukeypoints_buf; std::vector<Vec3i> ukeypoints_buf;
nkeypoints = (int)allKeypoints.size(); nkeypoints = (int)allKeypoints.size();
if(nkeypoints == 0)
{
return;
}
Mat responses; Mat responses;
UMat ukeypoints, uresponses(1, nkeypoints, CV_32F); UMat ukeypoints, uresponses(1, nkeypoints, CV_32F);