third_party/opencv
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Generate constructor with smart pointer, if it's expected.

Browse Source
This commit is contained in:
Alexander Smorkalov 2020-05-29 16:20:28 +03:00
parent 4b5fdc6bb2
commit 821fac187c
3 changed files with 30 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
modules/features2d/misc/java/test/BruteForceDescriptorMatcherTest.java
View File

@ -12,6 +12,7 @@ import org.opencv.core.Point;
import org.opencv.core.Scalar; import org.opencv.core.Scalar;
import org.opencv.core.DMatch; import org.opencv.core.DMatch;
import org.opencv.features2d.DescriptorMatcher; import org.opencv.features2d.DescriptorMatcher;
import org.opencv.features2d.BFMatcher;
import org.opencv.core.KeyPoint; import org.opencv.core.KeyPoint;
import org.opencv.test.OpenCVTestCase; import org.opencv.test.OpenCVTestCase;
import org.opencv.test.OpenCVTestRunner; import org.opencv.test.OpenCVTestRunner;
@ -93,6 +94,15 @@ public class BruteForceDescriptorMatcherTest extends OpenCVTestCase {
}; };
} }
// https://github.com/opencv/opencv/issues/11268
public void testConstructor()
{
BFMatcher self_created_matcher = new BFMatcher();
Mat train = new Mat(1, 1, CvType.CV_8U, new Scalar(123));
self_created_matcher.add(Arrays.asList(train));
assertTrue(!self_created_matcher.empty());
}
public void testAdd() { public void testAdd() {
matcher.add(Arrays.asList(new Mat())); matcher.add(Arrays.asList(new Mat()));
assertFalse(matcher.empty()); assertFalse(matcher.empty());

10
modules/features2d/misc/java/test/FlannBasedDescriptorMatcherTest.java
View File

@ -12,6 +12,7 @@ import org.opencv.core.Point;
import org.opencv.core.Scalar; import org.opencv.core.Scalar;
import org.opencv.core.DMatch; import org.opencv.core.DMatch;
import org.opencv.features2d.DescriptorMatcher; import org.opencv.features2d.DescriptorMatcher;
import org.opencv.features2d.FlannBasedMatcher;
import org.opencv.core.KeyPoint; import org.opencv.core.KeyPoint;
import org.opencv.test.OpenCVTestCase; import org.opencv.test.OpenCVTestCase;
import org.opencv.test.OpenCVTestRunner; import org.opencv.test.OpenCVTestRunner;
@ -168,6 +169,15 @@ public class FlannBasedDescriptorMatcherTest extends OpenCVTestCase {
}; };
} }
// https://github.com/opencv/opencv/issues/11268
public void testConstructor()
{
FlannBasedMatcher self_created_matcher = new FlannBasedMatcher();
Mat train = new Mat(1, 1, CvType.CV_8U, new Scalar(123));
self_created_matcher.add(Arrays.asList(train));
assertTrue(!self_created_matcher.empty());
}
public void testAdd() { public void testAdd() {
matcher.add(Arrays.asList(new Mat())); matcher.add(Arrays.asList(new Mat()));
assertFalse(matcher.empty()); assertFalse(matcher.empty());

13
modules/java/generator/gen_java.py
View File

@ -877,7 +877,10 @@ class JavaWrapperGenerator(object):
ret = "" ret = ""
default = "" default = ""
elif not fi.ctype: # c-tor elif not fi.ctype: # c-tor
ret = "return (jlong) _retval_;" if self.isSmartClass(ci):
ret = "return (jlong)(new Ptr<%(ctype)s>(_retval_));" % { 'ctype': fi.fullClass(isCPP=True) }
else:
ret = "return (jlong) _retval_;"
elif "v_type" in type_dict[fi.ctype]: # c-tor elif "v_type" in type_dict[fi.ctype]: # c-tor
if type_dict[fi.ctype]["v_type"] in ("Mat", "vector_Mat"): if type_dict[fi.ctype]["v_type"] in ("Mat", "vector_Mat"):
ret = "return (jlong) _retval_;" ret = "return (jlong) _retval_;"
@ -920,8 +923,12 @@ class JavaWrapperGenerator(object):
c_epilogue.append("return " + fi.ctype + "_to_List(env, _ret_val_vector_);") c_epilogue.append("return " + fi.ctype + "_to_List(env, _ret_val_vector_);")
if fi.classname: if fi.classname:
if not fi.ctype: # c-tor if not fi.ctype: # c-tor
retval = fi.fullClass(isCPP=True) + "* _retval_ = " if self.isSmartClass(ci):
cvname = "new " + fi.fullClass(isCPP=True) retval = self.smartWrap(ci, fi.fullClass(isCPP=True)) + " _retval_ = "
cvname = "makePtr<" + fi.fullClass(isCPP=True) +">"
else:
retval = fi.fullClass(isCPP=True) + "* _retval_ = "
cvname = "new " + fi.fullClass(isCPP=True)
elif fi.static: elif fi.static:
cvname = fi.fullName(isCPP=True) cvname = fi.fullName(isCPP=True)
else: else: