potok/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2026-07-29 15:23:05 +04:00
Code Packages Releases Wiki Activity

Merge pull request #29101 from asmorkalov:as/geometry_module

Browse Source 
Moved geometry transformations from imgproc to 3d, future geometry module #29101

The first step of 2d geometry operations migration to the future geometry module.
I created 2d.hpp to isolate the moved functions for now. I propose to create geometry.hpp when the module is renamed and include all things there.

OpenCV contrib: https://github.com/opencv/opencv_contrib/pull/4126

### Pull Request Readiness Checklist

See details at https://github.com/opencv/opencv/wiki/How_to_contribute#making-a-good-pull-request

- [x] I agree to contribute to the project under Apache 2 License.
- [x] To the best of my knowledge, the proposed patch is not based on a code under GPL or another license that is incompatible with OpenCV
- [ ] The PR is proposed to the proper branch
- [ ] There is a reference to the original bug report and related work
- [ ] There is accuracy test, performance test and test data in opencv_extra repository, if applicable
      Patch to opencv_extra has the same branch name.
- [ ] The feature is well documented and sample code can be built with the project CMake
This commit is contained in:
Alexander Smorkalov
2026-05-28 21:09:52 +03:00
committed by GitHub
parent ccb808ba55
commit aac582119c
59 changed files with 1471 additions and 1415 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/imgproc/misc/java/test/ImgprocTest.java
-152
View File
@@ -145,21 +145,6 @@ public class ImgprocTest extends OpenCVTestCase {
assertEquals(src.rows(), Core.countNonZero(dst));
}
public void testApproxPolyDP() {
MatOfPoint2f curve = new MatOfPoint2f(new Point(1, 3), new Point(2, 4), new Point(3, 5), new Point(4, 4), new Point(5, 3));
MatOfPoint2f approxCurve = new MatOfPoint2f();
Imgproc.approxPolyDP(curve, approxCurve, EPS, true);
List<Point> approxCurveGold = new ArrayList<Point>(3);
approxCurveGold.add(new Point(1, 3));
approxCurveGold.add(new Point(3, 5));
approxCurveGold.add(new Point(5, 3));
assertListPointEquals(approxCurve.toList(), approxCurveGold, EPS);
}
public void testArcLength() {
MatOfPoint2f curve = new MatOfPoint2f(new Point(1, 3), new Point(2, 4), new Point(3, 5), new Point(4, 4), new Point(5, 3));
@@ -412,65 +397,6 @@ public class ImgprocTest extends OpenCVTestCase {
assertMatEqual(truthMap2, dstmap2);
}
public void testConvexHullMatMat() {
MatOfPoint points = new MatOfPoint(
new Point(20, 0),
new Point(40, 0),
new Point(30, 20),
new Point(0, 20),
new Point(20, 10),
new Point(30, 10)
);
MatOfInt hull = new MatOfInt();
Imgproc.convexHull(points, hull);
MatOfInt expHull = new MatOfInt(
0, 1, 2, 3
);
assertMatEqual(expHull, hull.reshape(1, (int)hull.total()), EPS);
}
public void testConvexHullMatMatBooleanBoolean() {
MatOfPoint points = new MatOfPoint(
new Point(2, 0),
new Point(4, 0),
new Point(3, 2),
new Point(0, 2),
new Point(2, 1),
new Point(3, 1)
);
MatOfInt hull = new MatOfInt();
Imgproc.convexHull(points, hull, true);
MatOfInt expHull = new MatOfInt(
3, 2, 1, 0
);
assertMatEqual(expHull, hull.reshape(1, hull.cols()), EPS);
}
public void testConvexityDefects() {
MatOfPoint points = new MatOfPoint(
new Point(20, 0),
new Point(40, 0),
new Point(30, 20),
new Point(0, 20),
new Point(20, 10),
new Point(30, 10)
);
MatOfInt hull = new MatOfInt();
Imgproc.convexHull(points, hull);
MatOfInt4 convexityDefects = new MatOfInt4();
Imgproc.convexityDefects(points, hull, convexityDefects);
assertMatEqual(new MatOfInt4(3, 0, 5, 3620), convexityDefects.reshape(4, convexityDefects.cols()));
}
public void testCornerEigenValsAndVecsMatMatIntInt() {
fail("Not yet implemented");
// TODO: write better test
@@ -791,33 +717,6 @@ public class ImgprocTest extends OpenCVTestCase {
*/
}
public void testFitEllipse() {
MatOfPoint2f points = new MatOfPoint2f(new Point(0, 0), new Point(-1, 1), new Point(1, 1), new Point(1, -1), new Point(-1, -1));
RotatedRect rrect = new RotatedRect();
rrect = Imgproc.fitEllipse(points);
double FIT_ELLIPSE_CENTER_EPS = 0.01;
double FIT_ELLIPSE_SIZE_EPS = 0.4;
assertEquals(0.0, rrect.center.x, FIT_ELLIPSE_CENTER_EPS);
assertEquals(0.0, rrect.center.y, FIT_ELLIPSE_CENTER_EPS);
assertEquals(2.828, rrect.size.width, FIT_ELLIPSE_SIZE_EPS);
assertEquals(2.828, rrect.size.height, FIT_ELLIPSE_SIZE_EPS);
}
public void testFitLine() {
Mat points = new Mat(1, 4, CvType.CV_32FC2);
points.put(0, 0, 0, 0, 2, 3, 3, 4, 5, 8);
Mat linePoints = new Mat(4, 1, CvType.CV_32FC1);
linePoints.put(0, 0, 0.53198653, 0.84675282, 2.5, 3.75);
Imgproc.fitLine(points, dst, Imgproc.DIST_L12, 0, 0.01, 0.01);
assertMatEqual(linePoints, dst, EPS);
}
public void testFloodFillMatMatPointScalar() {
Mat mask = new Mat(matSize + 2, matSize + 2, CvType.CV_8U, new Scalar(0));
Mat img = gray0;
@@ -1243,16 +1142,6 @@ public class ImgprocTest extends OpenCVTestCase {
assertMatEqual(truth, dst, EPS);
}
public void testIsContourConvex() {
MatOfPoint contour1 = new MatOfPoint(new Point(0, 0), new Point(10, 0), new Point(10, 10), new Point(5, 4));
assertFalse(Imgproc.isContourConvex(contour1));
MatOfPoint contour2 = new MatOfPoint(new Point(0, 0), new Point(10, 0), new Point(10, 10), new Point(5, 6));
assertTrue(Imgproc.isContourConvex(contour2));
}
public void testLaplacianMatMatInt() {
Imgproc.Laplacian(gray0, dst, CvType.CV_8U);
@@ -1282,17 +1171,6 @@ public class ImgprocTest extends OpenCVTestCase {
assertMatEqual(truth, dst, EPS);
}
public void testMatchShapes() {
Mat contour1 = new Mat(1, 4, CvType.CV_32FC2);
Mat contour2 = new Mat(1, 4, CvType.CV_32FC2);
contour1.put(0, 0, 1, 1, 5, 1, 4, 3, 6, 2);
contour2.put(0, 0, 1, 1, 6, 1, 4, 1, 2, 5);
double distance = Imgproc.matchShapes(contour1, contour2, Imgproc.CONTOURS_MATCH_I1, 1);
assertEquals(2.81109697365334, distance, EPS);
}
public void testMatchTemplate() {
Mat image = new Mat(imgprocSz, imgprocSz, CvType.CV_8U);
Mat templ = new Mat(imgprocSz, imgprocSz, CvType.CV_8U);
@@ -1319,27 +1197,6 @@ public class ImgprocTest extends OpenCVTestCase {
// TODO_: write better test
}
public void testMinAreaRect() {
MatOfPoint2f points = new MatOfPoint2f(new Point(1, 1), new Point(5, 1), new Point(4, 3), new Point(6, 2));
RotatedRect rrect = Imgproc.minAreaRect(points);
assertEquals(new Size(2, 5), rrect.size);
assertEquals(-90., rrect.angle);
assertEquals(new Point(3.5, 2), rrect.center);
}
public void testMinEnclosingCircle() {
MatOfPoint2f points = new MatOfPoint2f(new Point(0, 0), new Point(-100, 0), new Point(0, -100), new Point(100, 0), new Point(0, 100));
Point actualCenter = new Point();
float[] radius = new float[1];
Imgproc.minEnclosingCircle(points, actualCenter, radius);
assertEquals(new Point(0, 0), actualCenter);
assertEquals(100.0f, radius[0], 1.0);
}
public void testMomentsMat() {
fail("Not yet implemented");
}
@@ -1389,15 +1246,6 @@ public class ImgprocTest extends OpenCVTestCase {
// TODO_: write better test
}
public void testPointPolygonTest() {
MatOfPoint2f contour = new MatOfPoint2f(new Point(0, 0), new Point(1, 3), new Point(3, 4), new Point(4, 3), new Point(2, 1));
double sign1 = Imgproc.pointPolygonTest(contour, new Point(2, 2), false);
assertEquals(1.0, sign1);
double sign2 = Imgproc.pointPolygonTest(contour, new Point(4, 4), true);
assertEquals(-Math.sqrt(0.5), sign2);
}
public void testPreCornerDetectMatMatInt() {
Mat src = new Mat(4, 4, CvType.CV_32F, new Scalar(1));
int ksize = 3;
modules/imgproc/misc/java/test/Subdiv2DTest.java
-117
View File
@@ -1,117 +0,0 @@
package org.opencv.test.imgproc;
import org.opencv.core.MatOfFloat6;
import org.opencv.core.Point;
import org.opencv.core.Rect;
import org.opencv.imgproc.Subdiv2D;
import org.opencv.test.OpenCVTestCase;
public class Subdiv2DTest extends OpenCVTestCase {
protected void setUp() throws Exception {
super.setUp();
}
public void testEdgeDstInt() {
fail("Not yet implemented");
}
public void testEdgeDstIntPoint() {
fail("Not yet implemented");
}
public void testEdgeOrgInt() {
fail("Not yet implemented");
}
public void testEdgeOrgIntPoint() {
fail("Not yet implemented");
}
public void testFindNearestPoint() {
fail("Not yet implemented");
}
public void testFindNearestPointPoint() {
fail("Not yet implemented");
}
public void testGetEdge() {
fail("Not yet implemented");
}
public void testGetEdgeList() {
fail("Not yet implemented");
}
public void testGetTriangleList() {
Subdiv2D s2d = new Subdiv2D( new Rect(0, 0, 50, 50) );
s2d.insert( new Point(10, 10) );
s2d.insert( new Point(20, 10) );
s2d.insert( new Point(20, 20) );
s2d.insert( new Point(10, 20) );
MatOfFloat6 triangles = new MatOfFloat6();
s2d.getTriangleList(triangles);
assertEquals(2, triangles.cols());
/*
int cnt = triangles.rows();
float buff[] = new float[cnt*6];
triangles.get(0, 0, buff);
for(int i=0; i<cnt; i++)
Log.d("*****", "["+i+"]: " + // (a.x, a.y) -> (b.x, b.y) -> (c.x, c.y)
"("+buff[6*i+0]+","+buff[6*i+1]+")" + "->" +
"("+buff[6*i+2]+","+buff[6*i+3]+")" + "->" +
"("+buff[6*i+4]+","+buff[6*i+5]+")"
);
*/
}
public void testGetVertexInt() {
fail("Not yet implemented");
}
public void testGetVertexIntIntArray() {
fail("Not yet implemented");
}
public void testGetVoronoiFacetList() {
fail("Not yet implemented");
}
public void testInitDelaunay() {
fail("Not yet implemented");
}
public void testInsertListOfPoint() {
fail("Not yet implemented");
}
public void testInsertPoint() {
fail("Not yet implemented");
}
public void testLocate() {
fail("Not yet implemented");
}
public void testNextEdge() {
fail("Not yet implemented");
}
public void testRotateEdge() {
fail("Not yet implemented");
}
public void testSubdiv2D() {
fail("Not yet implemented");
}
public void testSubdiv2DRect() {
fail("Not yet implemented");
}
public void testSymEdge() {
fail("Not yet implemented");
}
}