From 8782eb8657985786898820216e4f6030a402f1ba Mon Sep 17 00:00:00 2001 From: Cosmin Boaca Date: Thu, 30 Jan 2014 16:41:38 +0200 Subject: [PATCH] Fixed alignment --- modules/ml/src/nbayes.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/modules/ml/src/nbayes.cpp b/modules/ml/src/nbayes.cpp index b37f4a4c5..589d172aa 100644 --- a/modules/ml/src/nbayes.cpp +++ b/modules/ml/src/nbayes.cpp @@ -404,20 +404,20 @@ float CvNormalBayesClassifier::predict( const CvMat* samples, CvMat* results, Cv if( results ) { - if( !CV_IS_MAT(results) || (CV_MAT_TYPE(results->type) != CV_32FC1 && - CV_MAT_TYPE(results->type) != CV_32SC1) || - (results->cols != 1 && results->rows != 1) || - results->cols + results->rows - 1 != samples->rows ) + if( !CV_IS_MAT(results) || (CV_MAT_TYPE(results->type) != CV_32FC1 && + CV_MAT_TYPE(results->type) != CV_32SC1) || + (results->cols != 1 && results->rows != 1) || + results->cols + results->rows - 1 != samples->rows ) 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" ); } 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) || - (results_prob->cols != 1 && results_prob->rows != 1) || - results_prob->cols + results_prob->rows - 1 != samples->rows ) + (results_prob->cols != 1 && results_prob->rows != 1) || + results_prob->cols + results_prob->rows - 1 != samples->rows ) 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" ); }