From 9f837d3486f955c26e46b39fce67d2ed3f463a0b Mon Sep 17 00:00:00 2001
From: Leonid Beynenson <no@email>
Date: Fri, 21 Oct 2011 14:56:37 +0000
Subject: [PATCH] Made changes concerning inserting prefiltering modes into
 CascadeClassifier class. Now developers should call the method
 setFaceDetectionMaskGenerator() to use prefiltering mask generator
 implemented for face detection.

---
 modules/objdetect/include/opencv2/objdetect/objdetect.hpp | 4 +++-
 modules/objdetect/src/cascadedetect.cpp                   | 8 +++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/modules/objdetect/include/opencv2/objdetect/objdetect.hpp b/modules/objdetect/include/opencv2/objdetect/objdetect.hpp
index a8dedb1..3300c20 100644
--- a/modules/objdetect/include/opencv2/objdetect/objdetect.hpp
+++ b/modules/objdetect/include/opencv2/objdetect/objdetect.hpp
@@ -478,9 +478,11 @@ public:
     };
     void setMaskGenerator(Ptr<MaskGenerator> maskGenerator);
     Ptr<MaskGenerator> getMaskGenerator();
+
+    void setFaceDetectionMaskGenerator();
+
 protected:
     Ptr<MaskGenerator> maskGenerator;
-    Ptr<MaskGenerator> getDefaultMaskGenerator();
 };
 
     
diff --git a/modules/objdetect/src/cascadedetect.cpp b/modules/objdetect/src/cascadedetect.cpp
index 6c90e7d..7f05b0a 100644
--- a/modules/objdetect/src/cascadedetect.cpp
+++ b/modules/objdetect/src/cascadedetect.cpp
@@ -787,13 +787,11 @@ Ptr<FeatureEvaluator> FeatureEvaluator::create( int featureType )
 
 CascadeClassifier::CascadeClassifier()
 {
-    maskGenerator=getDefaultMaskGenerator();
 }
 
 CascadeClassifier::CascadeClassifier(const string& filename)
 { 
     load(filename); 
-    maskGenerator=getDefaultMaskGenerator();
 }
 
 CascadeClassifier::~CascadeClassifier()
@@ -872,12 +870,12 @@ Ptr<CascadeClassifier::MaskGenerator> CascadeClassifier::getMaskGenerator()
     return maskGenerator;
 }
 
-Ptr<CascadeClassifier::MaskGenerator> CascadeClassifier::getDefaultMaskGenerator()
+void CascadeClassifier::setFaceDetectionMaskGenerator()
 {
 #ifdef HAVE_TEGRA_OPTIMIZATION
-    return tegra::getCascadeClassifierMaskGenerator(*this);
+    setMaskGenerator(tegra::getCascadeClassifierMaskGenerator(*this));
 #else
-    return Ptr<CascadeClassifier::MaskGenerator>();
+    setMaskGenerator(Ptr<CascadeClassifier::MaskGenerator>());
 #endif
 }
 
-- 
2.7.4