started work on API & doc synchronization (in particular, Mat& => Input/OutputArray in the descriptions)

doc/opencv1/c/calib3d_camera_calibration_and_3d_reconstruction.rst

@@ -308,7 +308,7 @@ The algorithm does the following:
     
 The function returns the final re-projection error.
 Note: if you're using a non-square (=non-NxN) grid and
-:func:`findChessboardCorners`
+:cpp:func:`findChessboardCorners`
 for calibration, and 
 ``calibrateCamera``
 returns
@@ -333,7 +333,7 @@ See also:
 , 
 :ref:`FindExtrinsicCameraParams2`
 , 
-:func:`initCameraMatrix2D`
+:cpp:func:`initCameraMatrix2D`
 , 
 :ref:`StereoCalibrate`
 , 
@@ -2303,7 +2303,7 @@ StereoRectify
     :param P1, P2: The output  :math:`3 \times 4`  projection matrices in the new (rectified) coordinate systems. 
     
     
-    :param Q: The output  :math:`4 \times 4`  disparity-to-depth mapping matrix, see  :func:`reprojectImageTo3D` . 
+    :param Q: The output  :math:`4 \times 4`  disparity-to-depth mapping matrix, see  :cpp:func:`reprojectImageTo3D` . 
     
     
     :param flags: The operation flags; may be 0 or  ``CV_CALIB_ZERO_DISPARITY`` . If the flag is set, the function makes the principal points of each camera have the same pixel coordinates in the rectified views. And if the flag is not set, the function may still shift the images in horizontal or vertical direction (depending on the orientation of epipolar lines) in order to maximize the useful image area. 
@@ -2320,7 +2320,7 @@ StereoRectify
     
     
 The function computes the rotation matrices for each camera that (virtually) make both camera image planes the same plane. Consequently, that makes all the epipolar lines parallel and thus simplifies the dense stereo correspondence problem. On input the function takes the matrices computed by 
-:func:`stereoCalibrate`
+:cpp:func:`stereoCalibrate`
 and on output it gives 2 rotation matrices and also 2 projection matrices in the new coordinates. The 2 cases are distinguished by the function are: 
 
 
@@ -2562,10 +2562,10 @@ UndistortPoints
     :param distCoeffs: The input vector of distortion coefficients  :math:`(k_1, k_2, p_1, p_2[, k_3[, k_4, k_5, k_6]])`  of 4, 5 or 8 elements. If the vector is NULL/empty, the zero distortion coefficients are assumed. 
     
     
-    :param R: The rectification transformation in object space (3x3 matrix).  ``R1``  or  ``R2`` , computed by  :func:`StereoRectify`  can be passed here. If the matrix is empty, the identity transformation is used 
+    :param R: The rectification transformation in object space (3x3 matrix).  ``R1``  or  ``R2`` , computed by  :cpp:func:`StereoRectify`  can be passed here. If the matrix is empty, the identity transformation is used 
     
     
-    :param P: The new camera matrix (3x3) or the new projection matrix (3x4).  ``P1``  or  ``P2`` , computed by  :func:`StereoRectify`  can be passed here. If the matrix is empty, the identity new camera matrix is used 
+    :param P: The new camera matrix (3x3) or the new projection matrix (3x4).  ``P1``  or  ``P2`` , computed by  :cpp:func:`StereoRectify`  can be passed here. If the matrix is empty, the identity new camera matrix is used 
     
     
     

doc/opencv1/c/core_drawing_functions.rst

@@ -9,20 +9,20 @@ The boundaries of the shapes can be rendered with antialiasing (implemented only
 All the functions include the parameter color that uses a rgb value (that may be constructed
 with 
 ``CV_RGB``
-macro or the  :func:`cvScalar`  function 
+macro or the  :cpp:func:`cvScalar`  function 
 ) for color
 images and brightness for grayscale images. For color images the order channel
 is normally 
 *Blue, Green, Red*
 , this is what 
-:func:`imshow`
+:cpp:func:`imshow`
 , 
-:func:`imread`
+:cpp:func:`imread`
 and 
-:func:`imwrite`
+:cpp:func:`imwrite`
 expect
 , so if you form a color using 
-:func:`cvScalar`
+:cpp:func:`cvScalar`
 , it should look like:
 
 
@@ -32,7 +32,7 @@ expect
 
 
 If you are using your own image rendering and I/O functions, you can use any channel ordering, the drawing functions process each channel independently and do not depend on the channel order or even on the color space used. The whole image can be converted from BGR to RGB or to a different color space using 
-:func:`cvtColor`
+:cpp:func:`cvtColor`
 .
 
 If a drawn figure is partially or completely outside the image, the drawing functions clip it. Also, many drawing functions can handle pixel coordinates specified with sub-pixel accuracy, that is, the coordinates can be passed as fixed-point numbers, encoded as integers. The number of fractional bits is specified by the 

doc/opencv1/c/imgproc_image_filtering.rst

@@ -5,7 +5,7 @@ Image Filtering
 
 
 Functions and classes described in this section are used to perform various linear or non-linear filtering operations on 2D images (represented as 
-:func:`Mat`
+:cpp:func:`Mat`
 's), that is, for each pixel location 
 :math:`(x,y)`
 in the source image some its (normally rectangular) neighborhood is considered and used to compute the response. In case of a linear filter it is a weighted sum of pixel values, in case of morphological operations it is the minimum or maximum etc. The computed response is stored to the destination image at the same location 

doc/opencv1/py/calib3d_camera_calibration_and_3d_reconstruction.rst

@@ -278,7 +278,7 @@ The algorithm does the following:
     
     
 Note: if you're using a non-square (=non-NxN) grid and
-:func:`findChessboardCorners`
+:cpp:func:`findChessboardCorners`
 for calibration, and 
 ``calibrateCamera``
 returns
@@ -303,7 +303,7 @@ See also:
 , 
 :ref:`FindExtrinsicCameraParams2`
 , 
-:func:`initCameraMatrix2D`
+:cpp:func:`initCameraMatrix2D`
 , 
 :ref:`StereoCalibrate`
 , 
@@ -2312,7 +2312,7 @@ StereoRectify
     :param P1, P2: The output  :math:`3 \times 4`  projection matrices in the new (rectified) coordinate systems. 
     
     
-    :param Q: The output  :math:`4 \times 4`  disparity-to-depth mapping matrix, see  :func:`reprojectImageTo3D` . 
+    :param Q: The output  :math:`4 \times 4`  disparity-to-depth mapping matrix, see  :cpp:func:`reprojectImageTo3D` . 
     
     :type Q: :class:`CvMat`
     
@@ -2337,7 +2337,7 @@ StereoRectify
     
     
 The function computes the rotation matrices for each camera that (virtually) make both camera image planes the same plane. Consequently, that makes all the epipolar lines parallel and thus simplifies the dense stereo correspondence problem. On input the function takes the matrices computed by 
-:func:`stereoCalibrate`
+:cpp:func:`stereoCalibrate`
 and on output it gives 2 rotation matrices and also 2 projection matrices in the new coordinates. The 2 cases are distinguished by the function are: 
 
 
@@ -2595,12 +2595,12 @@ UndistortPoints
     :type distCoeffs: :class:`CvMat`
     
     
-    :param R: The rectification transformation in object space (3x3 matrix).  ``R1``  or  ``R2`` , computed by  :func:`StereoRectify`  can be passed here. If the matrix is empty, the identity transformation is used 
+    :param R: The rectification transformation in object space (3x3 matrix).  ``R1``  or  ``R2`` , computed by  :cpp:func:`StereoRectify`  can be passed here. If the matrix is empty, the identity transformation is used 
     
     :type R: :class:`CvMat`
     
     
-    :param P: The new camera matrix (3x3) or the new projection matrix (3x4).  ``P1``  or  ``P2`` , computed by  :func:`StereoRectify`  can be passed here. If the matrix is empty, the identity new camera matrix is used 
+    :param P: The new camera matrix (3x3) or the new projection matrix (3x4).  ``P1``  or  ``P2`` , computed by  :cpp:func:`StereoRectify`  can be passed here. If the matrix is empty, the identity new camera matrix is used 
     
     :type P: :class:`CvMat`
     

doc/opencv1/py/core_drawing_functions.rst

@@ -14,14 +14,14 @@ images and brightness for grayscale images. For color images the order channel
 is normally 
 *Blue, Green, Red*
 , this is what 
-:func:`imshow`
+:cpp:func:`imshow`
 , 
-:func:`imread`
+:cpp:func:`imread`
 and 
-:func:`imwrite`
+:cpp:func:`imwrite`
 expect
 If you are using your own image rendering and I/O functions, you can use any channel ordering, the drawing functions process each channel independently and do not depend on the channel order or even on the color space used. The whole image can be converted from BGR to RGB or to a different color space using 
-:func:`cvtColor`
+:cpp:func:`cvtColor`
 .
 
 If a drawn figure is partially or completely outside the image, the drawing functions clip it. Also, many drawing functions can handle pixel coordinates specified with sub-pixel accuracy, that is, the coordinates can be passed as fixed-point numbers, encoded as integers. The number of fractional bits is specified by the 

doc/opencv1/py/imgproc_image_filtering.rst

@@ -5,7 +5,7 @@ Image Filtering
 
 
 Functions and classes described in this section are used to perform various linear or non-linear filtering operations on 2D images (represented as 
-:func:`Mat`
+:cpp:func:`Mat`
 's), that is, for each pixel location 
 :math:`(x,y)`
 in the source image some its (normally rectangular) neighborhood is considered and used to compute the response. In case of a linear filter it is a weighted sum of pixel values, in case of morphological operations it is the minimum or maximum etc. The computed response is stored to the destination image at the same location