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

fixed SURF_GPU bug (features count > max dimension of grid)

Browse Source 
minor gpu docs fixes
This commit is contained in:
Vladislav Vinogradov
2011-03-28 10:34:44 +00:00
parent d0e66f7766
commit 57195e9627
6 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
modules/gpu/src/surf.cpp
View File

@@ -101,9 +101,9 @@ namespace
CV_Assert(nOctaves > 0 && nOctaveLayers > 0);
CV_Assert(TargetArchs::builtWith(GLOBAL_ATOMICS) && DeviceInfo().supports(GLOBAL_ATOMICS));
maxKeypoints = static_cast<int>(img.size().area() * surf.keypointsRatio);
maxFeatures = static_cast<int>(1.5 * maxKeypoints);
maxCandidates = static_cast<int>(1.5 * maxFeatures);
maxKeypoints = min(static_cast<int>(img.size().area() * surf.keypointsRatio), 65535);
maxFeatures = min(static_cast<int>(1.5 * maxKeypoints), 65535);
maxCandidates = min(static_cast<int>(1.5 * maxFeatures), 65535);
CV_Assert(maxKeypoints > 0);