generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Java API: fixed input List<List<smth>> arguments

Browse Source
This commit is contained in:
Andrey Kamaev
2011-08-10 14:09:22 +00:00
parent f9ef92d45a
commit 92afe9e40a
6 changed files with 215 additions and 207 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
modules/java/android_test/src/org/opencv/test/core/MatTest.java
View File

@@ -1,6 +1,7 @@
package org.opencv.test.core;
import org.opencv.core.Core;
import org.opencv.core.CvException;
import org.opencv.core.CvType;
import org.opencv.core.Mat;
import org.opencv.core.Range;
@@ -175,11 +176,19 @@ public class MatTest extends OpenCVTestCase {
}
public void testDiagMat() {
dst = Mat.diag(gray255);
Mat diagVector = new Mat(matSize, 1, CvType.CV_32F, new Scalar(1));
truth = new Mat(1, matSize, CvType.CV_8U, new Scalar(255));
dst = Mat.diag(diagVector);
assertMatEqual(truth, dst);
assertMatEqual(grayE_32f, dst, EPS);
}
public void testDiagMat_sqrMatrix() {
try {
dst = Mat.diag(gray255);
} catch (CvException e) {
// expected
}
}
public void testDot() {

26
modules/java/android_test/src/org/opencv/test/utils/ConvertersTest.java
View File

@@ -1,9 +1,5 @@
package org.opencv.test.utils;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import org.opencv.core.CvType;
import org.opencv.core.Mat;
import org.opencv.core.Point;
@@ -12,9 +8,11 @@ import org.opencv.core.Rect;
import org.opencv.features2d.DMatch;
import org.opencv.features2d.KeyPoint;
import org.opencv.test.OpenCVTestCase;
import org.opencv.test.OpenCVTestRunner;
import org.opencv.utils.Converters;
import java.util.ArrayList;
import java.util.List;
public class ConvertersTest extends OpenCVTestCase {
public void testMat_to_vector_char() {
@@ -481,17 +479,6 @@ public class ConvertersTest extends OpenCVTestCase {
public void testVector_vector_char_to_Mat() {
fail("Not yet implemented");
List<List<Byte>> llb = new ArrayList<List<Byte>>();
byte value1 = 1;
byte value2 = 2;
byte value3 = 3;
byte value4 = 4;
llb.add(Arrays.asList(new Byte(value1), new Byte(value2), new Byte(value3), new Byte(value4)));
dst = Converters.vector_vector_char_to_Mat(llb);
OpenCVTestRunner.Log(dst.toString());
OpenCVTestRunner.Log(dst.dump());
}
public void testVector_vector_DMatch_to_Mat() {
@@ -503,13 +490,6 @@ public class ConvertersTest extends OpenCVTestCase {
}
public void testVector_vector_Point_to_Mat() {
List<List<Point>> points = new ArrayList<List<Point>>();
points.add(Arrays.asList(new Point(1, 1), new Point(7, 1), new Point(7, 6), new Point(1, 6),
new Point(5, 5), new Point(8, 9)));
dst = Converters.vector_vector_Point_to_Mat(points);
// TODO: returns random dst matrix
// assertMatEqual();
fail("Not yet implemented");
}