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

12 years ago · 4ac5223afa
parent 828faf4e68 dbb5a32453
commit 4ac5223afa
2 changed files with 8 additions and 0 deletions
--- a/modules/features2d/src/fast.cpp
+++ b/modules/features2d/src/fast.cpp
@ -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;
  }
--- a/modules/features2d/src/precomp.hpp
+++ b/modules/features2d/src/precomp.hpp
@ -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