third_party/opencv
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #17724 from pemmanuelviel:pev--fix-mix-of-types

Browse Source
This commit is contained in:
Alexander Alekhin 2020-07-04 17:16:57 +00:00
commit deaf1dd458
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
modules/flann/include/opencv2/flann/kmeans_index.h
View File

@ -725,15 +725,6 @@ private:
} }
cv::AutoBuffer<double> dcenters_buf(branching*veclen_);
Matrix<double> dcenters(dcenters_buf.data(), branching, veclen_);
for (int i=0; i<centers_length; ++i) {
ElementType* vec = dataset_[centers_idx[i]];
for (size_t k=0; k<veclen_; ++k) {
dcenters[i][k] = double(vec[k]);
}
}
std::vector<DistanceType> radiuses(branching); std::vector<DistanceType> radiuses(branching);
cv::AutoBuffer<int> count_buf(branching); cv::AutoBuffer<int> count_buf(branching);
int* count = count_buf.data(); int* count = count_buf.data();
@ -747,10 +738,10 @@ private:
int* belongs_to = belongs_to_buf.data(); int* belongs_to = belongs_to_buf.data();
for (int i=0; i<indices_length; ++i) { for (int i=0; i<indices_length; ++i) {
DistanceType sq_dist = distance_(dataset_[indices[i]], dcenters[0], veclen_); DistanceType sq_dist = distance_(dataset_[indices[i]], dataset_[centers_idx[0]], veclen_);
belongs_to[i] = 0; belongs_to[i] = 0;
for (int j=1; j<branching; ++j) { for (int j=1; j<branching; ++j) {
DistanceType new_sq_dist = distance_(dataset_[indices[i]], dcenters[j], veclen_); DistanceType new_sq_dist = distance_(dataset_[indices[i]], dataset_[centers_idx[j]], veclen_);
if (sq_dist>new_sq_dist) { if (sq_dist>new_sq_dist) {
belongs_to[i] = j; belongs_to[i] = j;
sq_dist = new_sq_dist; sq_dist = new_sq_dist;
@ -762,6 +753,15 @@ private:
count[belongs_to[i]]++; count[belongs_to[i]]++;
} }
cv::AutoBuffer<double> dcenters_buf(branching*veclen_);
Matrix<double> dcenters(dcenters_buf.data(), branching, veclen_);
for (int i=0; i<centers_length; ++i) {
ElementType* vec = dataset_[centers_idx[i]];
for (size_t k=0; k<veclen_; ++k) {
dcenters[i][k] = double(vec[k]);
}
}
bool converged = false; bool converged = false;
int iteration = 0; int iteration = 0;
while (!converged && iteration<iterations_) { while (!converged && iteration<iterations_) {