mirror of
https://github.com/opencv/opencv.git
synced 2025-06-07 17:44:04 +08:00
Merge pull request #18905 from alalek:objc_fix_return_type_handling
This commit is contained in:
commit
e1a8fc0417
@ -1123,7 +1123,7 @@ class ObjectiveCWrapperGenerator(object):
|
|||||||
if cpp_type.find("::") == -1:
|
if cpp_type.find("::") == -1:
|
||||||
cpp_type = self.get_namespace_prefix(cpp_type) + cpp_type
|
cpp_type = self.get_namespace_prefix(cpp_type) + cpp_type
|
||||||
prologue.append("NSMutableArray<NSMutableArray<" + objc_type + ">*>* retVal = [NSMutableArray new];")
|
prologue.append("NSMutableArray<NSMutableArray<" + objc_type + ">*>* retVal = [NSMutableArray new];")
|
||||||
ret_val = "std::vector<" + cpp_type + "> retValVector = "
|
ret_val = "std::vector< std::vector<" + cpp_type + "> > retValVector = "
|
||||||
epilogue.append("CV2OBJC2(" + cpp_type + ", " + objc_type[:-1] + ", retValVector, retVal);")
|
epilogue.append("CV2OBJC2(" + cpp_type + ", " + objc_type[:-1] + ", retValVector, retVal);")
|
||||||
elif ret_type.startswith("Ptr_"):
|
elif ret_type.startswith("Ptr_"):
|
||||||
cpp_type = type_dict[ret_type]["c_type"]
|
cpp_type = type_dict[ret_type]["c_type"]
|
||||||
|
Loading…
Reference in New Issue
Block a user