another attempt to fix compile errors

828b0b15 · Vadim Pisarevsky · fe11ca88 · 828b0b15
Commit 828b0b15 authored Dec 04, 2013 by Vadim Pisarevsky
Show whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

objdetect.hpp modules/objdetect/include/opencv2/objdetect.hpp +2 -2

No files found.
--- a/modules/objdetect/include/opencv2/objdetect.hpp
+++ b/modules/objdetect/include/opencv2/objdetect.hpp
@@ -197,7 +197,7 @@ class CV_EXPORTS_W CascadeClassifier
 {
 public:
    CV_WRAP CascadeClassifier();
-    CV_WRAP explicit CascadeClassifier(const String& filename);
+    CV_WRAP CascadeClassifier(const String& filename);
    ~CascadeClassifier();
    CV_WRAP bool empty() const;
    CV_WRAP bool load( const String& filename );
@@ -234,7 +234,7 @@ public:

    void setMaskGenerator(const Ptr<BaseCascadeClassifier::MaskGenerator>& maskGenerator);
    Ptr<BaseCascadeClassifier::MaskGenerator> getMaskGenerator();
-protected:
+
    Ptr<BaseCascadeClassifier> cc;
 };