cleanup names of doconly parameters

git-svn-id: https://code.ros.org/svn/opencv/trunk@2941 73c94f0f-984f-4a5f-82bc-2d8db8d8ee08

diff --git a/opencv/doc/cxcore_array_operations.tex b/opencv/doc/cxcore_array_operations.tex
index ce0a1b35294ddcf4d83a49799f76ea9af13ea603..c8c34072e9bca430fe90dbd0fc86540141d5ed9c 100644 (file)
--- a/opencv/doc/cxcore_array_operations.tex
+++ b/opencv/doc/cxcore_array_operations.tex
@@ -1465,15 +1465,15 @@ If there is no ROI set, \texttt{cvRect(0,0,image->width,image->height)} is retur
 Returns matrix header for arbitrary array.
 
 \cvdefC{CvMat* cvGetMat(const CvArr* arr, CvMat* header, int* coi=NULL, int allowND=0);}
-\cvdefPy{GetMat(arr) -> cvmat }
+\cvdefPy{GetMat(arr, allowND=0) -> cvmat }
 
 \begin{description}
 \cvarg{arr}{Input array}
 \ifC
 \cvarg{header}{Pointer to \cross{CvMat} structure used as a temporary buffer}
 \cvarg{coi}{Optional output parameter for storing COI}
-\cvarg{allowND}{If non-zero, the function accepts multi-dimensional dense arrays (CvMatND*) and returns 2D (if CvMatND has two dimensions) or 1D matrix (when CvMatND has 1 dimension or more than 2 dimensions). The array must be continuous.}
 \fi
+\cvarg{allowND}{If non-zero, the function accepts multi-dimensional dense arrays (CvMatND*) and returns 2D (if CvMatND has two dimensions) or 1D matrix (when CvMatND has 1 dimension or more than 2 dimensions). The array must be continuous.}
 \end{description}
 
 The function returns a matrix header for the input array that can be a matrix - 

diff --git a/opencv/doc/latex2sphinx/latex.py b/opencv/doc/latex2sphinx/latex.py
index 00c9f525e558d8a018dc2a7cf64d3d7dbb226488..4ef85c54203fbbfea9b769dbf61ec92cb5677764 100644 (file)
--- a/opencv/doc/latex2sphinx/latex.py
+++ b/opencv/doc/latex2sphinx/latex.py
@@ -299,7 +299,7 @@ class SphinxWriter:
                     else:
                         doc_outs = l[2]
                     if len(outs) != len(doc_outs):
-                        self.report_error(c, "function %s output documented tuple %d, code %d" % (l[0], len(outs), len(doc_outs)))
+                        self.report_error(c, "function %s output code tuple %d, documented %d" % (l[0], len(outs), len(doc_outs)))
             else:
                 # self.report_error(c, "function %s documented but not found in code" % l[0])
                 pass
@@ -501,6 +501,8 @@ class SphinxWriter:
                 "CvSeqOfCvSURFDescriptor" : ":class:`CvSeq` of list of float",
                 "cvpoint2d32f_count" : "int",
                 "ranges" : "list of tuples of ints",
+                "PyObject" : "object",
+                "edgeorpoint" : ":class:`CvSubdiv2DEdge`, :class:`CvSubdiv2DPoint`",
             }
             print >>self, "\n:type %s: %s" % (nm, translate.get(type, ':class:`%s`' % type))