From 84c99906325ad2582b1f3a4fd222136a8f03615c Mon Sep 17 00:00:00 2001 From: Maria Dimashova Date: Wed, 28 Mar 2012 15:45:14 +0000 Subject: [PATCH] fixed cvKMeans2 (#1359) --- modules/core/src/matrix.cpp | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/modules/core/src/matrix.cpp b/modules/core/src/matrix.cpp index d1ea8f6755..4fb901db2c 100644 --- a/modules/core/src/matrix.cpp +++ b/modules/core/src/matrix.cpp @@ -2821,7 +2821,14 @@ cvKMeans2( const CvArr* _samples, int cluster_count, CvArr* _labels, if( _centers ) { centers = cv::cvarrToMat(_centers); + centers = centers.reshape(1); + data = data.reshape(1); + + CV_Assert( !centers.empty() ); + CV_Assert( centers.rows == cluster_count ); + CV_Assert( centers.cols == data.cols ); + CV_Assert( centers.depth() == data.depth() ); } CV_Assert( labels.isContinuous() && labels.type() == CV_32S && (labels.cols == 1 || labels.rows == 1) &&