Chiebot-Mirror
/
opencv
8
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Java API generator: KeyPoint converters from/to Mat

Browse Source
pull/13383/head
Andrey Pavlenko 14 years ago
parent 20b4d0fae9
commit 9235a80109
4 changed files with 76 additions and 30 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      modules/java/gen_java.py
  2. 21
      modules/java/src/cpp/converters.cpp
  3. 59
      modules/java/src/java/Converters.java
  4. 24
      modules/java/src/java/features2d+KeyPoint.java

2
modules/java/gen_java.py
Unescape View File

@ -11,7 +11,7 @@ class_ignore_list = (
"FileNode", "FileStorage",
#highgui
"VideoWriter", "VideoCapture",
#feature2d
#features2d
"KeyPoint",
)

21
modules/java/src/cpp/converters.cpp
Unescape View File

@ -114,17 +114,27 @@ void vector_Point_to_Mat(vector<Point>& v_point, Mat& mat)
//vector_KeyPoint
void Mat_to_vector_KeyPoint(Mat& mat, vector<KeyPoint>& v_kp)
{
v_kp.clear();
//CHECK_MAT(mat.type()!= ??? || mat.rows!=1);
v_kp = (vector<KeyPoint>) mat;
v_kp.clear();
CHECK_MAT(mat.type()!= CV_64FC(7) || mat.rows!=1);
for(int i=0; i<mat.cols; i++)
{
Vec<double, 7> v = mat.at< Vec<double, 7> >(0, i);
KeyPoint kp((float)v[0], (float)v[1], (float)v[2], (float)v[3], (float)v[4], (int)v[5], (int)v[6]);
v_kp.push_back(kp);
}
return;
}
void vector_KeyPoint_to_Mat(vector<KeyPoint>& v_kp, Mat& mat)
{
mat = Mat(v_kp);
return;
int count = v_kp.size();
mat.create(1, count, CV_64FC(7));
for(int i=0; i<count; i++)
{
KeyPoint kp = v_kp[i];
mat.at< Vec<double, 7> >(0, i) = Vec<double, 7>(kp.pt.x, kp.pt.y, kp.size, kp.angle, kp.response, kp.octave, kp.class_id);
}
}
@ -154,5 +164,4 @@ void vector_Mat_to_Mat(std::vector<cv::Mat>& v_mat, cv::Mat& mat)
long long addr = (long long) new Mat(v_mat[i]);
mat.at< Vec<int, 2> >(0, i) = Vec<int, 2>(addr>>32, addr&0xffffffff);
}
return;
}

59
modules/java/src/java/Converters.java
Unescape View File

@ -9,7 +9,7 @@ import org.opencv.core.Rect;
import org.opencv.features2d.KeyPoint;
public class Converters {
public static Mat vector_Point_to_Mat(List<Point> pts) {
Mat res;
int count = (pts!=null) ? pts.size() : 0;
@ -52,7 +52,7 @@ public class Converters {
int cols = m.cols();
if(CvType.CV_32SC2 != m.type() || m.rows()!=1 )
throw new java.lang.IllegalArgumentException();
pts.clear();
int[] buff = new int[2*cols];
m.get(0, 0, buff);
@ -85,7 +85,7 @@ public class Converters {
int cols = m.cols();
if(CvType.CV_32SC2 != m.type() || m.rows()!=1 )
throw new java.lang.IllegalArgumentException();
mats.clear();
int[] buff = new int[cols*2];
m.get(0, 0, buff);
@ -95,10 +95,6 @@ public class Converters {
}
}
public static void Mat_to_vector_KeyPoint(Mat kp_mat, List<KeyPoint> kps) {
// TODO Auto-generated method stub
}
public static Mat vector_float_to_Mat(List<Float> fs) {
Mat res;
int count = (fs!=null) ? fs.size() : 0;
@ -122,7 +118,7 @@ public class Converters {
int cols = m.cols();
if(CvType.CV_32FC1 != m.type() || m.rows()!=1 )
throw new java.lang.IllegalArgumentException();
fs.clear();
float[] buff = new float[cols];
m.get(0, 0, buff);
@ -171,7 +167,7 @@ public class Converters {
int cols = m.cols();
if(CvType.CV_32SC1 != m.type() || m.rows()!=1 )
throw new java.lang.IllegalArgumentException();
is.clear();
int[] buff = new int[cols];
m.get(0, 0, buff);
@ -184,7 +180,7 @@ public class Converters {
Mat res;
int count = (rs!=null) ? rs.size() : 0;
if(count>0){
res = new Mat(1, count, CvType.CV_32SC4); //Point can be saved into double[2]
res = new Mat(1, count, CvType.CV_32SC4);
int[] buff = new int[4*count];
for(int i=0; i<count; i++) {
Rect r = rs.get(i);
@ -206,7 +202,7 @@ public class Converters {
int cols = m.cols();
if(CvType.CV_32SC4 != m.type() || m.rows()!=1 )
throw new java.lang.IllegalArgumentException();
rs.clear();
int[] buff = new int[4*cols];
m.get(0, 0, buff);
@ -215,6 +211,47 @@ public class Converters {
}
}
public static Mat vector_KeyPoint_to_Mat(List<KeyPoint> kps) {
Mat res;
int count = (kps!=null) ? kps.size() : 0;
if(count>0){
res = new Mat(1, count, CvType.CV_64FC(7));
double[] buff = new double[count * 7];
for(int i=0; i<count; i++) {
KeyPoint kp = kps.get(i);
buff[7*i ] = kp.pt.x;
buff[7*i+1] = kp.pt.y;
buff[7*i+2] = kp.size;
buff[7*i+3] = kp.angle;
buff[7*i+4] = kp.response;
buff[7*i+5] = kp.octave;
buff[7*i+6] = kp.class_id;
}
res.put(0, 0, buff);
} else {
res = new Mat();
}
return res;
}
public static void Mat_to_vector_KeyPoint(Mat m, List<KeyPoint> kps) {
if(kps == null)
throw new java.lang.IllegalArgumentException();
int cols = m.cols();
if(CvType.CV_64FC(7) != m.type() || m.rows()!=1 )
throw new java.lang.IllegalArgumentException();
kps.clear();
double[] buff = new double[7*cols];
m.get(0, 0, buff);
for(int i=0; i<cols; i++) {
kps.add( new KeyPoint( (float)buff[4*i], (float)buff[4*i+1], (float)buff[4*i+2], (float)buff[4*i+3],
(float)buff[4*i+4], (int)buff[4*i+5], (int)buff[4*i+6] ) );
}
}
public static Mat vector_double_to_Mat(List<Double> ds) {
Mat res;
int count = (ds!=null) ? ds.size() : 0;

24
modules/java/src/java/features2d+KeyPoint.java
Unescape View File

@ -5,18 +5,18 @@ import org.opencv.core.Point;
//javadoc: KeyPoint
public class KeyPoint {
//javadoc: KeyPoint::pt
Point pt;
//javadoc: KeyPoint::size
float size;
//javadoc: KeyPoint::angle
float angle;
//javadoc: KeyPoint::response
float response;
//javadoc: KeyPoint::octave
int octave;
//javadoc: KeyPoint::class_id
int class_id;
//javadoc: KeyPoint::pt
public Point pt;
//javadoc: KeyPoint::size
public float size;
//javadoc: KeyPoint::angle
public float angle;
//javadoc: KeyPoint::response
public float response;
//javadoc: KeyPoint::octave
public int octave;
//javadoc: KeyPoint::class_id
public int class_id;
//javadoc: KeyPoint::KeyPoint(x, y, _size, _angle, _response, _octave, _class_id)
public KeyPoint(float x, float y, float _size, float _angle, float _response, int _octave, int _class_id)

Write Preview
Loading…
Cancel
Save