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

Added vector_Point2f_to_Mat converter

Browse Source
This commit is contained in:
Andrey Kamaev 2011-07-27 15:03:16 +00:00
parent c966d077c0
commit 20b4d0fae9
4 changed files with 269 additions and 198 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
modules/java/android_test/src/org/opencv/test/OpenCVTestCase.java
View File

@ -166,7 +166,6 @@ public class OpenCVTestCase extends TestCase {
}
Mat diff = new Mat();
Core.absdiff(expected, actual, diff);
OpenCVTestRunner.Log(diff + " \n " + diff.dump());
if(isEqualityMeasured)
assertTrue("Max difference between expected and actiual values is bigger than " + eps,
Core.checkRange(diff, true, new Point(), 0.0, eps));

25
modules/java/android_test/src/org/opencv/test/calib3d/calib3dTest.java
View File

@ -1,5 +1,8 @@
package org.opencv.test.calib3d;
import android.util.Log;
import org.opencv.Converters;
import org.opencv.core.CvType;
import org.opencv.core.Mat;
import org.opencv.core.Point;
@ -8,6 +11,10 @@ import org.opencv.core.Size;
import org.opencv.calib3d.Calib3d;
import org.opencv.core.Core;
import org.opencv.test.OpenCVTestCase;
import org.opencv.test.OpenCVTestRunner;
import java.util.ArrayList;
import java.util.List;
public class calib3dTest extends OpenCVTestCase {
@ -265,7 +272,23 @@ public class calib3dTest extends OpenCVTestCase {
}
public void testFindHomographyMatMat() {
fail("Not yet implemented");
List<Point> originalPoints = new ArrayList<Point>();
List<Point> transformedPoints = new ArrayList<Point>();
for (int i = 0; i < 20; i++){
double x = Math.random() * 100 - 50;
double y = Math.random() * 100 - 50;
originalPoints.add(new Point(x,y));
transformedPoints.add(new Point(y,x));
}
Mat hmg = Calib3d.findHomography(Converters.vector_Point2f_to_Mat(originalPoints), Converters.vector_Point2f_to_Mat(transformedPoints));
truth = new Mat(3,3, CvType.CV_64F);
truth.put(0, 0, 0,1,0,1,0,0,0,0,1);
assertMatEqual(truth, hmg, EPS);
}
public void testFindHomographyMatMatInt() {

35
modules/java/android_test/src/org/opencv/test/core/coreTest.java
View File

@ -1086,8 +1086,39 @@ public class coreTest extends OpenCVTestCase {
}
public void testPerspectiveTransform() {
// nice example
fail("Not yet implemented");
Mat src = new Mat(matSize, matSize, CvType.CV_32FC2);
Mat low = new Mat(1, 1, CvType.CV_32F, new Scalar(0));
Mat high = new Mat(1, 1, CvType.CV_32F, new Scalar(256));
Core.randu(src, low, high);
//FIXME: use Mat.diag
Mat transformMatrix = new Mat(3, 3, CvType.CV_32F);
transformMatrix.put(0, 0, 1, 0, 0, 0, 1, 0, 0, 0, 1);
Core.perspectiveTransform(src, dst, transformMatrix);
assertMatEqual(src, dst, EPS);
}
public void testPerspectiveTransform3D() {
Mat src = new Mat(matSize, matSize, CvType.CV_32FC3);
Mat low = new Mat(1, 1, CvType.CV_32F, new Scalar(0));
Mat high = new Mat(1, 1, CvType.CV_32F, new Scalar(256));
Core.randu(src, low, high);
//FIXME: use Mat.diag
Mat transformMatrix = new Mat(4, 4, CvType.CV_32F);
transformMatrix.put(0, 0,
1, 0, 0, 0,
0, 1, 0, 0,
0, 0, 1, 0,
0, 0, 0, 1);
Core.perspectiveTransform(src, dst, transformMatrix);
assertMatEqual(src, dst, EPS);
}
public void testPhaseMatMatMat() {

18
modules/java/src/java/Converters.java
View File

@ -28,6 +28,24 @@ public class Converters {
return res;
}
public static Mat vector_Point2f_to_Mat(List<Point> pts) {
Mat res;
int count = (pts!=null) ? pts.size() : 0;
if(count>0){
res = new Mat(1, count, CvType.CV_32FC2);
float[] buff = new float[count*2];
for(int i=0; i<count; i++) {
Point p = pts.get(i);
buff[i*2] = (float)p.x;
buff[i*2+1] = (float)p.y;
}
res.put(0, 0, buff);
} else {
res = new Mat();
}
return res;
}
public static void Mat_to_vector_Point(Mat m, List<Point> pts) {
if(pts == null)
throw new java.lang.IllegalArgumentException();