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/objdetect/src/cascadedetect.cpp
+++ b/modules/objdetect/src/cascadedetect.cpp
@@ -937,11 +937,10 @@ Ptr<CascadeClassifierImpl::MaskGenerator> CascadeClassifierImpl::getMaskGenerato
 Ptr<BaseCascadeClassifier::MaskGenerator> createFaceDetectionMaskGenerator()
 {
 #ifdef HAVE_TEGRA_OPTIMIZATION
-    if (cv::tegra::useTegra())
+    if (tegra::useTegra())
        return tegra::getCascadeClassifierMaskGenerator();
-#else
-    return Ptr<BaseCascadeClassifier::MaskGenerator>();
 #endif
+    return Ptr<BaseCascadeClassifier::MaskGenerator>();
 }

 class CascadeClassifierInvoker : public ParallelLoopBody