fixed kmeans center initialization in the case of huge matrices (ticket #1291); fixed warinings in libtiff.

2011-08-11 22:27:18 +00:00
parent 1e6f1cc15c
commit 6942799669
2 changed files with 3 additions and 3 deletions
--- a/modules/core/src/matrix.cpp
+++ b/modules/core/src/matrix.cpp
@@ -2205,7 +2205,7 @@ static void generateCentersPP(const Mat& _data, Mat& _out_centers,
 {
    int i, j, k, dims = _data.cols, N = _data.rows;
    const float* data = _data.ptr<float>(0);
-    int step = (int)(_data.step/sizeof(data[0]));
+    size_t step = _data.step/sizeof(data[0]);
    vector<int> _centers(K);
    int* centers = &_centers[0];
    vector<float> _dist(N*3);