Merge pull request from taka-no-me/tegra-fast

This commit is contained in:
Andrey Kamaev 2012-11-02 14:31:02 +04:00
commit 4ac5223afa
2 changed files with 8 additions and 0 deletions
modules/features2d/src

@ -259,6 +259,10 @@ void FASTX(InputArray _img, std::vector<KeyPoint>& keypoints, int threshold, boo
FAST_t<12>(_img, keypoints, threshold, nonmax_suppression);
break;
case FastFeatureDetector::TYPE_9_16:
#ifdef HAVE_TEGRA_OPTIMIZATION
if(tegra::FAST(_img, keypoints, threshold, nonmax_suppression))
break;
#endif
FAST_t<16>(_img, keypoints, threshold, nonmax_suppression);
break;
}

@ -52,4 +52,8 @@
#include "opencv2/imgproc/imgproc_c.h"
#include "opencv2/core/internal.hpp"
#ifdef HAVE_TEGRA_OPTIMIZATION
#include "opencv2/features2d/features2d_tegra.hpp"
#endif
#endif