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

Fixed cluster centers returning in cvKMeans2 (ticket #706)

Browse Source
This commit is contained in:
Ilya Lysenkov 2011-06-01 12:06:39 +00:00
parent f906c9b259
commit 29b45e70bd
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
modules/core/src/matrix.cpp
View File

@ -2586,7 +2586,10 @@ cvKMeans2( const CvArr* _samples, int cluster_count, CvArr* _labels,
{ {
cv::Mat data = cv::cvarrToMat(_samples), labels = cv::cvarrToMat(_labels), centers; cv::Mat data = cv::cvarrToMat(_samples), labels = cv::cvarrToMat(_labels), centers;
if( _centers ) if( _centers )
{
centers = cv::cvarrToMat(_centers); centers = cv::cvarrToMat(_centers);
centers = centers.reshape(1);
}
CV_Assert( labels.isContinuous() && labels.type() == CV_32S && CV_Assert( labels.isContinuous() && labels.type() == CV_32S &&
(labels.cols == 1 || labels.rows == 1) && (labels.cols == 1 || labels.rows == 1) &&
labels.cols + labels.rows - 1 == data.rows ); labels.cols + labels.rows - 1 == data.rows );