Commit a69804e1 authored by Liu Liu's avatar Liu Liu

fixed the error in SURF when no keypoint detected

parent d79c9769
...@@ -662,7 +662,6 @@ const float SURFInvoker::DESC_SIGMA = 3.3f; ...@@ -662,7 +662,6 @@ const float SURFInvoker::DESC_SIGMA = 3.3f;
} }
CV_IMPL void CV_IMPL void
cvExtractSURF( const CvArr* _img, const CvArr* _mask, cvExtractSURF( const CvArr* _img, const CvArr* _mask,
CvSeq** _keypoints, CvSeq** _descriptors, CvSeq** _keypoints, CvSeq** _descriptors,
...@@ -762,6 +761,7 @@ cvExtractSURF( const CvArr* _img, const CvArr* _mask, ...@@ -762,6 +761,7 @@ cvExtractSURF( const CvArr* _img, const CvArr* _mask,
} }
cvScale( &_DW, &_DW, 1./gs ); cvScale( &_DW, &_DW, 1./gs );
if ( N > 0 )
cv::parallel_for(cv::BlockedRange(0, N), cv::parallel_for(cv::BlockedRange(0, N),
cv::SURFInvoker(&params, keypoints, descriptors, img, sum, cv::SURFInvoker(&params, keypoints, descriptors, img, sum,
apt, aptw, nangle0, &DW[0][0])); apt, aptw, nangle0, &DW[0][0]));
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment