From 6d165dae5e0308d70c618d21ad0fe0a7191117aa Mon Sep 17 00:00:00 2001 From: Suleyman TURKMEN Date: Sat, 25 Aug 2018 21:50:50 +0300 Subject: [PATCH] related moved enums --- modules/imgproc/misc/java/gen_dict.json | 3 --- modules/imgproc/misc/java/test/ImgprocTest.java | 4 ++-- modules/photo/misc/java/test/PhotoTest.java | 4 ++-- modules/video/misc/java/test/BackgroundSubtractorMOGTest.java | 4 ++-- 4 files changed, 6 insertions(+), 9 deletions(-) diff --git a/modules/imgproc/misc/java/gen_dict.json b/modules/imgproc/misc/java/gen_dict.json index 45cc7dad93..5559abc8af 100644 --- 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 index fb9dbf6570..fc9d92ed9b 100644 --- a/modules/imgproc/misc/java/test/ImgprocTest.java +++ b/modules/imgproc/misc/java/test/ImgprocTest.java @@ -584,7 +584,7 @@ public class ImgprocTest extends OpenCVTestCase { 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 class ImgprocTest extends OpenCVTestCase { List contours = new ArrayList(); 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 index 27bac6380e..45d92203d5 100644 --- 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 index 9d6f71d1a2..05c12f1dfa 100644 --- a/modules/video/misc/java/test/BackgroundSubtractorMOGTest.java +++ b/modules/video/misc/java/test/BackgroundSubtractorMOGTest.java @@ -14,12 +14,12 @@ public class BackgroundSubtractorMOGTest extends OpenCVTestCase { 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); */ }