potok/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2026-07-29 23:33:05 +04:00
Code Packages Releases Wiki Activity

move tegra namespace out of cv to prevent conflicts

Browse Source
This commit is contained in:
Vladislav Vinogradov
2015-02-27 12:52:11 +03:00
parent d696fac8b8
commit cda6fed41f
22 changed files with 48 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/objdetect/src/cascadedetect.cpp
+2 -3
View File
@@ -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