pts2.add(new Point(x, y));
}
- Mat fm = Calib3d.findFundamentalMat(Converters.vector_Point2f_to_Mat(pts1), Converters.vector_Point2f_to_Mat(pts2));
+ Mat fm = Calib3d.findFundamentalMat(pts1, pts2);
truth = new Mat(3,3,CvType.CV_64F);
truth.put(0, 0, 0, -0.5, -0.5, 0.5, 0, 0, 0.5, 0, 0);
transformedPoints.add(new Point(y, x));
}
- Mat hmg = Calib3d.findHomography(
- Converters.vector_Point2f_to_Mat(originalPoints),
- Converters.vector_Point2f_to_Mat(transformedPoints));
+ Mat hmg = Calib3d.findHomography(originalPoints, transformedPoints);
truth = new Mat(3, 3, CvType.CV_64F);
truth.put(0, 0, 0, 1, 0, 1, 0, 0, 0, 0, 1);
Mat rvec = new Mat();
Mat tvec = new Mat();
- Calib3d.solvePnP(Converters.vector_Point3f_to_Mat(points3d),
- Converters.vector_Point2f_to_Mat(points2d), intrinsics,
- new Mat(), rvec, tvec);
+ Calib3d.solvePnP(points3d, points2d, intrinsics, new Mat(), rvec, tvec);
Mat truth_rvec = new Mat(3, 1, CvType.CV_64F);
truth_rvec.put(0, 0, 0, Math.PI / 2, 0);
Size zeroZone = new Size(-1, -1);
TermCriteria criteria = new TermCriteria(2/*TODO: CV_TERMCRIT_EPS*/, 0, 0.01);
- Mat cornersMat = Converters.vector_Point2f_to_Mat(corners);
- Imgproc.cornerSubPix(img, cornersMat, winSize, zeroZone, criteria);
- Converters.Mat_to_vector_Point(cornersMat, corners);
+ Imgproc.cornerSubPix(img, corners, winSize, zeroZone, criteria);
assertPointEquals(truthPosition, corners.get(0), weakEPS);
}
# "complex" : { j_type : "?", jn_args : (("", ""),), jn_name : "", jni_var : "", jni_name : "", "suffix" : "?" },\r
\r
"vector_Point": { "j_type" : "List<Point>", "jn_type" : "long", "jni_type" : "jlong", "jni_var" : "vector<Point> %(n)s", "suffix" : "J" },\r
+ "vector_Point2f": { "j_type" : "List<Point>", "jn_type" : "long", "jni_type" : "jlong", "jni_var" : "vector<Point2f> %(n)s", "suffix" : "J" },\r
+ "vector_Point2d": { "j_type" : "List<Point>", "jn_type" : "long", "jni_type" : "jlong", "jni_var" : "vector<Point2d> %(n)s", "suffix" : "J" },\r
+ "vector_Point3i": { "j_type" : "List<Point3>", "jn_type" : "long", "jni_type" : "jlong", "jni_var" : "vector<Point3i> %(n)s", "suffix" : "J" },\r
+ "vector_Point3f": { "j_type" : "List<Point3>", "jn_type" : "long", "jni_type" : "jlong", "jni_var" : "vector<Point3f> %(n)s", "suffix" : "J" },\r
+ "vector_Point3d": { "j_type" : "List<Point3>", "jn_type" : "long", "jni_type" : "jlong", "jni_var" : "vector<Point3d> %(n)s", "suffix" : "J" },\r
"vector_Mat" : { "j_type" : "List<Mat>", "jn_type" : "long", "jni_type" : "jlong", "jni_var" : "vector<Mat> %(n)s", "suffix" : "J" },\r
"vector_KeyPoint" : { "j_type" : "List<KeyPoint>", "jn_type" : "long", "jni_type" : "jlong", "jni_var" : "vector<KeyPoint> %(n)s", "suffix" : "J" },\r
"vector_Rect" : { "j_type" : "List<Rect>", "jn_type" : "long", "jni_type" : "jlong", "jni_var" : "vector<Rect> %(n)s", "suffix" : "J" },\r
"Point2d" : { "j_type" : "Point", "jn_args" : (("double", ".x"), ("double", ".y")),\r
"jni_var" : "Point2d %(n)s(%(n)s_x, %(n)s_y)", "jni_type" : "jdoubleArray",\r
"suffix" : "DD"},\r
- "Point3i" : { "j_type" : "Point", "jn_args" : (("double", ".x"), ("double", ".y"), ("double", ".z")),\r
+ "Point3i" : { "j_type" : "Point3", "jn_args" : (("double", ".x"), ("double", ".y"), ("double", ".z")),\r
"jni_var" : "Point3i %(n)s((int)%(n)s_x, (int)%(n)s_y, (int)%(n)s_z)", "jni_type" : "jdoubleArray",\r
"suffix" : "DDD"},\r
- "Point3f" : { "j_type" : "Point", "jn_args" : (("double", ".x"), ("double", ".y"), ("double", ".z")),\r
+ "Point3f" : { "j_type" : "Point3", "jn_args" : (("double", ".x"), ("double", ".y"), ("double", ".z")),\r
"jni_var" : "Point3f %(n)s((float)%(n)s_x, (float)%(n)s_y, (float)%(n)s_z)", "jni_type" : "jdoubleArray",\r
"suffix" : "DDD"},\r
- "Point3d" : { "j_type" : "Point", "jn_args" : (("double", ".x"), ("double", ".y"), ("double", ".z")),\r
+ "Point3d" : { "j_type" : "Point3", "jn_args" : (("double", ".x"), ("double", ".y"), ("double", ".z")),\r
"jni_var" : "Point3d %(n)s(%(n)s_x, %(n)s_y, %(n)s_z)", "jni_type" : "jdoubleArray",\r
"suffix" : "DDD"},\r
"KeyPoint": { "j_type" : "KeyPoint", "jn_args" : (("float", ".x"), ("float", ".y"), ("float", ".size"),\r
'randu' : { 'low' : 'double', 'high' : 'double', },\r
'randn' : { 'mean' : 'double', 'stddev' : 'double', },\r
'inRange' : { 'lowerb' : 'Scalar', 'upperb' : 'Scalar', },\r
- 'goodFeaturesToTrack' : { 'corners' : 'vector_Point' },\r
+ 'goodFeaturesToTrack' : { 'corners' : 'vector_Point', },\r
+ 'findFundamentalMat' : { 'points1' : 'vector_Point2d', 'points2' : 'vector_Point2d', },\r
+ 'cornerSubPix' : { 'corners' : 'vector_Point2f', },\r
+ 'findHomography' : { 'srcPoints' : 'vector_Point2f', 'dstPoints' : 'vector_Point2f', },\r
+ 'solvePnP' : { 'objectPoints' : 'vector_Point3f', 'imagePoints' : 'vector_Point2f', },\r
+ 'solvePnPRansac' : { 'objectPoints' : 'vector_Point3f', 'imagePoints' : 'vector_Point2f', },\r
}, # '', i.e. empty class\r
} # func_arg_fix\r
\r
\r
using namespace cv;\r
\r
-#define CHECK_MAT(cond) if(cond){ LOGD(#cond); return; }\r
+#define CHECK_MAT(cond) if(!(cond)){ LOGD("FAILED: " #cond); return; }\r
\r
\r
// vector_int\r
void Mat_to_vector_int(Mat& mat, vector<int>& v_int)\r
{\r
v_int.clear();\r
- CHECK_MAT(mat.type()!= CV_32SC1 || mat.cols!=1);\r
+ CHECK_MAT(mat.type()==CV_32SC1 && mat.cols==1);\r
v_int = (vector<int>) mat;\r
}\r
\r
void Mat_to_vector_double(Mat& mat, vector<double>& v_double)\r
{\r
v_double.clear();\r
- CHECK_MAT(mat.type()!= CV_64FC1 || mat.cols!=1);\r
+ CHECK_MAT(mat.type()==CV_64FC1 && mat.cols==1);\r
v_double = (vector<double>) mat;\r
}\r
\r
void Mat_to_vector_float(Mat& mat, vector<float>& v_float)\r
{\r
v_float.clear();\r
- CHECK_MAT(mat.type()!= CV_32FC1 || mat.cols!=1);\r
+ CHECK_MAT(mat.type()==CV_32FC1 && mat.cols==1);\r
v_float = (vector<float>) mat;\r
}\r
\r
void Mat_to_vector_uchar(Mat& mat, vector<uchar>& v_uchar)\r
{\r
v_uchar.clear();\r
- CHECK_MAT(mat.type()!= CV_8UC1 || mat.cols!=1);\r
+ CHECK_MAT(mat.type()==CV_8UC1 && mat.cols==1);\r
v_uchar = (vector<uchar>) mat;\r
}\r
\r
void Mat_to_vector_Rect(Mat& mat, vector<Rect>& v_rect)\r
{\r
v_rect.clear();\r
- CHECK_MAT(mat.type()!= CV_32SC4 || mat.cols!=1);\r
+ CHECK_MAT(mat.type()==CV_32SC4 && mat.cols==1);\r
v_rect = (vector<Rect>) mat;\r
}\r
\r
void Mat_to_vector_Point(Mat& mat, vector<Point>& v_point)\r
{\r
v_point.clear();\r
- CHECK_MAT(mat.type()!= CV_32SC2 || mat.cols!=1);\r
+ CHECK_MAT(mat.type()==CV_32SC2 && mat.cols==1);\r
v_point = (vector<Point>) mat;\r
}\r
\r
+//vector_Point2f\r
+void Mat_to_vector_Point2f(Mat& mat, vector<Point2f>& v_point)\r
+{\r
+ v_point.clear();\r
+ CHECK_MAT(mat.type()==CV_32FC2 && mat.cols==1);\r
+ v_point = (vector<Point2f>) mat;\r
+}\r
+\r
+//vector_Point2d\r
+void Mat_to_vector_Point2d(Mat& mat, vector<Point2d>& v_point)\r
+{\r
+ v_point.clear();\r
+ CHECK_MAT(mat.type()==CV_64FC2 && mat.cols==1);\r
+ v_point = (vector<Point2d>) mat;\r
+}\r
+\r
+\r
+//vector_Point3i\r
+void Mat_to_vector_Point3i(Mat& mat, vector<Point3i>& v_point)\r
+{\r
+ v_point.clear();\r
+ CHECK_MAT(mat.type()==CV_32SC3 && mat.cols==1);\r
+ v_point = (vector<Point3i>) mat;\r
+}\r
+\r
+//vector_Point3f\r
+void Mat_to_vector_Point3f(Mat& mat, vector<Point3f>& v_point)\r
+{\r
+ v_point.clear();\r
+ CHECK_MAT(mat.type()==CV_32FC3 && mat.cols==1);\r
+ v_point = (vector<Point3f>) mat;\r
+}\r
+\r
+//vector_Point3d\r
+void Mat_to_vector_Point3d(Mat& mat, vector<Point3d>& v_point)\r
+{\r
+ v_point.clear();\r
+ CHECK_MAT(mat.type()==CV_64FC3 && mat.cols==1);\r
+ v_point = (vector<Point3d>) mat;\r
+}\r
+\r
\r
void vector_Point_to_Mat(vector<Point>& v_point, Mat& mat)\r
{\r
mat = Mat(v_point);\r
}\r
\r
+void vector_Point2f_to_Mat(vector<Point2f>& v_point, Mat& mat)\r
+{\r
+ mat = Mat(v_point);\r
+}\r
+\r
+void vector_Point2d_to_Mat(vector<Point2d>& v_point, Mat& mat)\r
+{\r
+ mat = Mat(v_point);\r
+}\r
+\r
+void vector_Point3i_to_Mat(vector<Point3i>& v_point, Mat& mat)\r
+{\r
+ mat = Mat(v_point);\r
+}\r
+\r
+void vector_Point3f_to_Mat(vector<Point3f>& v_point, Mat& mat)\r
+{\r
+ mat = Mat(v_point);\r
+}\r
+\r
+void vector_Point3d_to_Mat(vector<Point3d>& v_point, Mat& mat)\r
+{\r
+ mat = Mat(v_point);\r
+}\r
+\r
\r
//vector_KeyPoint\r
void Mat_to_vector_KeyPoint(Mat& mat, vector<KeyPoint>& v_kp)\r
{\r
v_kp.clear();\r
- CHECK_MAT(mat.type()!= CV_64FC(7) || mat.cols!=1);\r
+ CHECK_MAT(mat.type()==CV_64FC(7) && mat.cols==1);\r
for(int i=0; i<mat.rows; i++)\r
{\r
Vec<double, 7> v = mat.at< Vec<double, 7> >(i, 0);\r
Mat& m = *( (Mat*) addr );\r
v_mat.push_back(m);\r
}\r
+ } else {\r
+ LOGD("Mat_to_vector_Mat() FAILED: mat.type() == CV_32SC2 && mat.cols == 1");\r
}\r
}\r
\r
\r
\r
void Mat_to_vector_Point(cv::Mat& mat, std::vector<cv::Point>& v_point);\r
+void Mat_to_vector_Point2f(cv::Mat& mat, std::vector<cv::Point2f>& v_point);\r
+void Mat_to_vector_Point2d(cv::Mat& mat, std::vector<cv::Point2d>& v_point);\r
+void Mat_to_vector_Point3i(cv::Mat& mat, std::vector<cv::Point3i>& v_point);\r
+void Mat_to_vector_Point3f(cv::Mat& mat, std::vector<cv::Point3f>& v_point);\r
+void Mat_to_vector_Point3d(cv::Mat& mat, std::vector<cv::Point3d>& v_point);\r
\r
void vector_Point_to_Mat(std::vector<cv::Point>& v_point, cv::Mat& mat);\r
+void vector_Point2f_to_Mat(std::vector<cv::Point2f>& v_point, cv::Mat& mat);\r
+void vector_Point2d_to_Mat(std::vector<cv::Point2d>& v_point, cv::Mat& mat);\r
+void vector_Point3i_to_Mat(std::vector<cv::Point3i>& v_point, cv::Mat& mat);\r
+void vector_Point3f_to_Mat(std::vector<cv::Point3f>& v_point, cv::Mat& mat);\r
+void vector_Point3d_to_Mat(std::vector<cv::Point3d>& v_point, cv::Mat& mat);\r
\r
\r
void Mat_to_vector_KeyPoint(cv::Mat& mat, std::vector<cv::KeyPoint>& v_kp);\r
public class Converters {\r
\r
public static Mat vector_Point_to_Mat(List<Point> pts) {\r
- Mat res;\r
- int count = (pts!=null) ? pts.size() : 0;\r
- if(count>0){\r
- res = new Mat(count, 1, CvType.CV_32SC2);\r
- int[] buff = new int[count*2];\r
- for(int i=0; i<count; i++) {\r
- Point p = pts.get(i);\r
- buff[i*2] = (int)p.x;\r
- buff[i*2+1] = (int)p.y;\r
- }\r
- res.put(0, 0, buff);\r
- } else {\r
- res = new Mat();\r
- }\r
- return res;\r
+ return vector_Point_to_Mat(pts, CvType.CV_32S);\r
}\r
\r
public static Mat vector_Point2f_to_Mat(List<Point> pts) {\r
+ return vector_Point_to_Mat(pts, CvType.CV_32F);\r
+ }\r
+\r
+ public static Mat vector_Point2d_to_Mat(List<Point> pts) {\r
+ return vector_Point_to_Mat(pts, CvType.CV_64F);\r
+ }\r
+\r
+ public static Mat vector_Point_to_Mat(List<Point> pts, int typeDepth) {\r
Mat res;\r
int count = (pts!=null) ? pts.size() : 0;\r
if(count>0){\r
- res = new Mat(count, 1, CvType.CV_32FC2);\r
- float[] buff = new float[count*2];\r
- for(int i=0; i<count; i++) {\r
- Point p = pts.get(i);\r
- buff[i*2] = (float)p.x;\r
- buff[i*2+1] = (float)p.y;\r
+ switch (typeDepth) {\r
+ case CvType.CV_32S:\r
+ {\r
+ res = new Mat(count, 1, CvType.CV_32SC2);\r
+ int[] buff = new int[count*2];\r
+ for(int i=0; i<count; i++) {\r
+ Point p = pts.get(i);\r
+ buff[i*2] = (int)p.x;\r
+ buff[i*2+1] = (int)p.y;\r
+ }\r
+ res.put(0, 0, buff);\r
+ }\r
+ break;\r
+\r
+ case CvType.CV_32F:\r
+ {\r
+ res = new Mat(count, 1, CvType.CV_32FC2);\r
+ float[] buff = new float[count*2];\r
+ for(int i=0; i<count; i++) {\r
+ Point p = pts.get(i);\r
+ buff[i*2] = (float)p.x;\r
+ buff[i*2+1] = (float)p.y;\r
+ }\r
+ res.put(0, 0, buff);\r
+ }\r
+ break;\r
+\r
+ case CvType.CV_64F:\r
+ {\r
+ res = new Mat(count, 1, CvType.CV_64FC2);\r
+ double[] buff = new double[count*2];\r
+ for(int i=0; i<count; i++) {\r
+ Point p = pts.get(i);\r
+ buff[i*2] = p.x;\r
+ buff[i*2+1] = p.y;\r
+ }\r
+ res.put(0, 0, buff);\r
+ }\r
+ break;\r
+\r
+ default:\r
+ throw new IllegalArgumentException("'typeDepth' can be CV_32S, CV_32F or CV_64F");\r
}\r
- res.put(0, 0, buff);\r
} else {\r
res = new Mat();\r
}\r
return res;\r
}\r
\r
+\r
+ public static Mat vector_Point3i_to_Mat(List<Point3> pts) {\r
+ return vector_Point3_to_Mat(pts, CvType.CV_32S);\r
+ }\r
+\r
public static Mat vector_Point3f_to_Mat(List<Point3> pts) {\r
+ return vector_Point3_to_Mat(pts, CvType.CV_32F);\r
+ }\r
+\r
+ public static Mat vector_Point3d_to_Mat(List<Point3> pts) {\r
+ return vector_Point3_to_Mat(pts, CvType.CV_64F);\r
+ }\r
+\r
+ public static Mat vector_Point3_to_Mat(List<Point3> pts, int typeDepth) {\r
Mat res;\r
int count = (pts!=null) ? pts.size() : 0;\r
if(count>0){\r
- res = new Mat(count, 1, CvType.CV_32FC3);\r
- float[] buff = new float[count*3];\r
- for(int i=0; i<count; i++) {\r
- Point3 p = pts.get(i);\r
- buff[i*3] = (float)p.x;\r
- buff[i*3+1] = (float)p.y;\r
- buff[i*3+2] = (float)p.z;\r
+ switch (typeDepth){\r
+ case CvType.CV_32S:\r
+ {\r
+ res = new Mat(count, 1, CvType.CV_32SC3);\r
+ int[] buff = new int[count*3];\r
+ for(int i=0; i<count; i++) {\r
+ Point3 p = pts.get(i);\r
+ buff[i*3] = (int)p.x;\r
+ buff[i*3+1] = (int)p.y;\r
+ buff[i*3+2] = (int)p.z;\r
+ }\r
+ res.put(0, 0, buff);\r
+ }\r
+ break;\r
+\r
+ case CvType.CV_32F:\r
+ {\r
+ res = new Mat(count, 1, CvType.CV_64FC3);\r
+ float[] buff = new float[count*3];\r
+ for(int i=0; i<count; i++) {\r
+ Point3 p = pts.get(i);\r
+ buff[i*3] = (float)p.x;\r
+ buff[i*3+1] = (float)p.y;\r
+ buff[i*3+2] = (float)p.z;\r
+ }\r
+ res.put(0, 0, buff);\r
+ }\r
+ break;\r
+\r
+ case CvType.CV_64F:\r
+ {\r
+ res = new Mat(count, 1, CvType.CV_64FC3);\r
+ double[] buff = new double[count*3];\r
+ for(int i=0; i<count; i++) {\r
+ Point3 p = pts.get(i);\r
+ buff[i*3] = p.x;\r
+ buff[i*3+1] = p.y;\r
+ buff[i*3+2] = p.z;\r
+ }\r
+ res.put(0, 0, buff);\r
+ }\r
+ break;\r
+\r
+ default:\r
+ throw new IllegalArgumentException("'typeDepth' can be CV_32S, CV_32F or CV_64F");\r
}\r
- res.put(0, 0, buff);\r
} else {\r
res = new Mat();\r
}\r
return res;\r
}\r
\r
+ public static void Mat_to_vector_Point2f(Mat m, List<Point> pts) {\r
+ Mat_to_vector_Point(m, pts);\r
+ }\r
+\r
+ public static void Mat_to_vector_Point2d(Mat m, List<Point> pts) {\r
+ Mat_to_vector_Point(m, pts);\r
+ }\r
public static void Mat_to_vector_Point(Mat m, List<Point> pts) {\r
if(pts == null)\r
- throw new java.lang.IllegalArgumentException("pts == null");\r
+ throw new java.lang.IllegalArgumentException("Output List can't be null");\r
int count = m.rows();\r
- if( CvType.CV_32SC2 != m.type() || m.cols()!=1 )\r
- throw new java.lang.IllegalArgumentException(\r
- "CvType.CV_32SC2 != m.type() || m.cols()!=1\n" + m );\r
+ int type = m.type();\r
+ if(m.cols() != 1)\r
+ throw new java.lang.IllegalArgumentException( "Input Mat should have one column\n" + m );\r
\r
pts.clear();\r
- int[] buff = new int[2*count];\r
- m.get(0, 0, buff);\r
- for(int i=0; i<count; i++) {\r
- pts.add( new Point(buff[i*2], buff[i*2+1]) );\r
- }\r
+ if(type == CvType.CV_32SC2) {\r
+ int[] buff = new int[2*count];\r
+ m.get(0, 0, buff);\r
+ for(int i=0; i<count; i++) {\r
+ pts.add( new Point(buff[i*2], buff[i*2+1]) );\r
+ }\r
+ } else if(type == CvType.CV_32FC2){\r
+ float[] buff = new float[2*count];\r
+ m.get(0, 0, buff);\r
+ for(int i=0; i<count; i++) {\r
+ pts.add( new Point(buff[i*2], buff[i*2+1]) );\r
+ }\r
+ } else if(type == CvType.CV_64FC2){\r
+ double[] buff = new double[2*count];\r
+ m.get(0, 0, buff);\r
+ for(int i=0; i<count; i++) {\r
+ pts.add( new Point(buff[i*2], buff[i*2+1]) );\r
+ }\r
+ } else {\r
+ throw new java.lang.IllegalArgumentException(\r
+ "Input Mat should be of CV_32SC2, CV_32FC2 or CV_64FC2 type\n" + m );\r
+ }\r
+ }\r
+\r
+ public static void Mat_to_vector_Point3i(Mat m, List<Point3> pts) {\r
+ Mat_to_vector_Point3(m, pts);\r
+ }\r
+ public static void Mat_to_vector_Point3f(Mat m, List<Point3> pts) {\r
+ Mat_to_vector_Point3(m, pts);\r
+ }\r
+\r
+ public static void Mat_to_vector_Point3d(Mat m, List<Point3> pts) {\r
+ Mat_to_vector_Point3(m, pts);\r
+ }\r
+ public static void Mat_to_vector_Point3(Mat m, List<Point3> pts) {\r
+ if(pts == null)\r
+ throw new java.lang.IllegalArgumentException("Output List can't be null");\r
+ int count = m.rows();\r
+ int type = m.type();\r
+ if(m.cols() != 1)\r
+ throw new java.lang.IllegalArgumentException( "Input Mat should have one column\n" + m );\r
+\r
+ pts.clear();\r
+ if(type == CvType.CV_32SC3) {\r
+ int[] buff = new int[3*count];\r
+ m.get(0, 0, buff);\r
+ for(int i=0; i<count; i++) {\r
+ pts.add( new Point3(buff[i*3], buff[i*3+1], buff[i*3+2]) );\r
+ }\r
+ } else if(type == CvType.CV_32FC3){\r
+ float[] buff = new float[3*count];\r
+ m.get(0, 0, buff);\r
+ for(int i=0; i<count; i++) {\r
+ pts.add( new Point3(buff[i*3], buff[i*3+1], buff[i*3+2]) );\r
+ }\r
+ } else if(type == CvType.CV_64FC3){\r
+ double[] buff = new double[3*count];\r
+ m.get(0, 0, buff);\r
+ for(int i=0; i<count; i++) {\r
+ pts.add( new Point3(buff[i*3], buff[i*3+1], buff[i*3+2]) );\r
+ }\r
+ } else {\r
+ throw new java.lang.IllegalArgumentException(\r
+ "Input Mat should be of CV_32SC3, CV_32FC3 or CV_64FC3 type\n" + m );\r
+ }\r
}\r
\r
public static Mat vector_Mat_to_Mat(List<Mat> mats) {\r
projects / profile / ivi / opencv.git / commitdiff