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

Merge branch 4.x

Browse Source
This commit is contained in:
Alexander Alekhin
2023-01-09 11:08:02 +00:00
parent 8a62b03761 2ab46d9553
commit 593a376566
880 changed files with 83958 additions and 9368 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/objc/generator/gen_objc.py
+22 -6
View File
@@ -208,6 +208,7 @@ class ConstInfo(GeneralInfo):
def __init__(self, decl, addedManually=False, namespaces=[], enumType=None):
GeneralInfo.__init__(self, "const", decl, namespaces)
self.cname = get_cname(self.name)
self.swift_name = None
self.value = decl[1]
self.enumType = enumType
self.addedManually = addedManually
@@ -786,14 +787,27 @@ class ObjectiveCWrapperGenerator(object):
logging.info('ignored: %s', constinfo)
else:
objc_type = enumType.rsplit(".", 1)[-1] if enumType else ""
if constinfo.classname in const_fix and objc_type in const_fix[constinfo.classname] and constinfo.name in const_fix[constinfo.classname][objc_type]:
fixed_const = const_fix[constinfo.classname][objc_type][constinfo.name]
constinfo.name = fixed_const
constinfo.cname = fixed_const
if constinfo.enumType and constinfo.classpath:
new_name = constinfo.classname + '_' + constinfo.name
const_fix.setdefault(constinfo.classpath, {}).setdefault(objc_type, {})[constinfo.name] = new_name
constinfo.swift_name = constinfo.name
constinfo.name = new_name
logging.info('use outer class prefix: %s', constinfo)
if constinfo.classpath in const_fix and objc_type in const_fix[constinfo.classpath]:
fixed_consts = const_fix[constinfo.classpath][objc_type]
if constinfo.name in fixed_consts:
fixed_const = fixed_consts[constinfo.name]
constinfo.name = fixed_const
constinfo.cname = fixed_const
if constinfo.value in fixed_consts:
constinfo.value = fixed_consts[constinfo.value]
if not self.isWrapped(constinfo.classname):
logging.info('class not found: %s', constinfo)
constinfo.name = constinfo.classname + '_' + constinfo.name
if not constinfo.name.startswith(constinfo.classname + "_"):
constinfo.swift_name = constinfo.name
constinfo.name = constinfo.classname + '_' + constinfo.name
constinfo.classname = ''
ci = self.getClass(constinfo.classname)
@@ -1302,7 +1316,9 @@ $unrefined_call$epilogue$ret
ci.enum_declarations.write("""
// C++: enum {1} ({2})
typedef NS_ENUM(int, {1}) {{
{0}\n}};\n\n""".format(",\n ".join(["%s = %s" % (c.name, c.value) for c in consts]), typeNameShort, typeName)
{0}\n}};\n\n""".format(
",\n ".join(["%s = %s" % (c.name + (" NS_SWIFT_NAME(" + c.swift_name + ")" if c.swift_name else ""), c.value) for c in consts]),
typeNameShort, typeName)
)
else:
if not wrote_consts_pragma: