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

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