generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Megred fix for pyrhon API generator regression r8528

Browse Source
This commit is contained in:
Andrey Kamaev 2012-05-31 11:12:12 +00:00
parent daad7900e2
commit ca0962c738
3 changed files with 65 additions and 65 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/gpu/doc/per_element_operations.rst
View File

@ -280,8 +280,6 @@ Compares elements of two matrices.
:param b: Second source matrix with the same size and type as ``a`` . :param b: Second source matrix with the same size and type as ``a`` .
:param sc: A scalar to be compared with ``a`` .
:param c: Destination matrix with the same size as ``a`` and the ``CV_8UC1`` type. :param c: Destination matrix with the same size as ``a`` and the ``CV_8UC1`` type.
:param cmpop: Flag specifying the relation between the elements to be checked: :param cmpop: Flag specifying the relation between the elements to be checked:

2
modules/imgproc/doc/filtering.rst
View File

@ -968,7 +968,7 @@ Smoothes an image using a Gaussian filter.
.. ocv:function:: void GaussianBlur( InputArray src, OutputArray dst, Size ksize, double sigmaX, double sigmaY=0, int borderType=BORDER_DEFAULT ) .. ocv:function:: void GaussianBlur( InputArray src, OutputArray dst, Size ksize, double sigmaX, double sigmaY=0, int borderType=BORDER_DEFAULT )
.. ocv:pyfunction:: cv2.GaussianBlur(src, ksize, sigma1[, dst[, sigma2[, borderType]]]) -> dst .. ocv:pyfunction:: cv2.GaussianBlur(src, ksize, sigmaX[, dst[, sigmaY[, borderType]]]) -> dst
:param src: Source image. The image can have any number of channels, which are processed independently. The depth should be ``CV_8U``, ``CV_16U``, ``CV_16S``, ``CV_32F`` or ``CV_64F``. :param src: Source image. The image can have any number of channels, which are processed independently. The depth should be ``CV_8U``, ``CV_16U``, ``CV_16S``, ``CV_32F`` or ``CV_64F``.

6
modules/python/src2/gen2.py
View File

@ -216,10 +216,12 @@ class ClassInfo(object):
self.bases = decl[1].split()[1:] self.bases = decl[1].split()[1:]
if len(self.bases) > 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 "Warning: class %s has more than 1 base class (not supported by Python C extensions)" % (self.name,)
print "Bases: ", self.bases print "Bases: ", " ".join(self.bases)
print "Only the first base class will be used" print "Only the first base class will be used"
self.bases = self.bases[:1] self.bases = [self.bases[0].strip(",")]
#return sys.exit(-1) #return sys.exit(-1)
if self.bases and self.bases[0].startswith("cv::"):
self.bases[0] = self.bases[0][4:]
for m in decl[2]: for m in decl[2]:
if m.startswith("="): if m.startswith("="):
self.wname = m[1:] self.wname = m[1:]