Java API: fitEllipse arg type is changed to List<Point>, test is updated as well

Testing: 1176/4/580

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 61a3f9d..fa0f2ce 100644 (file)
--- 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<Point> points = new ArrayList<Point>();
+        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 f3fc38e..f676b52 100644 (file)
--- 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', },\r
         'calcOpticalFlowPyrLK' : { 'prevPts' : 'vector_Point2f', 'nextPts' : 'vector_Point2f',\r
                                    'status' : 'vector_uchar', 'err' : 'vector_float', },\r
+        'fitEllipse' : { 'points' : 'vector_Point2f', },\r
     }, # '', i.e. no class\r
 } # func_arg_fix\r
 \r