use new functions before all tegra:: calls

2015-02-26 19:34:58 +03:00
parent f8484e3266
commit 44e41baffe
20 changed files with 82 additions and 75 deletions
--- a/modules/features2d/src/fast.cpp
+++ b/modules/features2d/src/fast.cpp
@@ -346,7 +346,7 @@ void FAST(InputArray _img, std::vector<KeyPoint>& keypoints, int threshold, bool
      break;
    case FastFeatureDetector::TYPE_9_16:
 #ifdef HAVE_TEGRA_OPTIMIZATION
-      if(tegra::FAST(_img, keypoints, threshold, nonmax_suppression))
+      if(cv::tegra::useTegra() && tegra::FAST(_img, keypoints, threshold, nonmax_suppression))
        break;
 #endif
      FAST_t<16>(_img, keypoints, threshold, nonmax_suppression);