From 70caece0014263a10b2d213467db149948d24a6d Mon Sep 17 00:00:00 2001 From: Andrey Pavlenko Date: Thu, 4 Aug 2011 12:00:53 +0000 Subject: [PATCH] Java API: fitEllipse arg type is changed to List, test is updated as well Testing: 1176/4/580 --- .../src/org/opencv/test/imgproc/imgprocTest.java | 8 ++++++-- modules/java/gen_java.py | 1 + 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/modules/java/android_test/src/org/opencv/test/imgproc/imgprocTest.java b/modules/java/android_test/src/org/opencv/test/imgproc/imgprocTest.java index 61a3f9d14a..fa0f2ce2dc 100644 --- a/modules/java/android_test/src/org/opencv/test/imgproc/imgprocTest.java +++ b/modules/java/android_test/src/org/opencv/test/imgproc/imgprocTest.java @@ -766,8 +766,12 @@ public class imgprocTest extends OpenCVTestCase { } public void testFitEllipse() { - Mat points = new Mat(1, 5, CvType.CV_32FC2); - points.put(0, 0, 0.0, 0.0, -1.0, 1.0, 1.0, 1.0, 1.0, -1.0, -1.0, -1.0); + List points = new ArrayList(); + points.add(new Point( 0, 0)); + points.add(new Point(-1, 1)); + points.add(new Point( 1, 1)); + points.add(new Point( 1, -1)); + points.add(new Point(-1, -1)); RotatedRect rrect = new RotatedRect(); rrect = Imgproc.fitEllipse(points); diff --git a/modules/java/gen_java.py b/modules/java/gen_java.py index f3fc38e386..f676b52b77 100644 --- a/modules/java/gen_java.py +++ b/modules/java/gen_java.py @@ -484,6 +484,7 @@ func_arg_fix = { 'solvePnPRansac' : { 'objectPoints' : 'vector_Point3f', 'imagePoints' : 'vector_Point2f', }, 'calcOpticalFlowPyrLK' : { 'prevPts' : 'vector_Point2f', 'nextPts' : 'vector_Point2f', 'status' : 'vector_uchar', 'err' : 'vector_float', }, + 'fitEllipse' : { 'points' : 'vector_Point2f', }, }, # '', i.e. no class } # func_arg_fix -- GitLab