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

renamed cuda namespace to cudev

Browse Source
This commit is contained in:
Vladislav Vinogradov
2013-04-04 15:36:22 +04:00
parent 1bb141c465
commit 910ef57109
130 changed files with 592 additions and 594 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
modules/gpu/src/orb.cpp
View File

@@ -62,7 +62,7 @@ void cv::gpu::ORB_GPU::mergeKeyPoints(GpuMat&) { throw_no_cuda(); }
#else /* !defined (HAVE_CUDA) */
namespace cv { namespace gpu { namespace cuda
namespace cv { namespace gpu { namespace cudev
{
namespace orb
{
@@ -431,7 +431,7 @@ cv::gpu::ORB_GPU::ORB_GPU(int nFeatures, float scaleFactor, int nLevels, int edg
++v_0;
}
CV_Assert(u_max.size() < 32);
cv::gpu::cuda::orb::loadUMax(&u_max[0], static_cast<int>(u_max.size()));
cv::gpu::cudev::orb::loadUMax(&u_max[0], static_cast<int>(u_max.size()));
// Calc pattern
const int npoints = 512;
@@ -543,7 +543,7 @@ namespace
//takes keypoints and culls them by the response
void cull(GpuMat& keypoints, int& count, int n_points)
{
using namespace cv::gpu::cuda::orb;
using namespace cv::gpu::cudev::orb;
//this is only necessary if the keypoints size is greater than the number of desired points.
if (count > n_points)
@@ -561,7 +561,7 @@ namespace
void cv::gpu::ORB_GPU::computeKeyPointsPyramid()
{
using namespace cv::gpu::cuda::orb;
using namespace cv::gpu::cudev::orb;
int half_patch_size = patchSize_ / 2;
@@ -604,7 +604,7 @@ void cv::gpu::ORB_GPU::computeKeyPointsPyramid()
void cv::gpu::ORB_GPU::computeDescriptors(GpuMat& descriptors)
{
using namespace cv::gpu::cuda::orb;
using namespace cv::gpu::cudev::orb;
int nAllkeypoints = 0;
@@ -644,7 +644,7 @@ void cv::gpu::ORB_GPU::computeDescriptors(GpuMat& descriptors)
void cv::gpu::ORB_GPU::mergeKeyPoints(GpuMat& keypoints)
{
using namespace cv::gpu::cuda::orb;
using namespace cv::gpu::cudev::orb;
int nAllkeypoints = 0;