From: Alexey Kazakov Date: Thu, 24 Feb 2011 10:24:55 +0000 (+0000) Subject: Replaced private methods to protected in CascaseClassifier class (objdetect.hpp) X-Git-Tag: accepted/2.0/20130307.220821~3456 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=4e460cd7a629c3c45db407bda5b789bbc819250c;p=profile%2Fivi%2Fopencv.git Replaced private methods to protected in CascaseClassifier class (objdetect.hpp) --- diff --git a/modules/objdetect/include/opencv2/objdetect/objdetect.hpp b/modules/objdetect/include/opencv2/objdetect/objdetect.hpp index a1de0ee..63853e7 100644 --- a/modules/objdetect/include/opencv2/objdetect/objdetect.hpp +++ b/modules/objdetect/include/opencv2/objdetect/objdetect.hpp @@ -307,7 +307,7 @@ public: CV_WRAP virtual bool empty() const; CV_WRAP bool load( const string& filename ); bool read( const FileNode& node ); - CV_WRAP void detectMultiScale( const Mat& image, + CV_WRAP virtual void detectMultiScale( const Mat& image, CV_OUT vector& objects, double scaleFactor=1.1, int minNeighbors=3, int flags=0, @@ -323,7 +323,7 @@ protected: virtual bool detectSingleScale( const Mat& image, int stripCount, Size processingRectSize, int stripSize, int yStep, double factor, vector& candidates ); -private: +protected: enum { BOOST = 0 }; enum { DO_CANNY_PRUNING = 1, SCALE_IMAGE = 2, FIND_BIGGEST_OBJECT = 4, DO_ROUGH_SEARCH = 8 };