Modified java wrapping mechanism

modules/objdetect/CMakeLists.txt

@@ -1,2 +1,2 @@
 set(the_description "Object Detection")
-ocv_define_module(objdetect opencv_core opencv_imgproc opencv_ml OPTIONAL opencv_highgui)
+ocv_define_module(objdetect opencv_core opencv_imgproc opencv_ml OPTIONAL opencv_highgui WRAP java)

modules/objdetect/misc/java/test/CascadeClassifierTest.java

@@ -0,0 +1,104 @@
+package org.opencv.test.objdetect;
+
+import org.opencv.core.Mat;
+import org.opencv.core.MatOfRect;
+import org.opencv.core.Size;
+import org.opencv.imgproc.Imgproc;
+import org.opencv.objdetect.CascadeClassifier;
+import org.opencv.objdetect.Objdetect;
+import org.opencv.test.OpenCVTestCase;
+import org.opencv.test.OpenCVTestRunner;
+
+public class CascadeClassifierTest extends OpenCVTestCase {
+
+    private CascadeClassifier cc;
+
+    @Override
+    protected void setUp() throws Exception {
+        super.setUp();
+
+        cc = null;
+    }
+
+    public void testCascadeClassifier() {
+        cc = new CascadeClassifier();
+        assertTrue(null != cc);
+    }
+
+    public void testCascadeClassifierString() {
+        cc = new CascadeClassifier(OpenCVTestRunner.LBPCASCADE_FRONTALFACE_PATH);
+        assertTrue(null != cc);
+    }
+
+    public void testDetectMultiScaleMatListOfRect() {
+        CascadeClassifier cc = new CascadeClassifier(OpenCVTestRunner.LBPCASCADE_FRONTALFACE_PATH);
+        MatOfRect faces = new MatOfRect();
+
+        Mat greyLena = new Mat();
+        Imgproc.cvtColor(rgbLena, greyLena, Imgproc.COLOR_RGB2GRAY);
+
+        // TODO: doesn't detect with 1.1 scale
+        cc.detectMultiScale(greyLena, faces, 1.09, 3, Objdetect.CASCADE_SCALE_IMAGE, new Size(30, 30), new Size());
+        assertEquals(1, faces.total());
+    }
+
+    public void testDetectMultiScaleMatListOfRectDouble() {
+        fail("Not yet implemented");
+    }
+
+    public void testDetectMultiScaleMatListOfRectDoubleInt() {
+        fail("Not yet implemented");
+    }
+
+    public void testDetectMultiScaleMatListOfRectDoubleIntInt() {
+        fail("Not yet implemented");
+    }
+
+    public void testDetectMultiScaleMatListOfRectDoubleIntIntSize() {
+        fail("Not yet implemented");
+    }
+
+    public void testDetectMultiScaleMatListOfRectDoubleIntIntSizeSize() {
+        fail("Not yet implemented");
+    }
+
+    public void testDetectMultiScaleMatListOfRectListOfIntegerListOfDouble() {
+        fail("Not yet implemented");
+    }
+
+    public void testDetectMultiScaleMatListOfRectListOfIntegerListOfDoubleDouble() {
+        fail("Not yet implemented");
+    }
+
+    public void testDetectMultiScaleMatListOfRectListOfIntegerListOfDoubleDoubleInt() {
+        fail("Not yet implemented");
+    }
+
+    public void testDetectMultiScaleMatListOfRectListOfIntegerListOfDoubleDoubleIntInt() {
+        fail("Not yet implemented");
+    }
+
+    public void testDetectMultiScaleMatListOfRectListOfIntegerListOfDoubleDoubleIntIntSize() {
+        fail("Not yet implemented");
+    }
+
+    public void testDetectMultiScaleMatListOfRectListOfIntegerListOfDoubleDoubleIntIntSizeSize() {
+        fail("Not yet implemented");
+    }
+
+    public void testDetectMultiScaleMatListOfRectListOfIntegerListOfDoubleDoubleIntIntSizeSizeBoolean() {
+        fail("Not yet implemented");
+    }
+
+    public void testEmpty() {
+        cc = new CascadeClassifier();
+        assertTrue(cc.empty());
+    }
+
+    public void testLoad() {
+        cc = new CascadeClassifier();
+        cc.load(OpenCVTestRunner.LBPCASCADE_FRONTALFACE_PATH);
+        assertTrue(!cc.empty());
+    }
+
+}

modules/objdetect/misc/java/test/HOGDescriptorTest.java

@@ -0,0 +1,259 @@
+package org.opencv.test.objdetect;
+
+import org.opencv.objdetect.HOGDescriptor;
+import org.opencv.test.OpenCVTestCase;
+
+public class HOGDescriptorTest extends OpenCVTestCase {
+
+    public void testCheckDetectorSize() {
+        fail("Not yet implemented");
+    }
+
+    public void testComputeGradientMatMatMat() {
+        fail("Not yet implemented");
+    }
+
+    public void testComputeGradientMatMatMatSize() {
+        fail("Not yet implemented");
+    }
+
+    public void testComputeGradientMatMatMatSizeSize() {
+        fail("Not yet implemented");
+    }
+
+    public void testComputeMatListOfFloat() {
+        fail("Not yet implemented");
+    }
+
+    public void testComputeMatListOfFloatSize() {
+        fail("Not yet implemented");
+    }
+
+    public void testComputeMatListOfFloatSizeSize() {
+        fail("Not yet implemented");
+    }
+
+    public void testComputeMatListOfFloatSizeSizeListOfPoint() {
+        fail("Not yet implemented");
+    }
+
+    public void testDetectMatListOfPoint() {
+        fail("Not yet implemented");
+    }
+
+    public void testDetectMatListOfPointDouble() {
+        fail("Not yet implemented");
+    }
+
+    public void testDetectMatListOfPointDoubleSize() {
+        fail("Not yet implemented");
+    }
+
+    public void testDetectMatListOfPointDoubleSizeSize() {
+        fail("Not yet implemented");
+    }
+
+    public void testDetectMatListOfPointDoubleSizeSizeListOfPoint() {
+        fail("Not yet implemented");
+    }
+
+    public void testDetectMatListOfPointListOfDouble() {
+        fail("Not yet implemented");
+    }
+
+    public void testDetectMatListOfPointListOfDoubleDouble() {
+        fail("Not yet implemented");
+    }
+
+    public void testDetectMatListOfPointListOfDoubleDoubleSize() {
+        fail("Not yet implemented");
+    }
+
+    public void testDetectMatListOfPointListOfDoubleDoubleSizeSize() {
+        fail("Not yet implemented");
+    }
+
+    public void testDetectMatListOfPointListOfDoubleDoubleSizeSizeListOfPoint() {
+        fail("Not yet implemented");
+    }
+
+    public void testDetectMultiScaleMatListOfRect() {
+        fail("Not yet implemented");
+    }
+
+    public void testDetectMultiScaleMatListOfRectDouble() {
+        fail("Not yet implemented");
+    }
+
+    public void testDetectMultiScaleMatListOfRectDoubleSize() {
+        fail("Not yet implemented");
+    }
+
+    public void testDetectMultiScaleMatListOfRectDoubleSizeSize() {
+        fail("Not yet implemented");
+    }
+
+    public void testDetectMultiScaleMatListOfRectDoubleSizeSizeDouble() {
+        fail("Not yet implemented");
+    }
+
+    public void testDetectMultiScaleMatListOfRectDoubleSizeSizeDoubleDouble() {
+        fail("Not yet implemented");
+    }
+
+    public void testDetectMultiScaleMatListOfRectDoubleSizeSizeDoubleDoubleBoolean() {
+        fail("Not yet implemented");
+    }
+
+    public void testDetectMultiScaleMatListOfRectListOfDouble() {
+        fail("Not yet implemented");
+    }
+
+    public void testDetectMultiScaleMatListOfRectListOfDoubleDouble() {
+        fail("Not yet implemented");
+    }
+
+    public void testDetectMultiScaleMatListOfRectListOfDoubleDoubleSize() {
+        fail("Not yet implemented");
+    }
+
+    public void testDetectMultiScaleMatListOfRectListOfDoubleDoubleSizeSize() {
+        fail("Not yet implemented");
+    }
+
+    public void testDetectMultiScaleMatListOfRectListOfDoubleDoubleSizeSizeDouble() {
+        fail("Not yet implemented");
+    }
+
+    public void testDetectMultiScaleMatListOfRectListOfDoubleDoubleSizeSizeDoubleDouble() {
+        fail("Not yet implemented");
+    }
+
+    public void testDetectMultiScaleMatListOfRectListOfDoubleDoubleSizeSizeDoubleDoubleBoolean() {
+        fail("Not yet implemented");
+    }
+
+    public void testGet_blockSize() {
+        fail("Not yet implemented");
+    }
+
+    public void testGet_blockStride() {
+        fail("Not yet implemented");
+    }
+
+    public void testGet_cellSize() {
+        fail("Not yet implemented");
+    }
+
+    public void testGet_derivAperture() {
+        fail("Not yet implemented");
+    }
+
+    public void testGet_gammaCorrection() {
+        fail("Not yet implemented");
+    }
+
+    public void testGet_histogramNormType() {
+        fail("Not yet implemented");
+    }
+
+    public void testGet_L2HysThreshold() {
+        fail("Not yet implemented");
+    }
+
+    public void testGet_nbins() {
+        fail("Not yet implemented");
+    }
+
+    public void testGet_nlevels() {
+        fail("Not yet implemented");
+    }
+
+    public void testGet_svmDetector() {
+        fail("Not yet implemented");
+    }
+
+    public void testGet_winSigma() {
+        fail("Not yet implemented");
+    }
+
+    public void testGet_winSize() {
+        fail("Not yet implemented");
+    }
+
+    public void testGetDaimlerPeopleDetector() {
+        fail("Not yet implemented");
+    }
+
+    public void testGetDefaultPeopleDetector() {
+        fail("Not yet implemented");
+    }
+
+    public void testGetDescriptorSize() {
+        fail("Not yet implemented");
+    }
+
+    public void testGetWinSigma() {
+        fail("Not yet implemented");
+    }
+
+    public void testHOGDescriptor() {
+        HOGDescriptor hog = new HOGDescriptor();
+
+        assertNotNull(hog);
+        assertEquals(HOGDescriptor.DEFAULT_NLEVELS, hog.get_nlevels());
+    }
+
+    public void testHOGDescriptorSizeSizeSizeSizeInt() {
+        fail("Not yet implemented");
+    }
+
+    public void testHOGDescriptorSizeSizeSizeSizeIntInt() {
+        fail("Not yet implemented");
+    }
+
+    public void testHOGDescriptorSizeSizeSizeSizeIntIntDouble() {
+        fail("Not yet implemented");
+    }
+
+    public void testHOGDescriptorSizeSizeSizeSizeIntIntDoubleInt() {
+        fail("Not yet implemented");
+    }
+
+    public void testHOGDescriptorSizeSizeSizeSizeIntIntDoubleIntDouble() {
+        fail("Not yet implemented");
+    }
+
+    public void testHOGDescriptorSizeSizeSizeSizeIntIntDoubleIntDoubleBoolean() {
+        fail("Not yet implemented");
+    }
+
+    public void testHOGDescriptorSizeSizeSizeSizeIntIntDoubleIntDoubleBooleanInt() {
+        fail("Not yet implemented");
+    }
+
+    public void testHOGDescriptorString() {
+        fail("Not yet implemented");
+    }
+
+    public void testLoadString() {
+        fail("Not yet implemented");
+    }
+
+    public void testLoadStringString() {
+        fail("Not yet implemented");
+    }
+
+    public void testSaveString() {
+        fail("Not yet implemented");
+    }
+
+    public void testSaveStringString() {
+        fail("Not yet implemented");
+    }
+
+    public void testSetSVMDetector() {
+        fail("Not yet implemented");
+    }
+
+}

modules/objdetect/misc/java/test/ObjdetectTest.java

@@ -0,0 +1,42 @@
+package org.opencv.test.objdetect;
+
+import org.opencv.test.OpenCVTestCase;
+
+public class ObjdetectTest extends OpenCVTestCase {
+
+    public void testGroupRectanglesListOfRectListOfIntegerInt() {
+        fail("Not yet implemented");
+        /*
+        final int NUM = 10;
+        MatOfRect rects = new MatOfRect();
+        rects.alloc(NUM);
+
+        for (int i = 0; i < NUM; i++)
+            rects.put(i, 0, 10, 10, 20, 20);
+
+        int groupThreshold = 1;
+        Objdetect.groupRectangles(rects, null, groupThreshold);//TODO: second parameter should not be null
+        assertEquals(1, rects.total());
+        */
+    }
+
+    public void testGroupRectanglesListOfRectListOfIntegerIntDouble() {
+        fail("Not yet implemented");
+        /*
+        final int NUM = 10;
+        MatOfRect rects = new MatOfRect();
+        rects.alloc(NUM);
+
+        for (int i = 0; i < NUM; i++)
+            rects.put(i, 0, 10, 10, 20, 20);
+
+        for (int i = 0; i < NUM; i++)
+            rects.put(i, 0, 10, 10, 25, 25);
+
+        int groupThreshold = 1;
+        double eps = 0.2;
+        Objdetect.groupRectangles(rects, null, groupThreshold, eps);//TODO: second parameter should not be null
+        assertEquals(2, rects.size());
+        */
+    }
+}