Merge pull request #1348 from SpecLad:merge-2.4
This commit is contained in:
@@ -1857,4 +1857,3 @@ bool CvERTrees::train( const Mat& _train_data, int _tflag,
|
||||
}
|
||||
|
||||
// End of file.
|
||||
|
||||
|
@@ -116,7 +116,7 @@ bool CvKNearest::train( const CvMat* _train_data, const CvMat* _responses,
|
||||
|
||||
if( !responses )
|
||||
CV_ERROR( CV_StsNoMem, "Could not allocate memory for responses" );
|
||||
|
||||
|
||||
if( _update_base && _dims != var_count )
|
||||
CV_ERROR( CV_StsBadArg, "The newly added data have different dimensionality" );
|
||||
|
||||
@@ -480,4 +480,3 @@ float CvKNearest::find_nearest( const cv::Mat& _samples, int k, CV_OUT cv::Mat&
|
||||
}
|
||||
|
||||
/* End of file */
|
||||
|
||||
|
@@ -623,4 +623,3 @@ float CvNormalBayesClassifier::predict( const Mat& _samples, Mat* _results ) con
|
||||
}
|
||||
|
||||
/* End of file. */
|
||||
|
||||
|
@@ -2998,4 +2998,3 @@ cvTrainSVM_CrossValidation( const CvMat* train_data, int tflag,
|
||||
#endif
|
||||
|
||||
/* End of file. */
|
||||
|
||||
|
Reference in New Issue
Block a user