Commit 2a9e252f authored by Alexander Mordvintsev's avatar Alexander Mordvintsev

fix namespace conflicts (like cv::inpaint and cv::xphoto::inpaint)

whitespace fix
parent 74c77d82
...@@ -509,7 +509,7 @@ class FuncInfo(object): ...@@ -509,7 +509,7 @@ class FuncInfo(object):
name = "getelem" name = "getelem"
else: else:
classname = "" classname = ""
return "pyopencv_" + classname + name return "pyopencv_" + self.namespace.replace('.','_') + '_' + classname + name
def get_wrapper_prototype(self): def get_wrapper_prototype(self):
full_fname = self.get_wrapper_name() full_fname = self.get_wrapper_name()
...@@ -760,7 +760,7 @@ class PythonWrapperGenerator(object): ...@@ -760,7 +760,7 @@ class PythonWrapperGenerator(object):
del chunks[-2] del chunks[-2]
base = '_'.join(chunks) base = '_'.join(chunks)
if base not in self.classes: if base not in self.classes:
print("Generator error: unable to resolve base %s for %s" print("Generator error: unable to resolve base %s for %s"
% (classinfo.bases[0], classinfo.name)) % (classinfo.bases[0], classinfo.name))
sys.exit(-1) sys.exit(-1)
classinfo.bases[0] = "::".join(chunks) classinfo.bases[0] = "::".join(chunks)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment