From 36a5b6e215e20cc32e36b6eed2a469db46dbdd62 Mon Sep 17 00:00:00 2001 From: Andrey Pavlenko Date: Tue, 2 Aug 2011 07:57:09 +0000 Subject: [PATCH] Java API: tests are updated after randu/randn args types changes --- .../android_test/src/org/opencv/test/OpenCVTestCase.java | 4 ++-- .../android_test/src/org/opencv/test/core/coreTest.java | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/modules/java/android_test/src/org/opencv/test/OpenCVTestCase.java b/modules/java/android_test/src/org/opencv/test/OpenCVTestCase.java index a4a300d85..ea91d6623 100644 --- a/modules/java/android_test/src/org/opencv/test/OpenCVTestCase.java +++ b/modules/java/android_test/src/org/opencv/test/OpenCVTestCase.java @@ -92,7 +92,7 @@ public class OpenCVTestCase extends TestCase { gray_16s_1024 = new Mat(matSize, matSize, CvType.CV_16S, new Scalar(1024)); grayRnd = new Mat(matSize, matSize, CvType.CV_8U); - Core.randu(grayRnd, new Scalar(0), new Scalar(256)); + Core.randu(grayRnd, 0, 256); gray0_32f = new Mat(matSize, matSize, CvType.CV_32F, new Scalar(0.0)); gray1_32f = new Mat(matSize, matSize, CvType.CV_32F, new Scalar(1.0)); @@ -103,7 +103,7 @@ public class OpenCVTestCase extends TestCase { grayE_32f = new Mat(matSize, matSize, CvType.CV_32F); grayE_32f = Mat.eye(matSize, matSize, CvType.CV_32FC1); grayRnd_32f = new Mat(matSize, matSize, CvType.CV_32F); - Core.randu(grayRnd_32f, new Scalar(0), new Scalar(256)); + Core.randu(grayRnd_32f, 0, 256); gray0_32f_1d = new Mat(1, matSize, CvType.CV_32F, new Scalar(0.0)); diff --git a/modules/java/android_test/src/org/opencv/test/core/coreTest.java b/modules/java/android_test/src/org/opencv/test/core/coreTest.java index 027ed4d5f..86765304e 100644 --- a/modules/java/android_test/src/org/opencv/test/core/coreTest.java +++ b/modules/java/android_test/src/org/opencv/test/core/coreTest.java @@ -1156,7 +1156,7 @@ public class coreTest extends OpenCVTestCase { public void testPerspectiveTransform() { Mat src = new Mat(matSize, matSize, CvType.CV_32FC2); - Core.randu(src, new Scalar(0), new Scalar(256)); + Core.randu(src, 0, 256); //FIXME: use Mat.diag Mat transformMatrix = Mat.eye(3, 3, CvType.CV_32F); @@ -1169,7 +1169,7 @@ public class coreTest extends OpenCVTestCase { public void testPerspectiveTransform3D() { Mat src = new Mat(matSize, matSize, CvType.CV_32FC3); - Core.randu(src, new Scalar(0), new Scalar(256)); + Core.randu(src, 0, 256); Mat transformMatrix = Mat.eye(4, 4, CvType.CV_32F); @@ -1304,7 +1304,7 @@ public class coreTest extends OpenCVTestCase { public void testRandn() { assertTrue(0 == Core.countNonZero(gray0)); - Core.randn(gray0, new Scalar(0), new Scalar(256)); + Core.randn(gray0, 0, 256); assertTrue(0 != Core.countNonZero(gray0)); } @@ -1318,7 +1318,7 @@ public class coreTest extends OpenCVTestCase { public void testRandu() { assertTrue(0 == Core.countNonZero(gray0)); - Core.randu(gray0, new Scalar(0), new Scalar(256)); + Core.randu(gray0, 0, 256); assertTrue(0 != Core.countNonZero(gray0)); }