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

renamed device -> cuda

Browse Source
This commit is contained in:
Vladislav Vinogradov
2013-04-03 16:04:04 +04:00
parent a57707b8d8
commit 28b1e81883
136 changed files with 762 additions and 780 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -53,7 +53,7 @@ void cv::gpu::calcWobbleSuppressionMaps(
#else
namespace cv { namespace gpu { namespace device { namespace globmotion {
namespace cv { namespace gpu { namespace cuda { namespace globmotion {
int compactPoints(int N, float *points0, float *points1, const uchar *mask);
@@ -70,7 +70,7 @@ void cv::gpu::compactPoints(GpuMat &points0, GpuMat &points1, const GpuMat &mask
CV_Assert(points0.cols == mask.cols && points1.cols == mask.cols);
int npoints = points0.cols;
int remaining = cv::gpu::device::globmotion::compactPoints(
int remaining = cv::gpu::cuda::globmotion::compactPoints(
npoints, (float*)points0.data, (float*)points1.data, mask.data);
points0 = points0.colRange(0, remaining);
@@ -88,7 +88,7 @@ void cv::gpu::calcWobbleSuppressionMaps(
mapx.create(size, CV_32F);
mapy.create(size, CV_32F);
cv::gpu::device::globmotion::calcWobbleSuppressionMaps(
cv::gpu::cuda::globmotion::calcWobbleSuppressionMaps(
left, idx, right, size.width, size.height,
ml.ptr<float>(), mr.ptr<float>(), mapx, mapy);
}