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

fixed build on VS2010

Browse Source
This commit is contained in:
Vadim Pisarevsky 2012-03-15 15:38:54 +00:00
parent 10b0f29372
commit 2d1ef5eea8
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
modules/features2d/src/orb.cpp
View File

@ -57,7 +57,7 @@ HarrisResponses(const Mat& img, vector<KeyPoint>& pts, int blockSize, float harr
size_t ptidx, ptsize = pts.size(); size_t ptidx, ptsize = pts.size();
const uchar* ptr00 = img.ptr<uchar>(); const uchar* ptr00 = img.ptr<uchar>();
size_t step = img.step/img.elemSize1(); int step = (int)(img.step/img.elemSize1());
int r = blockSize/2; int r = blockSize/2;
float scale = (1 << 2) * blockSize * 255.0f; float scale = (1 << 2) * blockSize * 255.0f;
@ -662,7 +662,7 @@ static void computeKeyPoints(const vector<Mat>& imagePyramid,
int v, v0, vmax = cvFloor(halfPatchSize * sqrt(2.f) / 2 + 1); int v, v0, vmax = cvFloor(halfPatchSize * sqrt(2.f) / 2 + 1);
int vmin = cvCeil(halfPatchSize * sqrt(2.f) / 2); int vmin = cvCeil(halfPatchSize * sqrt(2.f) / 2);
for (v = 0; v <= vmax; ++v) for (v = 0; v <= vmax; ++v)
umax[v] = cvRound(sqrt(halfPatchSize * halfPatchSize - v * v)); umax[v] = cvRound(sqrt((double)halfPatchSize * halfPatchSize - v * v));
// Make sure we are symmetric // Make sure we are symmetric
for (v = halfPatchSize, v0 = 0; v >= vmin; --v) for (v = halfPatchSize, v0 = 0; v >= vmin; --v)