Revert "yet another portion of changes towards the binary compatibility"

This reverts commit 618fbf5508c8a55cd9132605bb9fc4a686b3872a.

diff --git a/modules/contrib/include/opencv2/contrib/contrib.hpp b/modules/contrib/include/opencv2/contrib/contrib.hpp
index 65da22c..e600583 100644 (file)
--- a/modules/contrib/include/opencv2/contrib/contrib.hpp
+++ b/modules/contrib/include/opencv2/contrib/contrib.hpp
@@ -916,6 +916,9 @@ namespace cv
         // Trains a FaceRecognizer.
         CV_WRAP virtual void train(InputArrayOfArrays src, InputArray labels) = 0;
 
+        // Updates a FaceRecognizer.
+        CV_WRAP virtual void update(InputArrayOfArrays src, InputArray labels);
+
         // Gets a prediction from a FaceRecognizer.
         virtual int predict(InputArray src) const = 0;
 
@@ -933,9 +936,7 @@ namespace cv
 
         // Deserializes this object from a given cv::FileStorage.
         virtual void load(const FileStorage& fs) = 0;
-        
-        // Updates a FaceRecognizer.
-        CV_WRAP virtual void update(InputArrayOfArrays src, InputArray labels);
+
     };
 
     CV_EXPORTS_W Ptr<FaceRecognizer> createEigenFaceRecognizer(int num_components = 0, double threshold = DBL_MAX);

diff --git a/modules/ml/include/opencv2/ml/ml.hpp b/modules/ml/include/opencv2/ml/ml.hpp
index eaa4bde..7ba97c8 100644 (file)
--- a/modules/ml/include/opencv2/ml/ml.hpp
+++ b/modules/ml/include/opencv2/ml/ml.hpp
@@ -505,7 +505,7 @@ public:
                             CvParamGrid degreeGrid = CvSVM::get_default_grid(CvSVM::DEGREE),
                             bool balanced=false);
     CV_WRAP virtual float predict( const cv::Mat& sample, bool returnDFVal=false ) const;
-    CV_WRAP_AS(predict_all) void predict( cv::InputArray samples, cv::OutputArray results ) const;
+    CV_WRAP_AS(predict_all) virtual void predict( cv::InputArray samples, cv::OutputArray results ) const;
 
     CV_WRAP virtual int get_support_vector_count() const;
     virtual const float* get_support_vector(int i) const;
@@ -2080,6 +2080,8 @@ protected:
     CvMat* var_idx_out; // mat
     CvMat* var_types_out; // mat
 
+    int header_lines_number;
+
     int response_idx;
 
     int train_sample_count;
@@ -2093,8 +2095,6 @@ protected:
     int* sample_idx; // data of train_sample_idx and test_sample_idx
 
     cv::RNG* rng;
-    
-    int header_lines_number;
 };
 
 

diff --git a/modules/objdetect/include/opencv2/objdetect/objdetect.hpp b/modules/objdetect/include/opencv2/objdetect/objdetect.hpp
index 644599c..b75798c 100644 (file)
--- a/modules/objdetect/include/opencv2/objdetect/objdetect.hpp
+++ b/modules/objdetect/include/opencv2/objdetect/objdetect.hpp
@@ -596,22 +596,21 @@ public:
     CV_PROP int nlevels;
 
 
-    // evaluate specified ROI and return confidence value for each location
-    void detectROI(const cv::Mat& img, const vector<cv::Point> &locations,
-                   CV_OUT std::vector<cv::Point>& foundLocations,
-                   CV_OUT std::vector<double>& confidences,
-                   double hitThreshold = 0, cv::Size winStride = Size(),
-                   cv::Size padding = Size()) const;
-
-    // evaluate specified ROI and return confidence value for each location in multiple scales
-    void detectMultiScaleROI(const cv::Mat& img,
-                             CV_OUT std::vector<cv::Rect>& foundLocations,
-                             std::vector<DetectionROI>& locations,
-                             double hitThreshold = 0,
-                             int groupThreshold = 0) const;
-
-    // read/parse Dalal's alt model file
-    void readALTModel(std::string modelfile);
+   // evaluate specified ROI and return confidence value for each location
+   virtual void detectROI(const cv::Mat& img, const vector<cv::Point> &locations,
+                                   CV_OUT std::vector<cv::Point>& foundLocations, CV_OUT std::vector<double>& confidences,
+                                   double hitThreshold = 0, cv::Size winStride = Size(),
+                                   cv::Size padding = Size()) const;
+
+   // evaluate specified ROI and return confidence value for each location in multiple scales
+   virtual void detectMultiScaleROI(const cv::Mat& img,
+                                                       CV_OUT std::vector<cv::Rect>& foundLocations,
+                                                       std::vector<DetectionROI>& locations,
+                                                       double hitThreshold = 0,
+                                                       int groupThreshold = 0) const;
+
+   // read/parse Dalal's alt model file
+   void readALTModel(std::string modelfile);
 };