mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2025-06-29 16:11:00 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #20344 from alalek:backport_20343

Browse Source
This commit is contained in:
Alexander Alekhin 2021-07-02 23:35:12 +00:00
commit d7d491d445
2 changed files with 21 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/dnn/misc/java/gen_dict.json
View File

@ -54,7 +54,7 @@
] ]
], ],
"jni_name": "(*(cv::dnn::DictValue*)%(n)s_nativeObj)", "jni_name": "(*(*(Ptr<cv::dnn::DictValue>*)%(n)s_nativeObj))",
"jni_type": "jlong", "jni_type": "jlong",
"suffix": "J", "suffix": "J",
"j_import": "org.opencv.dnn.DictValue" "j_import": "org.opencv.dnn.DictValue"

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

@ -224,6 +224,9 @@ class ClassInfo(GeneralInfo):
for m in decl[2]: for m in decl[2]:
if m.startswith("="): if m.startswith("="):
self.jname = m[1:] self.jname = m[1:]
if m == '/Simple':
self.smart = False
self.base = '' self.base = ''
if decl[1]: if decl[1]:
#self.base = re.sub(r"\b"+self.jname+r"\b", "", decl[1].replace(":", "")).strip() #self.base = re.sub(r"\b"+self.jname+r"\b", "", decl[1].replace(":", "")).strip()
@ -370,7 +373,7 @@ class JavaWrapperGenerator(object):
def clear(self): def clear(self):
self.namespaces = ["cv"] self.namespaces = ["cv"]
self.classes = { "Mat" : ClassInfo([ 'class Mat', '', [], [] ], self.namespaces) } self.classes = { "Mat" : ClassInfo([ 'class Mat', '', ['/Simple'], [] ], self.namespaces) }
self.module = "" self.module = ""
self.Module = "" self.Module = ""
self.ported_func_list = [] self.ported_func_list = []
@ -390,10 +393,15 @@ class JavaWrapperGenerator(object):
if name in type_dict and not classinfo.base: if name in type_dict and not classinfo.base:
logging.warning('duplicated: %s', classinfo) logging.warning('duplicated: %s', classinfo)
return return
if self.isSmartClass(classinfo):
jni_name = "*((*(Ptr<"+classinfo.fullName(isCPP=True)+">*)%(n)s_nativeObj).get())"
else:
jni_name = "(*("+classinfo.fullName(isCPP=True)+"*)%(n)s_nativeObj)"
type_dict.setdefault(name, {}).update( type_dict.setdefault(name, {}).update(
{ "j_type" : classinfo.jname, { "j_type" : classinfo.jname,
"jn_type" : "long", "jn_args" : (("__int64", ".nativeObj"),), "jn_type" : "long", "jn_args" : (("__int64", ".nativeObj"),),
"jni_name" : "(*("+classinfo.fullName(isCPP=True)+"*)%(n)s_nativeObj)", "jni_type" : "jlong", "jni_name" : jni_name,
"jni_type" : "jlong",
"suffix" : "J", "suffix" : "J",
"j_import" : "org.opencv.%s.%s" % (self.module, classinfo.jname) "j_import" : "org.opencv.%s.%s" % (self.module, classinfo.jname)
} }
@ -401,7 +409,8 @@ class JavaWrapperGenerator(object):
type_dict.setdefault(name+'*', {}).update( type_dict.setdefault(name+'*', {}).update(
{ "j_type" : classinfo.jname, { "j_type" : classinfo.jname,
"jn_type" : "long", "jn_args" : (("__int64", ".nativeObj"),), "jn_type" : "long", "jn_args" : (("__int64", ".nativeObj"),),
"jni_name" : "("+classinfo.fullName(isCPP=True)+"*)%(n)s_nativeObj", "jni_type" : "jlong", "jni_name" : "&("+jni_name+")",
"jni_type" : "jlong",
"suffix" : "J", "suffix" : "J",
"j_import" : "org.opencv.%s.%s" % (self.module, classinfo.jname) "j_import" : "org.opencv.%s.%s" % (self.module, classinfo.jname)
} }
@ -889,7 +898,13 @@ class JavaWrapperGenerator(object):
ret = "return env->NewStringUTF(_retval_.c_str());" ret = "return env->NewStringUTF(_retval_.c_str());"
default = 'return env->NewStringUTF("");' default = 'return env->NewStringUTF("");'
elif self.isWrapped(fi.ctype): # wrapped class: elif self.isWrapped(fi.ctype): # wrapped class:
ret = "return (jlong) new %s(_retval_);" % self.fullTypeName(fi.ctype) ret = None
if fi.ctype in self.classes:
ret_ci = self.classes[fi.ctype]
if self.isSmartClass(ret_ci):
ret = "return (jlong)(new Ptr<%(ctype)s>(new %(ctype)s(_retval_)));" % { 'ctype': self.fullTypeName(fi.ctype) }
if ret is None:
ret = "return (jlong) new %s(_retval_);" % self.fullTypeName(fi.ctype)
elif fi.ctype.startswith('Ptr_'): elif fi.ctype.startswith('Ptr_'):
c_prologue.append("typedef Ptr<%s> %s;" % (self.fullTypeName(fi.ctype[4:]), fi.ctype)) c_prologue.append("typedef Ptr<%s> %s;" % (self.fullTypeName(fi.ctype[4:]), fi.ctype))
ret = "return (jlong)(new %(ctype)s(_retval_));" % { 'ctype':fi.ctype } ret = "return (jlong)(new %(ctype)s(_retval_));" % { 'ctype':fi.ctype }
@ -1128,17 +1143,7 @@ JNIEXPORT void JNICALL Java_org_opencv_%(module)s_%(j_cls)s_delete
if ci.smart != None: if ci.smart != None:
return ci.smart return ci.smart
# if parents are smart (we hope) then children are! ci.smart = True # smart class is not properly handled in case of base/derived classes
# if not we believe the class is smart if it has "create" method
ci.smart = False
if ci.base or ci.name == 'Algorithm':
ci.smart = True
else:
for fi in ci.methods:
if fi.name == "create":
ci.smart = True
break
return ci.smart return ci.smart
def smartWrap(self, ci, fullname): def smartWrap(self, ci, fullname):