1
0
mirror of https://github.com/opencv/opencv.git synced 2026-07-30 07:43:03 +04:00

Merge branch 2.4

This commit is contained in:
Andrey Kamaev
2013-02-04 17:15:55 +04:00
33 changed files with 448 additions and 318 deletions
+3 -4
View File
@@ -309,10 +309,9 @@ BRISK::generateKernel(std::vector<float> &radiusList, std::vector<int> &numberLi
{
indexChange.resize(points_ * (points_ - 1) / 2);
indSize = (unsigned int)indexChange.size();
}
for (unsigned int i = 0; i < indSize; i++)
{
indexChange[i] = i;
for (unsigned int i = 0; i < indSize; i++)
indexChange[i] = i;
}
const float dMin_sq = dMin_ * dMin_;
const float dMax_sq = dMax_ * dMax_;