move tegra namespace out of cv to prevent conflicts

2015-02-27 12:52:11 +03:00
parent d696fac8b8
commit cda6fed41f
22 changed files with 48 additions and 45 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 (cv::tegra::useTegra() && tegra::matchTemplate(img, templ, result, method))
+    if (tegra::useTegra() && tegra::matchTemplate(img, templ, result, method))
        return;
 #endif