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

fixed failing GPU projectPoints and solvePnPRansac tests

Browse Source
This commit is contained in:
Alexey Spizhevoy 2011-04-27 05:29:02 +00:00
parent d67e612f10
commit ce808af594
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
modules/gpu/test/test_calib3d.cpp
View File

@ -58,7 +58,7 @@ TEST(projectPoints, accuracy)
camera_mat.at<float>(2, 1) = 0.f; camera_mat.at<float>(2, 1) = 0.f;
vector<Point2f> dst; vector<Point2f> dst;
projectPoints(src, rvec, tvec, camera_mat, Mat(), dst); projectPoints(src, rvec, tvec, camera_mat, Mat::zeros(1, 5, CV_32F), dst);
GpuMat d_dst; GpuMat d_dst;
projectPoints(GpuMat(src), rvec, tvec, camera_mat, Mat(), d_dst); projectPoints(GpuMat(src), rvec, tvec, camera_mat, Mat(), d_dst);
@ -123,12 +123,12 @@ TEST(solvePnPRansac, accuracy)
Mat tvec_gold = randomMat(rng, Size(3, 1), CV_32F, 0, 1, false); Mat tvec_gold = randomMat(rng, Size(3, 1), CV_32F, 0, 1, false);
vector<Point2f> image_vec; vector<Point2f> image_vec;
projectPoints(object, rvec_gold, tvec_gold, camera_mat, Mat(), image_vec); projectPoints(object, rvec_gold, tvec_gold, camera_mat, Mat::zeros(1, 5, CV_32F), image_vec);
Mat image(1, image_vec.size(), CV_32FC2, &image_vec[0]); Mat image(1, image_vec.size(), CV_32FC2, &image_vec[0]);
Mat rvec, tvec; Mat rvec, tvec;
vector<int> inliers; vector<int> inliers;
gpu::solvePnPRansac(object, image, camera_mat, Mat(), rvec, tvec, false, 200, 2.f, 100, &inliers); gpu::solvePnPRansac(object, image, camera_mat, Mat::zeros(1, 5, CV_32F), rvec, tvec, false, 200, 2.f, 100, &inliers);
ASSERT_LE(norm(rvec - rvec_gold), 1e-3f); ASSERT_LE(norm(rvec - rvec_gold), 1e-3f);
ASSERT_LE(norm(tvec - tvec_gold), 1e-3f); ASSERT_LE(norm(tvec - tvec_gold), 1e-3f);

6
samples/gpu/performance/tests.cpp
View File

@ -770,7 +770,7 @@ TEST(projectPoints)
dst.resize(size); dst.resize(size);
CPU_ON; CPU_ON;
projectPoints(src, rvec, tvec, camera_mat, Mat(), dst); projectPoints(src, rvec, tvec, camera_mat, Mat::zeros(1, 5, CV_32F), dst);
CPU_OFF; CPU_OFF;
d_src = src; d_src = src;
@ -814,12 +814,12 @@ TEST(solvePnPRansac)
vector<int> inliers_cpu, inliers_gpu; vector<int> inliers_cpu, inliers_gpu;
CPU_ON; CPU_ON;
solvePnPRansac(object, image, camera_mat, Mat(), rvec, tvec, false, num_iters, solvePnPRansac(object, image, camera_mat, Mat::zeros(1, 5, CV_32F), rvec, tvec, false, num_iters,
max_dist, int(num_points * 0.05), inliers_cpu); max_dist, int(num_points * 0.05), inliers_cpu);
CPU_OFF; CPU_OFF;
GPU_ON; GPU_ON;
gpu::solvePnPRansac(object, image, camera_mat, Mat(), rvec, tvec, false, num_iters, gpu::solvePnPRansac(object, image, camera_mat, Mat::zeros(1, 5, CV_32F), rvec, tvec, false, num_iters,
max_dist, int(num_points * 0.05), &inliers_gpu); max_dist, int(num_points * 0.05), &inliers_gpu);
GPU_OFF; GPU_OFF;
} }