Merge pull request #3594 from asmorkalov:opencv4tegra_support

2015-01-19 10:47:49 +00:00
parent df57d038b8 cc97c57fd4
commit b6023eab9c
4 changed files with 15 additions and 6 deletions
--- a/modules/objdetect/src/cascadedetect.cpp
+++ b/modules/objdetect/src/cascadedetect.cpp
@@ -931,7 +931,7 @@ Ptr<CascadeClassifierImpl::MaskGenerator> CascadeClassifierImpl::getMaskGenerato
 Ptr<BaseCascadeClassifier::MaskGenerator> createFaceDetectionMaskGenerator()
 {
 #ifdef HAVE_TEGRA_OPTIMIZATION
-    return tegra::getCascadeClassifierMaskGenerator(*this);
+    return tegra::getCascadeClassifierMaskGenerator();
 #else
    return Ptr<BaseCascadeClassifier::MaskGenerator>();
 #endif
--- a/modules/objdetect/src/cascadedetect.hpp
+++ b/modules/objdetect/src/cascadedetect.hpp
@@ -1,5 +1,7 @@
 #pragma once

+#include "opencv2/core/ocl.hpp"
+
 namespace cv
 {