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

This reverts commit 618fbf5508.
This commit is contained in:
Andrey Kamaev
2012-10-16 19:35:57 +04:00
parent 18ab16dbd3
commit e7b81688a4
3 changed files with 20 additions and 20 deletions

View File

@@ -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;
};