Java API generator improvements:

- fixed return of complex types (Scalar, Point, etc)
- partial implementation of vector<> support (empty stubs for CPP-side converters)

modules/java/src/cpp/utils.cpp

@@ -1,3 +1,102 @@
 #include "utils.h"
 
-using namespace cv;
+using namespace cv;
+
+// vector_int
+
+void Mat_to_vector_int(Mat& mat, vector<int>& v_int)
+{
+    return;
+}
+
+void vector_int_to_Mat(vector<int>& v_int, Mat& mat)
+{
+    return;
+}
+
+
+//vector_double
+
+void Mat_to_vector_double(Mat& mat, vector<double>& v_double)
+{
+    return;
+}
+
+void vector_double_to_Mat(vector<double>& v_double, Mat& mat)
+{
+    return;
+}
+
+
+// vector_float
+
+void Mat_to_vector_float(Mat& mat, vector<float>& v_float)
+{
+    return;
+}
+
+void vector_float_to_Mat(vector<float>& v_float, Mat& mat)
+{
+    return;
+}
+
+
+//vector_uchar
+
+void Mat_to_vector_uchar(cv::Mat& mat, std::vector<uchar>& v_uchar)
+{
+    return;
+}
+
+
+//vector_Rect
+
+void Mat_to_vector_Rect(Mat& mat, vector<Rect>& v_rect)
+{
+    return;
+}
+
+void vector_Rect_to_Mat(vector<Rect>& v_rect, Mat& mat)
+{
+    return;
+}
+
+
+//vector_Point
+void Mat_to_vector_Point(Mat& mat, vector<Point>& v_point)
+{
+    return;
+}
+
+
+void vector_Point_to_Mat(vector<Point>& v_point, Mat& mat)
+{
+    return;
+}
+
+
+//vector_KeyPoint
+void Mat_to_vector_KeyPoint(Mat& mat, vector<KeyPoint>& v_kp)
+{
+    return;
+}
+
+
+void vector_KeyPoint_to_Mat(vector<KeyPoint>& v_kp, Mat& mat)
+{
+    return;
+}
+
+
+//vector_Mat
+void Mat_to_vector_Mat(cv::Mat& mat, std::vector<cv::Mat>& v_mat)
+{
+    return;
+}
+
+
+void vector_Mat_to_Mat(std::vector<cv::Mat>& v_mat, cv::Mat& mat)
+{
+    return;
+}
+

modules/java/src/cpp/utils.h

@@ -1,3 +1,42 @@
 #include <jni.h>
 
 #include "opencv2/core/core.hpp"
+#include "opencv2/features2d/features2d.hpp"
+
+
+void Mat_to_vector_int(cv::Mat& mat, std::vector<int>& v_int);
+
+void vector_int_to_Mat(std::vector<int>& v_int, cv::Mat& mat);
+
+
+void Mat_to_vector_double(cv::Mat& mat, std::vector<double>& v_double);
+
+void vector_double_to_Mat(std::vector<double>& v_double, cv::Mat& mat);
+
+
+void Mat_to_vector_float(cv::Mat& mat, std::vector<float>& v_float);
+
+void vector_float_to_Mat(std::vector<float>& v_float, cv::Mat& mat);
+
+
+void Mat_to_vector_uchar(cv::Mat& mat, std::vector<uchar>& v_uchar);
+
+
+void Mat_to_vector_Rect(cv::Mat& mat, std::vector<cv::Rect>& v_rect);
+
+void vector_Rect_to_Mat(std::vector<cv::Rect>& v_rect, cv::Mat& mat);
+
+
+void Mat_to_vector_Point(cv::Mat& mat, std::vector<cv::Point>& v_point);
+
+void vector_Point_to_Mat(std::vector<cv::Point>& v_point, cv::Mat& mat);
+
+
+void Mat_to_vector_KeyPoint(cv::Mat& mat, std::vector<cv::KeyPoint>& v_kp);
+
+void vector_KeyPoint_to_Mat(std::vector<cv::KeyPoint>& v_kp, cv::Mat& mat);
+
+void Mat_to_vector_Mat(cv::Mat& mat, std::vector<cv::Mat>& v_mat);
+
+void vector_Mat_to_Mat(std::vector<cv::Mat>& v_mat, cv::Mat& mat);
+