third_party/opencv
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/3.4' into merge-3.4

Browse Source
This commit is contained in:
Alexander Alekhin
2019-05-28 19:41:48 +03:00
committed by Alexander Alekhin
parent ed96864892 0d477d7364
commit 43467a2ac7
56 changed files with 2025 additions and 1195 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/calib3d/misc/java/gen_dict.json
-15
View File
@@ -2,21 +2,6 @@
"class_ignore_list": [
"CirclesGridFinderParameters"
],
"missing_consts" : {
"Calib3d": {
"public" : [
["CALIB_USE_INTRINSIC_GUESS", "1"],
["CALIB_RECOMPUTE_EXTRINSIC", "2"],
["CALIB_CHECK_COND", "4"],
["CALIB_FIX_SKEW", "8"],
["CALIB_FIX_K1", "16"],
["CALIB_FIX_K2", "32"],
["CALIB_FIX_K3", "64"],
["CALIB_FIX_K4", "128"],
["CALIB_FIX_INTRINSIC", "256"]
]
}
},
"namespaces_dict": {
"cv.fisheye": "fisheye"
},
modules/calib3d/misc/java/test/Calib3dTest.java
+31 -3
View File
@@ -187,7 +187,7 @@ public class Calib3dTest extends OpenCVTestCase {
Size patternSize = new Size(9, 6);
MatOfPoint2f corners = new MatOfPoint2f();
Calib3d.findChessboardCorners(grayChess, patternSize, corners);
assertTrue(!corners.empty());
assertFalse(corners.empty());
}
public void testFindChessboardCornersMatSizeMatInt() {
@@ -195,7 +195,7 @@ public class Calib3dTest extends OpenCVTestCase {
MatOfPoint2f corners = new MatOfPoint2f();
Calib3d.findChessboardCorners(grayChess, patternSize, corners, Calib3d.CALIB_CB_ADAPTIVE_THRESH + Calib3d.CALIB_CB_NORMALIZE_IMAGE
+ Calib3d.CALIB_CB_FAST_CHECK);
assertTrue(!corners.empty());
assertFalse(corners.empty());
}
public void testFind4QuadCornerSubpix() {
@@ -204,7 +204,7 @@ public class Calib3dTest extends OpenCVTestCase {
Size region_size = new Size(5, 5);
Calib3d.findChessboardCorners(grayChess, patternSize, corners);
Calib3d.find4QuadCornerSubpix(grayChess, corners, region_size);
assertTrue(!corners.empty());
assertFalse(corners.empty());
}
public void testFindCirclesGridMatSizeMat() {
@@ -622,6 +622,34 @@ public class Calib3dTest extends OpenCVTestCase {
assertMatEqual(truth, lines, EPS);
}
public void testConstants()
{
// calib3d.hpp: some constants have conflict with constants from 'fisheye' namespace
assertEquals(1, Calib3d.CALIB_USE_INTRINSIC_GUESS);
assertEquals(2, Calib3d.CALIB_FIX_ASPECT_RATIO);
assertEquals(4, Calib3d.CALIB_FIX_PRINCIPAL_POINT);
assertEquals(8, Calib3d.CALIB_ZERO_TANGENT_DIST);
assertEquals(16, Calib3d.CALIB_FIX_FOCAL_LENGTH);
assertEquals(32, Calib3d.CALIB_FIX_K1);
assertEquals(64, Calib3d.CALIB_FIX_K2);
assertEquals(128, Calib3d.CALIB_FIX_K3);
assertEquals(0x0800, Calib3d.CALIB_FIX_K4);
assertEquals(0x1000, Calib3d.CALIB_FIX_K5);
assertEquals(0x2000, Calib3d.CALIB_FIX_K6);
assertEquals(0x4000, Calib3d.CALIB_RATIONAL_MODEL);
assertEquals(0x8000, Calib3d.CALIB_THIN_PRISM_MODEL);
assertEquals(0x10000, Calib3d.CALIB_FIX_S1_S2_S3_S4);
assertEquals(0x40000, Calib3d.CALIB_TILTED_MODEL);
assertEquals(0x80000, Calib3d.CALIB_FIX_TAUX_TAUY);
assertEquals(0x100000, Calib3d.CALIB_USE_QR);
assertEquals(0x200000, Calib3d.CALIB_FIX_TANGENT_DIST);
assertEquals(0x100, Calib3d.CALIB_FIX_INTRINSIC);
assertEquals(0x200, Calib3d.CALIB_SAME_FOCAL_LENGTH);
assertEquals(0x400, Calib3d.CALIB_ZERO_DISPARITY);
assertEquals((1 << 17), Calib3d.CALIB_USE_LU);
assertEquals((1 << 22), Calib3d.CALIB_USE_EXTRINSIC_GUESS);
}
public void testGetDefaultNewCameraMatrixMat() {
Mat mtx = Calib3d.getDefaultNewCameraMatrix(gray0);