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/imgproc/src/templmatch.cpp
+++ b/modules/imgproc/src/templmatch.cpp
@@ -933,7 +933,7 @@ void cv::matchTemplate( InputArray _img, InputArray _templ, OutputArray _result,
    Mat result = _result.getMat();

 #ifdef HAVE_TEGRA_OPTIMIZATION
-    if (tegra::matchTemplate(img, templ, result, method))
+    if (cv::tegra::useTegra() && tegra::matchTemplate(img, templ, result, method))
        return;
 #endif