Merge remote-tracking branch 'origin/2.4' into merge-2.4

This commit is contained in:
Roman Donchenko 2014-05-26 12:32:14 +04:00
commit 0a2d22bf31
2 changed files with 9 additions and 7 deletions

View File

@ -15,7 +15,15 @@ Finds centers of clusters and groups input samples around the clusters.
:param samples: Floating-point matrix of input samples, one row per sample.
:param data: Data for clustering.
:param data: Data for clustering. An array of N-Dimensional points with float coordinates is needed. Examples of this array can be:
* ``Mat points(count, 2, CV_32F);``
* ``Mat points(count, 1, CV_32FC2);``
* ``Mat points(1, count, CV_32FC2);``
* ``std::vector<cv::Point2f> points(sampleCount);``
:param cluster_count: Number of clusters to split the set by.

View File

@ -333,12 +333,6 @@ void CvCalibFilter::Stop( bool calibrate )
points[0],points[1],
buffer,
&stereo);
for( i = 0; i < 9; i++ )
{
stereo.fundMatr[i] = stereo.fundMatr[i];
}
}
}