From 93aa94e71ef29cad2622be394ecb4c0233ab57eb Mon Sep 17 00:00:00 2001 From: Rostislav Vasilikhin Date: Sat, 24 Dec 2022 04:08:43 +0100 Subject: [PATCH] backported changes no lambda whitespace fixing build Java tests --- .../calib3d/misc/java/test/Calib3dTest.java | 8 +- modules/calib3d/src/fisheye.cpp | 4 +- modules/calib3d/test/test_fisheye.cpp | 74 ++++++++++++------- 3 files changed, 53 insertions(+), 33 deletions(-) diff --git a/modules/calib3d/misc/java/test/Calib3dTest.java b/modules/calib3d/misc/java/test/Calib3dTest.java index ae5377efc5..7d89cc9bd1 100644 --- a/modules/calib3d/misc/java/test/Calib3dTest.java +++ b/modules/calib3d/misc/java/test/Calib3dTest.java @@ -699,10 +699,10 @@ public class Calib3dTest extends OpenCVTestCase { D.put(2,0,-0.021509225493198905); D.put(3,0,0.0043378096628297145); - K_new_truth.put(0,0, 387.4809086880343); - K_new_truth.put(0,2, 1036.669802754649); - K_new_truth.put(1,1, 373.6375700303157); - K_new_truth.put(1,2, 538.8373261247601); + K_new_truth.put(0,0, 387.5118215642316); + K_new_truth.put(0,2, 1033.936556777084); + K_new_truth.put(1,1, 373.6673784974842); + K_new_truth.put(1,2, 538.794152656429); Calib3d.fisheye_estimateNewCameraMatrixForUndistortRectify(K,D,new Size(1920,1080), new Mat().eye(3, 3, CvType.CV_64F), K_new, 0.0, new Size(1920,1080)); diff --git a/modules/calib3d/src/fisheye.cpp b/modules/calib3d/src/fisheye.cpp index 56fd82114d..a562bd2bb2 100644 --- a/modules/calib3d/src/fisheye.cpp +++ b/modules/calib3d/src/fisheye.cpp @@ -388,7 +388,7 @@ void cv::fisheye::undistortPoints( InputArray distorted, OutputArray undistorted if (theta_d > 1e-8) { - // compensate distortion iteratively + // compensate distortion iteratively using Newton method double theta = theta_d; const double EPS = 1e-8; // or std::numeric_limits::epsilon(); @@ -572,7 +572,7 @@ void cv::fisheye::estimateNewCameraMatrixForUndistortRectify(InputArray K, Input : K.getMat().at(0,0)/K.getMat().at(1,1); // convert to identity ratio - cn[0] *= aspect_ratio; + cn[1] *= aspect_ratio; for(size_t i = 0; i < points.total(); ++i) pptr[i][1] *= aspect_ratio; diff --git a/modules/calib3d/test/test_fisheye.cpp b/modules/calib3d/test/test_fisheye.cpp index 58a79dcc88..2e12cd8985 100644 --- a/modules/calib3d/test/test_fisheye.cpp +++ b/modules/calib3d/test/test_fisheye.cpp @@ -101,6 +101,15 @@ TEST_F(fisheyeTest, projectPoints) EXPECT_MAT_NEAR(distorted0, distorted2, 1e-10); } +// we use it to reduce patch size for images in testdata +static void throwAwayHalf(Mat img) +{ + int whalf = img.cols / 2, hhalf = img.rows / 2; + Rect tl(0, 0, whalf, hhalf), br(whalf, hhalf, whalf, hhalf); + img(tl) = 0; + img(br) = 0; +}; + TEST_F(fisheyeTest, undistortImage) { cv::Matx33d theK = this->K; @@ -112,32 +121,41 @@ TEST_F(fisheyeTest, undistortImage) newK(0, 0) = 100; newK(1, 1) = 100; cv::fisheye::undistortImage(distorted, undistorted, theK, theD, newK); - cv::Mat correct = cv::imread(combine(datasets_repository_path, "new_f_100.png")); - if (correct.empty()) - CV_Assert(cv::imwrite(combine(datasets_repository_path, "new_f_100.png"), undistorted)); - else - EXPECT_MAT_NEAR(correct, undistorted, 1e-10); + std::string imageFilename = combine(datasets_repository_path, "new_f_100.png"); + cv::Mat correct = cv::imread(imageFilename); + ASSERT_FALSE(correct.empty()) << "Correct image " << imageFilename.c_str() << " can not be read" << std::endl; + + throwAwayHalf(correct); + throwAwayHalf(undistorted); + + EXPECT_MAT_NEAR(correct, undistorted, 1e-10); } { double balance = 1.0; cv::fisheye::estimateNewCameraMatrixForUndistortRectify(theK, theD, distorted.size(), cv::noArray(), newK, balance); cv::fisheye::undistortImage(distorted, undistorted, theK, theD, newK); - cv::Mat correct = cv::imread(combine(datasets_repository_path, "balance_1.0.png")); - if (correct.empty()) - CV_Assert(cv::imwrite(combine(datasets_repository_path, "balance_1.0.png"), undistorted)); - else - EXPECT_MAT_NEAR(correct, undistorted, 1e-10); + std::string imageFilename = combine(datasets_repository_path, "balance_1.0.png"); + cv::Mat correct = cv::imread(imageFilename); + ASSERT_FALSE(correct.empty()) << "Correct image " << imageFilename.c_str() << " can not be read" << std::endl; + + throwAwayHalf(correct); + throwAwayHalf(undistorted); + + EXPECT_MAT_NEAR(correct, undistorted, 1e-10); } { double balance = 0.0; cv::fisheye::estimateNewCameraMatrixForUndistortRectify(theK, theD, distorted.size(), cv::noArray(), newK, balance); cv::fisheye::undistortImage(distorted, undistorted, theK, theD, newK); - cv::Mat correct = cv::imread(combine(datasets_repository_path, "balance_0.0.png")); - if (correct.empty()) - CV_Assert(cv::imwrite(combine(datasets_repository_path, "balance_0.0.png"), undistorted)); - else - EXPECT_MAT_NEAR(correct, undistorted, 1e-10); + std::string imageFilename = combine(datasets_repository_path, "balance_0.0.png"); + cv::Mat correct = cv::imread(imageFilename); + ASSERT_FALSE(correct.empty()) << "Correct image " << imageFilename.c_str() << " can not be read" << std::endl; + + throwAwayHalf(correct); + throwAwayHalf(undistorted); + + EXPECT_MAT_NEAR(correct, undistorted, 1e-10); } } @@ -422,19 +440,19 @@ TEST_F(fisheyeTest, stereoRectify) 0.002076471801477729, 0.006463478587068991, 0.9999769555891836 ); cv::Matx34d P1_ref( - 420.8551870450913, 0, 586.501617798451, 0, - 0, 420.8551870450913, 374.7667511986098, 0, + 420.9684016542647, 0, 586.3059567784627, 0, + 0, 420.9684016542647, 374.8571836462291, 0, 0, 0, 1, 0 ); cv::Matx34d P2_ref( - 420.8551870450913, 0, 586.501617798451, -41.77758076597302, - 0, 420.8551870450913, 374.7667511986098, 0, + 420.9684016542647, 0, 586.3059567784627, -41.78881938824554, + 0, 420.9684016542647, 374.8571836462291, 0, 0, 0, 1, 0 ); cv::Matx44d Q_ref( - 1, 0, 0, -586.501617798451, - 0, 1, 0, -374.7667511986098, - 0, 0, 0, 420.8551870450913, + 1, 0, 0, -586.3059567784627, + 0, 1, 0, -374.8571836462291, + 0, 0, 0, 420.9684016542647, 0, 0, 10.07370889670733, -0 ); @@ -489,7 +507,9 @@ TEST_F(fisheyeTest, stereoRectify) cv::Mat rectification; merge4(l, r, lundist, rundist, rectification); - cv::imwrite(cv::format("fisheye_rectification_AB_%03d.png", i), rectification); + // Add the "--test_debug" to arguments for file output + if (cvtest::debugLevel > 0) + cv::imwrite(cv::format("fisheye_rectification_AB_%03d.png", i), rectification); } } @@ -683,13 +703,13 @@ TEST_F(fisheyeTest, estimateNewCameraMatrixForUndistortRectify) cv::Mat K_new_truth(3, 3, cv::DataType::type); - K_new_truth.at(0, 0) = 387.4809086880343; + K_new_truth.at(0, 0) = 387.5118215642316; K_new_truth.at(0, 1) = 0.0; - K_new_truth.at(0, 2) = 1036.669802754649; + K_new_truth.at(0, 2) = 1033.936556777084; K_new_truth.at(1, 0) = 0.0; - K_new_truth.at(1, 1) = 373.6375700303157; - K_new_truth.at(1, 2) = 538.8373261247601; + K_new_truth.at(1, 1) = 373.6673784974842; + K_new_truth.at(1, 2) = 538.794152656429; K_new_truth.at(2, 0) = 0.0; K_new_truth.at(2, 1) = 0.0;