generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixed broken alignment

Browse Source
This commit is contained in:
Cosmin Boaca 2014-01-30 13:37:53 +02:00
parent e6f86ea39d
commit 2cd22a3ca3
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
modules/ml/src/nbayes.cpp
View File

@ -404,22 +404,22 @@ float CvNormalBayesClassifier::predict( const CvMat* samples, CvMat* results, Cv
if( results ) if( results )
{ {
if( !CV_IS_MAT(results) || (CV_MAT_TYPE(results->type) != CV_32FC1 && if( !CV_IS_MAT(results) || (CV_MAT_TYPE(results->type) != CV_32FC1 &&
CV_MAT_TYPE(results->type) != CV_32SC1) || CV_MAT_TYPE(results->type) != CV_32SC1) ||
(results->cols != 1 && results->rows != 1) || (results->cols != 1 && results->rows != 1) ||
results->cols + results->rows - 1 != samples->rows ) results->cols + results->rows - 1 != samples->rows )
CV_Error( CV_StsBadArg, "The output array must be integer or floating-point vector " CV_Error( CV_StsBadArg, "The output array must be integer or floating-point vector "
"with the number of elements = number of rows in the input matrix" ); "with the number of elements = number of rows in the input matrix" );
} }
if( results_prob ) if( results_prob )
{ {
if( !CV_IS_MAT(results_prob) || (CV_MAT_TYPE(results_prob->type) != CV_32FC1 && if( !CV_IS_MAT(results_prob) || (CV_MAT_TYPE(results_prob->type) != CV_32FC1 &&
CV_MAT_TYPE(results_prob->type) != CV_64FC1) || CV_MAT_TYPE(results_prob->type) != CV_64FC1) ||
(results_prob->cols != 1 && results_prob->rows != 1) || (results_prob->cols != 1 && results_prob->rows != 1) ||
results_prob->cols + results_prob->rows - 1 != samples->rows ) results_prob->cols + results_prob->rows - 1 != samples->rows )
CV_Error( CV_StsBadArg, "The output array must be double or float vector " CV_Error( CV_StsBadArg, "The output array must be double or float vector "
"with the number of elements = number of rows in the input matrix" ); "with the number of elements = number of rows in the input matrix" );
} }
const int* vidx = var_idx ? var_idx->data.i : 0; const int* vidx = var_idx ? var_idx->data.i : 0;