related moved enums

opencv · Aug 26, 2018 · 6d165da · 6d165da
1 parent 335e61d
commit 6d165da
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 9 deletions.
diff --git a/modules/imgproc/misc/java/gen_dict.json b/modules/imgproc/misc/java/gen_dict.json
@@ -25,9 +25,6 @@
                 ["IPL_BORDER_WRAP",        3 ],
                 ["IPL_BORDER_REFLECT_101", 4 ],
                 ["IPL_BORDER_TRANSPARENT", 5 ]
-            ],
-            "public" : [
-                ["LINE_AA", 16], ["LINE_8", 8], ["LINE_4", 4]
             ]
         }
     },

diff --git a/modules/imgproc/misc/java/test/ImgprocTest.java b/modules/imgproc/misc/java/test/ImgprocTest.java
@@ -584,7 +584,7 @@ public void testCornerSubPix() {
         Point truthPosition = new Point(img.cols() / 2, img.rows() / 2);
 
         Rect r = new Rect(new Point(0, 0), truthPosition);
-        Imgproc.rectangle(img, r.tl(), r.br(), new Scalar(0), Core.FILLED);
+        Imgproc.rectangle(img, r.tl(), r.br(), new Scalar(0), Imgproc.FILLED);
         MatOfPoint2f corners = new MatOfPoint2f(new Point(truthPosition.x + 1, truthPosition.y + 1));
         Size winSize = new Size(2, 2);
         Size zeroZone = new Size(-1, -1);
@@ -657,7 +657,7 @@ public void testDrawContoursMatListOfMatIntScalarInt() {
         List<MatOfPoint> contours = new ArrayList<MatOfPoint>();
         Imgproc.findContours(gray0, contours, new Mat(), Imgproc.RETR_EXTERNAL, Imgproc.CHAIN_APPROX_SIMPLE);
 
-        Imgproc.drawContours(gray0, contours, -1, new Scalar(0), Core.FILLED);
+        Imgproc.drawContours(gray0, contours, -1, new Scalar(0), Imgproc.FILLED);
 
         assertEquals(0, Core.countNonZero(gray0));
     }

diff --git a/modules/photo/misc/java/test/PhotoTest.java b/modules/photo/misc/java/test/PhotoTest.java
@@ -11,8 +11,8 @@ public class PhotoTest extends OpenCVTestCase {
 
     public void testInpaint() {
         Point p = new Point(matSize / 2, matSize / 2);
-        Imgproc.circle(gray255, p, 2, colorBlack, Core.FILLED);
-        Imgproc.circle(gray0,   p, 2, colorWhite, Core.FILLED);
+        Imgproc.circle(gray255, p, 2, colorBlack, Imgproc.FILLED);
+        Imgproc.circle(gray0,   p, 2, colorWhite, Imgproc.FILLED);
 
         Photo.inpaint(gray255, gray0, dst, 3, Photo.INPAINT_TELEA);
 

diff --git a/modules/video/misc/java/test/BackgroundSubtractorMOGTest.java b/modules/video/misc/java/test/BackgroundSubtractorMOGTest.java
@@ -14,12 +14,12 @@ public void testApplyMatMat() {
         Scalar color = new Scalar(128);
         Mat mask = new Mat(rgbLena.size(), CvType.CV_16UC3, new Scalar(1));
 
-        Imgproc.rectangle(rgbLena, bottomRight, topLeft, color, Core.FILLED);
+        Imgproc.rectangle(rgbLena, bottomRight, topLeft, color, Imgproc.FILLED);
 
         backGroundSubtract.apply(rgbLena, mask);
 
         Mat truth = new Mat(rgbLena.size(), rgbLena.type(), new Scalar(0));
-        Imgproc.rectangle(truth, bottomRight, topLeft, color, Core.FILLED);
+        Imgproc.rectangle(truth, bottomRight, topLeft, color, Imgproc.FILLED);
         assertMatEqual(truth, rgbLena);
         */
     }