Merge branch '2.4'

This commit is contained in:
Andrey Kamaev
2013-01-25 16:30:36 +04:00
105 changed files with 4821 additions and 2883 deletions

View File

@@ -243,9 +243,9 @@ class ClassInfo(object):
if decl:
self.bases = decl[1].split()[1:]
if len(self.bases) > 1:
print "Warning: class %s has more than 1 base class (not supported by Python C extensions)" % (self.name,)
print "Bases: ", " ".join(self.bases)
print "Only the first base class will be used"
print "Note: Class %s has more than 1 base class (not supported by Python C extensions)" % (self.name,)
print " Bases: ", " ".join(self.bases)
print " Only the first base class will be used"
self.bases = [self.bases[0].strip(",")]
#return sys.exit(-1)
if self.bases and self.bases[0].startswith("cv::"):