Merge branch 4.x

modules/imgproc/misc/java/test/ImgprocTest.java

@@ -1344,8 +1344,8 @@ public class ImgprocTest extends OpenCVTestCase {
 
         RotatedRect rrect = Imgproc.minAreaRect(points);
 
-        assertEquals(new Size(2, 5), rrect.size);
-        assertEquals(-90., rrect.angle);
+        assertEquals(new Size(5, 2), rrect.size);
+        assertEquals(0., rrect.angle);
         assertEquals(new Point(3.5, 2), rrect.center);
     }
 

modules/imgproc/misc/objc/gen_dict.json

@@ -2,6 +2,9 @@
     "class_ignore_list": [
         "FontFace"
     ],
+    "AdditionalImports" : {
+        "Imgproc" : [ "\"imgproc/bindings.hpp\"" ]
+    },
     "enum_ignore_list" : [
         "MorphShapes_c",
         "SmoothMethod_c"

modules/imgproc/misc/objc/test/ImgprocTest.swift

@@ -1128,8 +1128,8 @@ class ImgprocTest: OpenCVTestCase {
 
         let rrect = Imgproc.minAreaRect(points: points)
 
-        XCTAssertEqual(Size2f(width: 2, height: 5), rrect.size)
-        XCTAssertEqual(-90.0, rrect.angle)
+        XCTAssertEqual(Size2f(width: 5, height: 2), rrect.size)
+        XCTAssertEqual(0.0, rrect.angle)
         XCTAssertEqual(Point2f(x: 3.5, y: 2), rrect.center)
     }