Java API: fixing converters (copyData=true) and samples compilation

Testing: 1079/0/592

diff --git a/modules/java/android_test/src/org/opencv/test/imgproc/imgprocTest.java b/modules/java/android_test/src/org/opencv/test/imgproc/imgprocTest.java
index bfff468..a9330f3 100644 (file)
--- a/modules/java/android_test/src/org/opencv/test/imgproc/imgprocTest.java
+++ b/modules/java/android_test/src/org/opencv/test/imgproc/imgprocTest.java
@@ -16,6 +16,7 @@ import org.opencv.imgproc.Imgproc;
 import org.opencv.test.OpenCVTestCase;
 import org.opencv.test.OpenCVTestRunner;
 
+
 public class imgprocTest extends OpenCVTestCase {
 
     private Mat gray_64f_2;
@@ -1407,11 +1408,14 @@ public class imgprocTest extends OpenCVTestCase {
     }
 
     public void testMinEnclosingCircle() {
-        Mat points = new Mat(1, 4, CvType.CV_32FC2);
-        points.put(0, 0, -1.0, 0.0, 0.0, 1.0, 1.0, 0.0, 0.0, -1.0);
+        List<Point> points = new ArrayList<Point>();
+        points.add(new Point(0, 0));
+        points.add(new Point(-1, 0));
+        points.add(new Point(0, -1));
+        points.add(new Point(1, 0));
+        points.add(new Point(0, 1));
 
         OpenCVTestRunner.Log(points.toString());
-        OpenCVTestRunner.Log(points.dump());
 
         Point actualCenter = new Point();
         float radius = 347.0f; // FIXME: Unexpected radius is returned i.e 0

diff --git a/modules/java/gen_java.py b/modules/java/gen_java.py
index a97a469..61da6f9 100644 (file)
--- a/modules/java/gen_java.py
+++ b/modules/java/gen_java.py
@@ -474,6 +474,7 @@ func_arg_fix = {
         'goodFeaturesToTrack' : { 'corners' : 'vector_Point', },\r
         'findFundamentalMat' : { 'points1' : 'vector_Point2d', 'points2' : 'vector_Point2d', },\r
         'cornerSubPix' : { 'corners' : 'vector_Point2f', },\r
+        'minEnclosingCircle' : { 'points' : '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
@@ -940,7 +941,7 @@ extern "C" {
             jn_code.write( Template(\\r
                 "    private static native $type $name($args);\n").substitute(\\r
                 type = type_dict[fi.ctype].get("jn_type", "double[]"), \\r
-                name = fi.jname + '_' + `suffix_counter`, \\r
+                name = fi.jname + '_' + str(suffix_counter), \\r
                 args = ", ".join(["%s %s" % (type_dict[a.ctype]["jn_type"], a.name.replace(".","_").replace("[","").replace("]","")) for a in jn_args])\r
             ) );\r
 \r
@@ -1007,7 +1008,7 @@ extern "C" {
                     j_type=type_dict[fi.ctype]["j_type"], \\r
                     j_name=fi.jname, \\r
                     j_args=", ".join(["%s %s" % (type_dict[a.ctype]["j_type"], a.name) for a in args]), \\r
-                    jn_name=fi.jname + '_' + `suffix_counter`, \\r
+                    jn_name=fi.jname + '_' + str(suffix_counter), \\r
                     jn_args_call=", ".join( [a.name for a in jn_args] ),\\r
                 )\r
             )\r
@@ -1109,7 +1110,7 @@ JNIEXPORT $rtype JNICALL Java_org_opencv_${module}_${clazz}_$fname
         rtype = rtype, \\r
         module = self.module, \\r
         clazz = clazz, \\r
-        fname = (fi.jname + '_' + `suffix_counter`).replace('_', '_1'), \\r
+        fname = (fi.jname + '_' + str(suffix_counter)).replace('_', '_1'), \\r
         args = ", ".join(["%s %s" % (type_dict[a.ctype].get("jni_type"), a.name) for a in jni_args]), \\r
         prologue = "\n        ".join(c_prologue), \\r
         epilogue = "  ".join(c_epilogue), \\r

diff --git a/modules/java/src/cpp/converters.cpp b/modules/java/src/cpp/converters.cpp
index 984e301..414b2d1 100644 (file)
--- a/modules/java/src/cpp/converters.cpp
+++ b/modules/java/src/cpp/converters.cpp
@@ -24,7 +24,7 @@ void Mat_to_vector_int(Mat& mat, vector<int>& v_int)
 \r
 void vector_int_to_Mat(vector<int>& v_int, Mat& mat)\r
 {\r
-       mat = Mat(v_int);\r
+       mat = Mat(v_int, true);\r
 }\r
 \r
 \r
@@ -39,7 +39,7 @@ void Mat_to_vector_double(Mat& mat, vector<double>& v_double)
 \r
 void vector_double_to_Mat(vector<double>& v_double, Mat& mat)\r
 {\r
-       mat = Mat(v_double);\r
+       mat = Mat(v_double, true);\r
 }\r
 \r
 \r
@@ -54,7 +54,7 @@ void Mat_to_vector_float(Mat& mat, vector<float>& v_float)
 \r
 void vector_float_to_Mat(vector<float>& v_float, Mat& mat)\r
 {\r
-       mat = Mat(v_float);\r
+       mat = Mat(v_float, true);\r
 }\r
 \r
 \r
@@ -86,7 +86,7 @@ void Mat_to_vector_Rect(Mat& mat, vector<Rect>& v_rect)
 \r
 void vector_Rect_to_Mat(vector<Rect>& v_rect, Mat& mat)\r
 {\r
-       mat = Mat(v_rect);\r
+       mat = Mat(v_rect, true);\r
 }\r
 \r
 \r
@@ -142,32 +142,32 @@ void Mat_to_vector_Point3d(Mat& mat, vector<Point3d>& v_point)
 \r
 void vector_Point_to_Mat(vector<Point>& v_point, Mat& mat)\r
 {\r
-       mat = Mat(v_point);\r
+       mat = Mat(v_point, true);\r
 }\r
 \r
 void vector_Point2f_to_Mat(vector<Point2f>& v_point, Mat& mat)\r
 {\r
-       mat = Mat(v_point);\r
+       mat = Mat(v_point, true);\r
 }\r
 \r
 void vector_Point2d_to_Mat(vector<Point2d>& v_point, Mat& mat)\r
 {\r
-       mat = Mat(v_point);\r
+       mat = Mat(v_point, true);\r
 }\r
 \r
 void vector_Point3i_to_Mat(vector<Point3i>& v_point, Mat& mat)\r
 {\r
-       mat = Mat(v_point);\r
+       mat = Mat(v_point, true);\r
 }\r
 \r
 void vector_Point3f_to_Mat(vector<Point3f>& v_point, Mat& mat)\r
 {\r
-       mat = Mat(v_point);\r
+       mat = Mat(v_point, true);\r
 }\r
 \r
 void vector_Point3d_to_Mat(vector<Point3d>& v_point, Mat& mat)\r
 {\r
-       mat = Mat(v_point);\r
+       mat = Mat(v_point, true);\r
 }\r
 \r
 \r

diff --git a/samples/android/15-puzzle/src/org/opencv/samples/puzzle15/puzzle15View.java b/samples/android/15-puzzle/src/org/opencv/samples/puzzle15/puzzle15View.java
index 9721d27..3365538 100644 (file)
--- a/samples/android/15-puzzle/src/org/opencv/samples/puzzle15/puzzle15View.java
+++ b/samples/android/15-puzzle/src/org/opencv/samples/puzzle15/puzzle15View.java
@@ -1,6 +1,6 @@
 package org.opencv.samples.puzzle15;\r
 \r
-import org.opencv.Android;\r
+import org.opencv.android.Utils;\r
 import org.opencv.core.Core;\r
 import org.opencv.core.Mat;\r
 import org.opencv.core.Size;\r
@@ -137,7 +137,7 @@ public class puzzle15View extends SampleCvViewBase implements OnTouchListener {
         drawGrid(cols, rows);\r
 \r
         Bitmap bmp = Bitmap.createBitmap(cols, rows, Bitmap.Config.ARGB_8888);\r
-        if (Android.MatToBitmap(mRgba15, bmp))\r
+        if (Utils.MatToBitmap(mRgba15, bmp))\r
             return bmp;\r
 \r
         bmp.recycle();\r

diff --git a/samples/android/face-detection/src/org/opencv/samples/fd/FdView.java b/samples/android/face-detection/src/org/opencv/samples/fd/FdView.java
index 07e1589..ff74d12 100644 (file)
--- a/samples/android/face-detection/src/org/opencv/samples/fd/FdView.java
+++ b/samples/android/face-detection/src/org/opencv/samples/fd/FdView.java
@@ -7,7 +7,7 @@ import java.io.InputStream;
 import java.util.LinkedList;
 import java.util.List;
 
-import org.opencv.Android;
+import org.opencv.android.Utils;
 import org.opencv.core.Core;
 import org.opencv.core.Mat;
 import org.opencv.core.Rect;
@@ -91,7 +91,7 @@ class FdView extends SampleCvViewBase {
 
         Bitmap bmp = Bitmap.createBitmap(mRgba.cols(), mRgba.rows(), Bitmap.Config.ARGB_8888);
 
-        if (Android.MatToBitmap(mRgba, bmp))
+        if (Utils.MatToBitmap(mRgba, bmp))
             return bmp;
 
         bmp.recycle();

diff --git a/samples/android/image-manipulations/src/org/opencv/samples/imagemanipulations/ImageManipulationsView.java b/samples/android/image-manipulations/src/org/opencv/samples/imagemanipulations/ImageManipulationsView.java
index a7ded09..9ee9ab4 100644 (file)
--- a/samples/android/image-manipulations/src/org/opencv/samples/imagemanipulations/ImageManipulationsView.java
+++ b/samples/android/image-manipulations/src/org/opencv/samples/imagemanipulations/ImageManipulationsView.java
@@ -1,6 +1,6 @@
 package org.opencv.samples.imagemanipulations;
 
-import org.opencv.Android;
+import org.opencv.android.Utils;
 import org.opencv.core.Core;
 import org.opencv.core.Mat;
 import org.opencv.core.Size;
@@ -135,7 +135,7 @@ class ImageManipulationsView extends SampleCvViewBase {
 
         Bitmap bmp = Bitmap.createBitmap(mRgba.cols(), mRgba.rows(), Bitmap.Config.ARGB_8888);
 
-        if (Android.MatToBitmap(mRgba, bmp))
+        if (Utils.MatToBitmap(mRgba, bmp))
             return bmp;
 
         bmp.recycle();

diff --git a/samples/android/tutorial-1-addopencv/src/org/opencv/samples/tutorial1/Sample1View.java b/samples/android/tutorial-1-addopencv/src/org/opencv/samples/tutorial1/Sample1View.java
index 3cc1017..a1fd2f0 100644 (file)
--- a/samples/android/tutorial-1-addopencv/src/org/opencv/samples/tutorial1/Sample1View.java
+++ b/samples/android/tutorial-1-addopencv/src/org/opencv/samples/tutorial1/Sample1View.java
@@ -1,6 +1,6 @@
 package org.opencv.samples.tutorial1;
 
-import org.opencv.Android;
+import org.opencv.android.Utils;
 import org.opencv.core.Core;
 import org.opencv.core.Mat;
 import org.opencv.core.Point;
@@ -56,7 +56,7 @@ class Sample1View extends SampleViewBase {
 
         Bitmap bmp = Bitmap.createBitmap(getFrameWidth(), getFrameHeight(), Bitmap.Config.ARGB_8888);
 
-        if (Android.MatToBitmap(mRgba, bmp))
+        if (Utils.MatToBitmap(mRgba, bmp))
             return bmp;
 
         bmp.recycle();

diff --git a/samples/android/tutorial-2-opencvcamera/src/org/opencv/samples/tutorial2/Sample2View.java b/samples/android/tutorial-2-opencvcamera/src/org/opencv/samples/tutorial2/Sample2View.java
index 099ef48..15a0bc8 100644 (file)
--- a/samples/android/tutorial-2-opencvcamera/src/org/opencv/samples/tutorial2/Sample2View.java
+++ b/samples/android/tutorial-2-opencvcamera/src/org/opencv/samples/tutorial2/Sample2View.java
@@ -1,6 +1,6 @@
 package org.opencv.samples.tutorial2;
 
-import org.opencv.Android;
+import org.opencv.android.Utils;
 import org.opencv.core.Core;
 import org.opencv.core.Mat;
 import org.opencv.core.Point;
@@ -54,7 +54,7 @@ class Sample2View extends SampleCvViewBase {
 
         Bitmap bmp = Bitmap.createBitmap(mRgba.cols(), mRgba.rows(), Bitmap.Config.ARGB_8888);
 
-        if (Android.MatToBitmap(mRgba, bmp))
+        if (Utils.MatToBitmap(mRgba, bmp))
             return bmp;
 
         bmp.recycle();

diff --git a/samples/android/tutorial-4-mixed/src/org/opencv/samples/tutorial4/Sample4View.java b/samples/android/tutorial-4-mixed/src/org/opencv/samples/tutorial4/Sample4View.java
index ee77183..9326dff 100644 (file)
--- a/samples/android/tutorial-4-mixed/src/org/opencv/samples/tutorial4/Sample4View.java
+++ b/samples/android/tutorial-4-mixed/src/org/opencv/samples/tutorial4/Sample4View.java
@@ -1,6 +1,6 @@
 package org.opencv.samples.tutorial4;
 
-import org.opencv.Android;
+import org.opencv.android.Utils;
 import org.opencv.core.Mat;
 import org.opencv.core.CvType;
 import org.opencv.imgproc.Imgproc;
@@ -56,7 +56,7 @@ class Sample4View extends SampleViewBase {
 
         Bitmap bmp = Bitmap.createBitmap(getFrameWidth(), getFrameHeight(), Bitmap.Config.ARGB_8888);
 
-        if (Android.MatToBitmap(mRgba, bmp))
+        if (Utils.MatToBitmap(mRgba, bmp))
             return bmp;
 
         bmp.recycle();