From f6fc807d492fd943bd8691dafbb947e5757e5566 Mon Sep 17 00:00:00 2001 From: Alexey Spizhevoy Date: Thu, 5 May 2011 11:44:47 +0000 Subject: [PATCH] fixed some tests in gpu module --- modules/gpu/test/test_calib3d.cpp | 6 +++--- samples/gpu/performance/tests.cpp | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/modules/gpu/test/test_calib3d.cpp b/modules/gpu/test/test_calib3d.cpp index 37cda62201..180560f2d8 100644 --- a/modules/gpu/test/test_calib3d.cpp +++ b/modules/gpu/test/test_calib3d.cpp @@ -58,7 +58,7 @@ TEST(projectPoints, accuracy) camera_mat.at(2, 1) = 0.f; vector dst; - projectPoints(src, rvec, tvec, camera_mat, Mat::zeros(1, 5, CV_32F), dst); + projectPoints(src, rvec, tvec, camera_mat, Mat::zeros(1, 8, CV_32F), dst); GpuMat 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); vector image_vec; - projectPoints(object, rvec_gold, tvec_gold, camera_mat, Mat::zeros(1, 5, CV_32F), image_vec); + projectPoints(object, rvec_gold, tvec_gold, camera_mat, Mat::zeros(1, 8, CV_32F), image_vec); Mat image(1, image_vec.size(), CV_32FC2, &image_vec[0]); Mat rvec, tvec; vector inliers; - gpu::solvePnPRansac(object, image, camera_mat, Mat::zeros(1, 5, CV_32F), rvec, tvec, false, 200, 2.f, 100, &inliers); + gpu::solvePnPRansac(object, image, camera_mat, Mat::zeros(1, 8, CV_32F), rvec, tvec, false, 200, 2.f, 100, &inliers); ASSERT_LE(norm(rvec - rvec_gold), 1e-3f); ASSERT_LE(norm(tvec - tvec_gold), 1e-3f); diff --git a/samples/gpu/performance/tests.cpp b/samples/gpu/performance/tests.cpp index d9c295df33..aeee12d230 100644 --- a/samples/gpu/performance/tests.cpp +++ b/samples/gpu/performance/tests.cpp @@ -770,7 +770,7 @@ TEST(projectPoints) dst.resize(size); CPU_ON; - projectPoints(src, rvec, tvec, camera_mat, Mat::zeros(1, 5, CV_32F), dst); + projectPoints(src, rvec, tvec, camera_mat, Mat::zeros(1, 8, CV_32F), dst); CPU_OFF; d_src = src; @@ -814,12 +814,12 @@ TEST(solvePnPRansac) vector inliers_cpu, inliers_gpu; CPU_ON; - solvePnPRansac(object, image, camera_mat, Mat::zeros(1, 5, CV_32F), rvec, tvec, false, num_iters, + solvePnPRansac(object, image, camera_mat, Mat::zeros(1, 8, CV_32F), rvec, tvec, false, num_iters, max_dist, int(num_points * 0.05), inliers_cpu); CPU_OFF; GPU_ON; - gpu::solvePnPRansac(object, image, camera_mat, Mat::zeros(1, 5, CV_32F), rvec, tvec, false, num_iters, + gpu::solvePnPRansac(object, image, camera_mat, Mat::zeros(1, 8, CV_32F), rvec, tvec, false, num_iters, max_dist, int(num_points * 0.05), &inliers_gpu); GPU_OFF; }