|
|
|
|
@ -62,7 +62,7 @@ type_dict = { |
|
|
|
|
# In example, cv::fisheye::stereoRectify from namespace fisheye is wrapped as fisheye_stereoRectify |
|
|
|
|
namespaces_dict = {} |
|
|
|
|
|
|
|
|
|
# { class : [ header ] } |
|
|
|
|
# { module: { class | "*" : [ header ]} } |
|
|
|
|
AdditionalImports = {} |
|
|
|
|
|
|
|
|
|
# { class : { func : {declaration, implementation} } } |
|
|
|
|
@ -74,6 +74,9 @@ func_arg_fix = {} |
|
|
|
|
# { class : { enum: fixed_enum } } |
|
|
|
|
enum_fix = {} |
|
|
|
|
|
|
|
|
|
# { class : { enum: { const: fixed_const} } } |
|
|
|
|
const_fix = {} |
|
|
|
|
|
|
|
|
|
# { (class, func) : objc_signature } |
|
|
|
|
method_dict = { |
|
|
|
|
("Mat", "convertTo") : "-convertTo:rtype:alpha:beta:", |
|
|
|
|
@ -226,14 +229,15 @@ class ClassPropInfo(): |
|
|
|
|
class ClassInfo(GeneralInfo): |
|
|
|
|
def __init__(self, decl, namespaces=[]): # [ 'class/struct cname', ': base', [modlist] ] |
|
|
|
|
GeneralInfo.__init__(self, "class", decl, namespaces) |
|
|
|
|
self.cname = get_cname(self.name) |
|
|
|
|
self.cname = self.name if not self.classname else self.classname + "_" + self.name |
|
|
|
|
self.real_cname = self.name if not self.classname else self.classname + "::" + self.name |
|
|
|
|
self.methods = [] |
|
|
|
|
self.methods_suffixes = {} |
|
|
|
|
self.consts = [] # using a list to save the occurrence order |
|
|
|
|
self.private_consts = [] |
|
|
|
|
self.imports = set() |
|
|
|
|
self.props= [] |
|
|
|
|
self.objc_name = self.name |
|
|
|
|
self.objc_name = self.name if not self.classname else self.classname + self.name |
|
|
|
|
self.smart = None # True if class stores Ptr<T>* instead of T* in nativeObj field |
|
|
|
|
self.additionalImports = None # additional import files |
|
|
|
|
self.enum_declarations = None # Objective-C enum declarations stream |
|
|
|
|
@ -422,10 +426,12 @@ class ArgInfo(): |
|
|
|
|
defval=self.defval) |
|
|
|
|
|
|
|
|
|
class FuncInfo(GeneralInfo): |
|
|
|
|
def __init__(self, decl, namespaces=[]): # [ funcname, return_ctype, [modifiers], [args] ] |
|
|
|
|
def __init__(self, decl, module, namespaces=[]): # [ funcname, return_ctype, [modifiers], [args] ] |
|
|
|
|
GeneralInfo.__init__(self, "func", decl, namespaces) |
|
|
|
|
self.cname = get_cname(decl[0]) |
|
|
|
|
self.objc_name = self.name |
|
|
|
|
nested_type = self.classpath.find(".") != -1 |
|
|
|
|
self.objc_name = self.name if not nested_type else self.classpath.replace(".", "") |
|
|
|
|
self.classname = self.classname if not nested_type else self.classpath.replace(".", "_") |
|
|
|
|
self.swift_name = self.name |
|
|
|
|
self.cv_name = self.fullName(isCPP=True) |
|
|
|
|
self.isconstructor = self.name == self.classname |
|
|
|
|
@ -439,7 +445,7 @@ class FuncInfo(GeneralInfo): |
|
|
|
|
self.static = ["","static"][ "/S" in decl[2] ] |
|
|
|
|
self.ctype = re.sub(r"^CvTermCriteria", "TermCriteria", decl[1] or "") |
|
|
|
|
self.args = [] |
|
|
|
|
func_fix_map = func_arg_fix.get(self.objc_name, {}) |
|
|
|
|
func_fix_map = func_arg_fix.get(self.classname or module, {}).get(self.objc_name, {}) |
|
|
|
|
for a in decl[3]: |
|
|
|
|
arg = a[:] |
|
|
|
|
arg_fix_map = func_fix_map.get(arg[1], {}) |
|
|
|
|
@ -449,7 +455,7 @@ class FuncInfo(GeneralInfo): |
|
|
|
|
self.args.append(ArgInfo(arg)) |
|
|
|
|
|
|
|
|
|
if type_complete(self.args, self.ctype): |
|
|
|
|
func_fix_map = func_arg_fix.get(self.signature(self.args), {}) |
|
|
|
|
func_fix_map = func_arg_fix.get(self.classname or module, {}).get(self.signature(self.args), {}) |
|
|
|
|
name_fix_map = func_fix_map.get(self.name, {}) |
|
|
|
|
self.objc_name = name_fix_map.get('name', self.objc_name) |
|
|
|
|
for arg in self.args: |
|
|
|
|
@ -574,14 +580,14 @@ class ObjectiveCWrapperGenerator(object): |
|
|
|
|
self.skipped_func_list = [] |
|
|
|
|
self.def_args_hist = {} # { def_args_cnt : funcs_cnt } |
|
|
|
|
|
|
|
|
|
def add_class(self, decl, module): |
|
|
|
|
def add_class(self, decl): |
|
|
|
|
classinfo = ClassInfo(decl, namespaces=self.namespaces) |
|
|
|
|
if classinfo.name in class_ignore_list: |
|
|
|
|
logging.info('ignored: %s', classinfo) |
|
|
|
|
return |
|
|
|
|
if classinfo.name != module: |
|
|
|
|
self.classes[module].member_classes.append(classinfo.name) |
|
|
|
|
name = classinfo.name |
|
|
|
|
if classinfo.name != self.Module: |
|
|
|
|
self.classes[self.Module].member_classes.append(classinfo.objc_name) |
|
|
|
|
name = classinfo.cname |
|
|
|
|
if self.isWrapped(name) and not classinfo.base: |
|
|
|
|
logging.warning('duplicated: %s', classinfo) |
|
|
|
|
return |
|
|
|
|
@ -613,9 +619,11 @@ class ObjectiveCWrapperGenerator(object): |
|
|
|
|
type_dict.setdefault("Ptr_"+name, {}).update( |
|
|
|
|
{ "objc_type" : classinfo.objc_name + "*", |
|
|
|
|
"c_type" : name, |
|
|
|
|
"real_c_type" : classinfo.real_cname, |
|
|
|
|
"to_cpp": "%(n)s." + classinfo.native_ptr_name, |
|
|
|
|
"from_cpp_ptr": "[" + name + " fromNativePtr:%(n)s]"} |
|
|
|
|
"from_cpp": "[" + name + " fromNative:%(n)s]"} |
|
|
|
|
) |
|
|
|
|
|
|
|
|
|
logging.info('ok: class %s, name: %s, base: %s', classinfo, name, classinfo.base) |
|
|
|
|
|
|
|
|
|
def add_const(self, decl, scope=None, enumType=None): # [ "const cname", val, [], [] ] |
|
|
|
|
@ -623,6 +631,12 @@ class ObjectiveCWrapperGenerator(object): |
|
|
|
|
if constinfo.isIgnored(): |
|
|
|
|
logging.info('ignored: %s', constinfo) |
|
|
|
|
else: |
|
|
|
|
objc_type = enumType.rsplit(".", 1)[-1] if enumType else "" |
|
|
|
|
if const_fix.has_key(constinfo.classname) and const_fix[constinfo.classname].has_key(objc_type) and const_fix[constinfo.classname][objc_type].has_key(constinfo.name): |
|
|
|
|
fixed_const = const_fix[constinfo.classname][objc_type][constinfo.name] |
|
|
|
|
constinfo.name = fixed_const |
|
|
|
|
constinfo.cname = fixed_const |
|
|
|
|
|
|
|
|
|
if not self.isWrapped(constinfo.classname): |
|
|
|
|
logging.info('class not found: %s', constinfo) |
|
|
|
|
constinfo.name = constinfo.classname + '_' + constinfo.name |
|
|
|
|
@ -668,7 +682,7 @@ class ObjectiveCWrapperGenerator(object): |
|
|
|
|
self.add_const(decl, self.Module, enumType) |
|
|
|
|
|
|
|
|
|
def add_func(self, decl): |
|
|
|
|
fi = FuncInfo(decl, namespaces=self.namespaces) |
|
|
|
|
fi = FuncInfo(decl, self.Module, namespaces=self.namespaces) |
|
|
|
|
classname = fi.classname or self.Module |
|
|
|
|
if classname in class_ignore_list: |
|
|
|
|
logging.info('ignored: %s', fi) |
|
|
|
|
@ -709,7 +723,7 @@ class ObjectiveCWrapperGenerator(object): |
|
|
|
|
# TODO: support UMat versions of declarations (implement UMat-wrapper for Java) |
|
|
|
|
parser = hdr_parser.CppHeaderParser(generate_umat_decls=False) |
|
|
|
|
|
|
|
|
|
self.add_class( ['class ' + self.Module, '', [], []], self.Module ) # [ 'class/struct cname', ':bases', [modlist] [props] ] |
|
|
|
|
self.add_class( ['class ' + self.Module, '', [], []]) # [ 'class/struct cname', ':bases', [modlist] [props] ] |
|
|
|
|
|
|
|
|
|
# scan the headers and build more descriptive maps of classes, consts, functions |
|
|
|
|
includes = [] |
|
|
|
|
@ -729,7 +743,7 @@ class ObjectiveCWrapperGenerator(object): |
|
|
|
|
logging.info("\n--- Incoming ---\n%s", pformat(decl[:5], 4)) # without docstring |
|
|
|
|
name = decl[0] |
|
|
|
|
if name.startswith("struct") or name.startswith("class"): |
|
|
|
|
self.add_class(decl, self.Module) |
|
|
|
|
self.add_class(decl) |
|
|
|
|
elif name.startswith("const"): |
|
|
|
|
self.add_const(decl) |
|
|
|
|
elif name.startswith("enum"): |
|
|
|
|
@ -745,7 +759,7 @@ class ObjectiveCWrapperGenerator(object): |
|
|
|
|
if ci.name == "Mat": |
|
|
|
|
continue |
|
|
|
|
ci.initCodeStreams(self.Module) |
|
|
|
|
self.gen_class(ci) |
|
|
|
|
self.gen_class(ci, self.module) |
|
|
|
|
classObjcHeaderCode = ci.generateObjcHeaderCode(self.module, self.Module, ci.objc_name) |
|
|
|
|
header_file = "%s/%s/%s.h" % (output_objc_path, module, ci.objc_name) |
|
|
|
|
self.save(header_file, classObjcHeaderCode) |
|
|
|
|
@ -952,8 +966,9 @@ class ObjectiveCWrapperGenerator(object): |
|
|
|
|
epilogue.append("CV2OBJC2(" + cpp_type + ", " + objc_type[:-1] + ", retValVector, retVal);") |
|
|
|
|
elif ret_type.startswith("Ptr_"): |
|
|
|
|
cpp_type = type_dict[ret_type]["c_type"] |
|
|
|
|
real_cpp_type = type_dict[ret_type].get("real_c_type", cpp_type) |
|
|
|
|
namespace_prefix = self.get_namespace_prefix(cpp_type) |
|
|
|
|
ret_val = "cv::Ptr<" + namespace_prefix + cpp_type + "> retVal = " |
|
|
|
|
ret_val = "cv::Ptr<" + namespace_prefix + real_cpp_type + "> retVal = " |
|
|
|
|
ret = "return [" + type_dict[ret_type]["objc_type"][:-1] + " fromNative:retVal];" |
|
|
|
|
elif ret_type == "void": |
|
|
|
|
ret_val = "" |
|
|
|
|
@ -1027,10 +1042,15 @@ class ObjectiveCWrapperGenerator(object): |
|
|
|
|
else: |
|
|
|
|
break |
|
|
|
|
|
|
|
|
|
def gen_class(self, ci): |
|
|
|
|
def gen_class(self, ci, module): |
|
|
|
|
logging.info("%s", ci) |
|
|
|
|
if ci.name in AdditionalImports: |
|
|
|
|
ci.additionalImports.write("\n".join(["#import %s" % h for h in AdditionalImports[ci.name]])) |
|
|
|
|
if module in AdditionalImports and (ci.name in AdditionalImports[module] or "*" in AdditionalImports[module]): |
|
|
|
|
additional_imports = [] |
|
|
|
|
if "*" in AdditionalImports[module]: |
|
|
|
|
additional_imports += AdditionalImports[module]["*"] |
|
|
|
|
if ci.name in AdditionalImports[module]: |
|
|
|
|
additional_imports += AdditionalImports[module][ci.name] |
|
|
|
|
ci.additionalImports.write("\n".join(["#import %s" % h for h in additional_imports])) |
|
|
|
|
|
|
|
|
|
# constants |
|
|
|
|
wrote_consts_pragma = False |
|
|
|
|
@ -1089,27 +1109,45 @@ typedef NS_ENUM(int, {2}) {{ |
|
|
|
|
ci.method_declarations.write("@property " + ("(readonly) " if not pi.rw else "") + objc_type + " " + pi.name + ";\n") |
|
|
|
|
ptr_ref = "self." + ci.native_ptr_name + "->" if not ci.is_base_class else "self.nativePtr->" |
|
|
|
|
if type_data.has_key("v_type"): |
|
|
|
|
vector_type = type_data["v_type"] |
|
|
|
|
full_cpp_type = (self.get_namespace_prefix(vector_type) if (vector_type.find("::") == -1) else "") + vector_type |
|
|
|
|
ret_val = "std::vector<" + full_cpp_type + "> retValVector = " |
|
|
|
|
ci.method_implementations.write("-(NSArray<" + objc_type + ">*)" + pi.name + "{\n") |
|
|
|
|
vector_cpp_type = type_data["v_type"] |
|
|
|
|
has_namespace = vector_cpp_type.find("::") != -1 |
|
|
|
|
vector_full_cpp_type = self.fullTypeName(vector_cpp_type) if not has_namespace else vector_cpp_type |
|
|
|
|
ret_val = "std::vector<" + vector_full_cpp_type + "> retValVector = " |
|
|
|
|
ci.method_implementations.write("-(NSArray<" + objc_type + ">*)" + pi.name + " {\n") |
|
|
|
|
ci.method_implementations.write("\tNSMutableArray<" + objc_type + ">* retVal = [NSMutableArray new];\n") |
|
|
|
|
ci.method_implementations.write("\t" + ret_val + ptr_ref + pi.name + ";\n") |
|
|
|
|
epilogue = [] |
|
|
|
|
self.build_cv2objc_epilogue(epilogue, vector_type, full_cpp_type, objc_type, "retValVector", "retVal") |
|
|
|
|
self.build_cv2objc_epilogue(epilogue, vector_cpp_type, vector_full_cpp_type, objc_type, "retValVector", "retVal") |
|
|
|
|
ci.method_implementations.write("\t" + ("\n\t".join(epilogue)) + "\n") |
|
|
|
|
ci.method_implementations.write("\treturn retVal;\n}\n\n") |
|
|
|
|
elif type_data.has_key("v_v_type"): |
|
|
|
|
vector_cpp_type = type_data["v_v_type"] |
|
|
|
|
has_namespace = vector_cpp_type.find("::") != -1 |
|
|
|
|
vector_full_cpp_type = self.fullTypeName(vector_cpp_type) if not has_namespace else vector_cpp_type |
|
|
|
|
ret_val = "std::vector<std::vector<" + vector_full_cpp_type + ">> retValVectorVector = " |
|
|
|
|
ci.method_implementations.write("-(NSArray<NSArray<" + objc_type + ">*>*)" + pi.name + " {\n") |
|
|
|
|
ci.method_implementations.write("\tNSMutableArray<NSMutableArray<" + objc_type + ">*>* retVal = [NSMutableArray new];\n") |
|
|
|
|
ci.method_implementations.write("\t" + ret_val + ptr_ref + pi.name + ";\n") |
|
|
|
|
ci.method_implementations.write("\tCV2OBJC2(" + vector_full_cpp_type + ", " + objc_type[:-1] + ", retValVectorVector, retVal);\n") |
|
|
|
|
ci.method_implementations.write("\treturn retVal;\n}\n\n") |
|
|
|
|
elif self.isWrapped(pi.ctype): # wrapped class |
|
|
|
|
namespace_prefix = self.get_namespace_prefix(pi.ctype) |
|
|
|
|
ci.method_implementations.write("-(" + objc_type + ")" + pi.name + " {\n") |
|
|
|
|
ci.method_implementations.write("\tcv::Ptr<" + namespace_prefix + pi.ctype + "> retVal = new " + namespace_prefix + pi.ctype + "(" + ptr_ref + pi.name + ");\n") |
|
|
|
|
from_cpp = type_data["from_cpp_ptr"] if type_data.has_key("from_cpp_ptr") else type_data["from_cpp"] |
|
|
|
|
ci.method_implementations.write("\treturn " + (from_cpp % {"n": "retVal"}) + ";\n}\n\n") |
|
|
|
|
else: |
|
|
|
|
from_cpp = type_data.get("from_cpp", "%(n)s") |
|
|
|
|
retVal = from_cpp % {"n": (ptr_ref + pi.name)} |
|
|
|
|
ci.method_implementations.write("-(" + objc_type + ")" + pi.name + "{\n\treturn " + retVal + ";\n}\n\n") |
|
|
|
|
ci.method_implementations.write("-(" + objc_type + ")" + pi.name + " {\n\treturn " + retVal + ";\n}\n\n") |
|
|
|
|
if pi.rw: |
|
|
|
|
if type_data.has_key("v_type"): |
|
|
|
|
vector_type = type_data["v_type"] |
|
|
|
|
full_cpp_type = (self.get_namespace_prefix(vector_type) if (vector_type.find("::") == -1) else "") + vector_type |
|
|
|
|
vector_cpp_type = type_data["v_type"] |
|
|
|
|
has_namespace = vector_cpp_type.find("::") != -1 |
|
|
|
|
vector_full_cpp_type = self.fullTypeName(vector_cpp_type) if not has_namespace else vector_cpp_type |
|
|
|
|
ci.method_implementations.write("-(void)set" + pi.name[0].upper() + pi.name[1:] + ":(NSArray<" + objc_type + ">*)" + pi.name + "{\n") |
|
|
|
|
prologue = [] |
|
|
|
|
self.build_objc2cv_prologue(prologue, vector_type, full_cpp_type, objc_type, "valVector", pi.name) |
|
|
|
|
self.build_objc2cv_prologue(prologue, vector_cpp_type, vector_full_cpp_type, objc_type, "valVector", pi.name) |
|
|
|
|
ci.method_implementations.write("\t" + ("\n\t".join(prologue)) + "\n") |
|
|
|
|
ci.method_implementations.write("\t" + ptr_ref + pi.name + " = valVector;\n}\n\n") |
|
|
|
|
else: |
|
|
|
|
@ -1375,10 +1413,11 @@ if __name__ == "__main__": |
|
|
|
|
const_private_list += gen_type_dict.get("const_private_list", []) |
|
|
|
|
missing_consts.update(gen_type_dict.get("missing_consts", {})) |
|
|
|
|
type_dict.update(gen_type_dict.get("type_dict", {})) |
|
|
|
|
AdditionalImports.update(gen_type_dict.get("AdditionalImports", {})) |
|
|
|
|
AdditionalImports[module] = gen_type_dict.get("AdditionalImports", {}) |
|
|
|
|
ManualFuncs.update(gen_type_dict.get("ManualFuncs", {})) |
|
|
|
|
func_arg_fix.update(gen_type_dict.get("func_arg_fix", {})) |
|
|
|
|
enum_fix.update(gen_type_dict.get("enum_fix", {})) |
|
|
|
|
const_fix.update(gen_type_dict.get("const_fix", {})) |
|
|
|
|
namespaces_dict.update(gen_type_dict.get("namespaces_dict", {})) |
|
|
|
|
module_imports += gen_type_dict.get("module_imports", []) |
|
|
|
|
|
|
|
|
|
|
Alexander Alekhin
4 years ago