potok/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2026-07-29 15:23:05 +04:00
Code Packages Releases Wiki Activity

Merge branch 4.x

Browse Source
This commit is contained in:
Alexander Smorkalov
2025-02-19 09:31:51 +03:00
parent 4d15b2a33f 6092499907
commit 1483504702
130 changed files with 6998 additions and 3110 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/java/generator/gen_java.py
+4 -2
View File
@@ -437,6 +437,8 @@ class FuncInfo(GeneralInfo):
arg_fix_map = func_fix_map.get(arg[1], {})
arg[0] = arg_fix_map.get('ctype', arg[0]) #fixing arg type
arg[3] = arg_fix_map.get('attrib', arg[3]) #fixing arg attrib
if arg[0] == 'dnn_Net':
arg[0] = 'Net'
self.args.append(ArgInfo(arg))
def fullClassJAVA(self):
@@ -486,7 +488,7 @@ class JavaWrapperGenerator(object):
jni_name = "(*("+classinfo.fullNameCPP()+"*)%(n)s_nativeObj)"
type_dict.setdefault(name, {}).update(
{ "j_type" : classinfo.jname,
"jn_type" : "long", "jn_args" : (("__int64", ".nativeObj"),),
"jn_type" : "long", "jn_args" : (("__int64", ".getNativeObjAddr()"),),
"jni_name" : jni_name,
"jni_type" : "jlong",
"suffix" : "J",
@@ -495,7 +497,7 @@ class JavaWrapperGenerator(object):
)
type_dict.setdefault(name+'*', {}).update(
{ "j_type" : classinfo.jname,
"jn_type" : "long", "jn_args" : (("__int64", ".nativeObj"),),
"jn_type" : "long", "jn_args" : (("__int64", ".getNativeObjAddr()"),),
"jni_name" : "&("+jni_name+")",
"jni_type" : "jlong",
"suffix" : "J",