extend Feature2DAsync interface

This commit is contained in:
Vladislav Vinogradov
2015-01-12 18:26:41 +03:00
parent 14ef62ed66
commit 9f77ffb03f
2 changed files with 103 additions and 8 deletions

View File

@@ -233,26 +233,36 @@ private:
// Feature2DAsync
//
/** @brief Abstract base class for 2D image feature detectors and descriptor extractors.
*/
class CV_EXPORTS Feature2DAsync
{
public:
virtual ~Feature2DAsync() {}
virtual ~Feature2DAsync();
virtual void detectAsync(InputArray image, OutputArray keypoints,
virtual void detectAsync(InputArray image,
OutputArray keypoints,
InputArray mask = noArray(),
Stream& stream = Stream::Null()) = 0;
Stream& stream = Stream::Null());
virtual void convert(InputArray gpu_keypoints, std::vector<KeyPoint>& keypoints) = 0;
virtual void computeAsync(InputArray image,
OutputArray keypoints,
OutputArray descriptors,
Stream& stream = Stream::Null());
virtual void detectAndComputeAsync(InputArray image,
InputArray mask,
OutputArray keypoints,
OutputArray descriptors,
bool useProvidedKeypoints=false,
Stream& stream = Stream::Null());
virtual void convert(InputArray gpu_keypoints,
std::vector<KeyPoint>& keypoints) = 0;
};
//
// FastFeatureDetector
//
/** @brief Wrapping class for feature detection using the FAST method.
*/
class CV_EXPORTS FastFeatureDetector : public cv::FastFeatureDetector, public Feature2DAsync
{
public: