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
@@ -261,7 +261,7 @@ void cv::Canny( InputArray _src, OutputArray _dst,
    Mat src = _src.getMat(), dst = _dst.getMat();

 #ifdef HAVE_TEGRA_OPTIMIZATION
-    if (cv::tegra::useTegra() && tegra::canny(src, dst, low_thresh, high_thresh, aperture_size, L2gradient))
+    if (tegra::useTegra() && tegra::canny(src, dst, low_thresh, high_thresh, aperture_size, L2gradient))
        return;
 #endif