fixed failing GPU projectPoints and solvePnPRansac tests

diff --git a/modules/gpu/test/test_calib3d.cpp b/modules/gpu/test/test_calib3d.cpp
index d5f660620335766ad33eddafeaae67dea4a68845..37cda6220168489fed2d28a893e2e13953f71010 100644 (file)
--- a/modules/gpu/test/test_calib3d.cpp
+++ b/modules/gpu/test/test_calib3d.cpp
@@ -58,7 +58,7 @@ TEST(projectPoints, accuracy)
     camera_mat.at<float>(2, 1) = 0.f;
 
     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;
     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<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 rvec, tvec;
     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(tvec - tvec_gold), 1e-3f);

diff --git a/samples/gpu/performance/tests.cpp b/samples/gpu/performance/tests.cpp
index a4a5384a3a66210ce15f11d4dad358d4c23a62c1..d9c295df3371d2b2868a1f6f61926e2650fb85d8 100644 (file)
--- a/samples/gpu/performance/tests.cpp
+++ b/samples/gpu/performance/tests.cpp
@@ -770,7 +770,7 @@ TEST(projectPoints)
         dst.resize(size);\r
 \r
         CPU_ON;\r
-        projectPoints(src, rvec, tvec, camera_mat, Mat(), dst);\r
+        projectPoints(src, rvec, tvec, camera_mat, Mat::zeros(1, 5, CV_32F), dst);\r
         CPU_OFF;\r
 \r
         d_src = src;\r
@@ -814,13 +814,13 @@ TEST(solvePnPRansac)
         vector<int> inliers_cpu, inliers_gpu;\r
 \r
         CPU_ON;\r
-        solvePnPRansac(object, image, camera_mat, Mat(), rvec, tvec, false, num_iters, \r
+        solvePnPRansac(object, image, camera_mat, Mat::zeros(1, 5, CV_32F), rvec, tvec, false, num_iters,\r
                        max_dist, int(num_points * 0.05), inliers_cpu);\r
         CPU_OFF;\r
 \r
         GPU_ON;\r
-        gpu::solvePnPRansac(object, image, camera_mat, Mat(), rvec, tvec, false, num_iters,\r
+        gpu::solvePnPRansac(object, image, camera_mat, Mat::zeros(1, 5, CV_32F), rvec, tvec, false, num_iters,\r
                             max_dist, int(num_points * 0.05), &inliers_gpu);\r
         GPU_OFF;\r
     }\r
-}
\ No newline at end of file
+}\r