mirror of
https://github.com/opencv/opencv.git
synced 2026-07-29 15:23:05 +04:00
Merge branch 4.x
This commit is contained in:
@@ -432,7 +432,7 @@ class ClassInfo(object):
|
||||
if self.constructor is not None:
|
||||
constructor_name = self.constructor.get_wrapper_name()
|
||||
|
||||
return 'CVPY_TYPE({}, {}, {}, {}, {}, {}, "{}");\n'.format(
|
||||
return 'CVPY_TYPE({}, {}, {}, {}, {}, {}, "{}")\n'.format(
|
||||
self.export_name,
|
||||
self.class_id,
|
||||
self.cname if self.issimple else "Ptr<{}>".format(self.cname),
|
||||
@@ -1294,7 +1294,7 @@ class PythonWrapperGenerator(object):
|
||||
code = ""
|
||||
if re.sub(r"^cv\.", "", enum_name) != wname:
|
||||
code += "typedef {0} {1};\n".format(cname, wname)
|
||||
code += "CV_PY_FROM_ENUM({0});\nCV_PY_TO_ENUM({0});\n\n".format(wname)
|
||||
code += "CV_PY_FROM_ENUM({0})\nCV_PY_TO_ENUM({0})\n\n".format(wname)
|
||||
self.code_enums.write(code)
|
||||
|
||||
def save(self, path, name, buf):
|
||||
|
||||
Reference in New Issue
Block a user