converted user guide & tutorials from tex to rst; added them into the whole documentation tree; added html_docs target.

2011-05-10 22:09:07 +00:00
parent 6facf8ba3b
commit b699e946b5
75 changed files with 1506 additions and 2120 deletions
--- a/doc/opencv1/py/calib3d_camera_calibration_and_3d_reconstruction.rst
+++ b/doc/opencv1/py/calib3d_camera_calibration_and_3d_reconstruction.rst
@@ -157,7 +157,7 @@ The functions below use the above model to
 CalibrateCamera2
 ----------------

-`id=0.782194232075 Comments from the Wiki <http://opencv.willowgarage.com/wiki/documentation/py/calib3d/CalibrateCamera2>`__
+


 .. function:: CalibrateCamera2(objectPoints,imagePoints,pointCounts,imageSize,cameraMatrix,distCoeffs,rvecs,tvecs,flags=0)-> None
@@ -316,7 +316,7 @@ See also:
 ComputeCorrespondEpilines
 -------------------------

-`id=0.812565376037 Comments from the Wiki <http://opencv.willowgarage.com/wiki/documentation/py/calib3d/ComputeCorrespondEpilines>`__
+


 .. function:: ComputeCorrespondEpilines(points, whichImage, F, lines) -> None
@@ -398,7 +398,7 @@ Line coefficients are defined up to a scale. They are normalized, such that
 ConvertPointsHomogeneous
 ------------------------

-`id=0.174046913553 Comments from the Wiki <http://opencv.willowgarage.com/wiki/documentation/py/calib3d/ConvertPointsHomogeneous>`__
+


 .. function:: ConvertPointsHomogeneous( src, dst ) -> None
@@ -442,7 +442,7 @@ If the output array dimensionality is larger, an extra 1 is appended to each poi
 CreatePOSITObject
 -----------------

-`id=0.575884728475 Comments from the Wiki <http://opencv.willowgarage.com/wiki/documentation/py/calib3d/CreatePOSITObject>`__
+


 .. function:: CreatePOSITObject(points)-> POSITObject
@@ -484,7 +484,7 @@ must be called to free memory.
 CreateStereoBMState
 -------------------

-`id=0.181953212374 Comments from the Wiki <http://opencv.willowgarage.com/wiki/documentation/py/calib3d/CreateStereoBMState>`__
+


 .. function:: CreateStereoBMState(preset=CV_STEREO_BM_BASIC,numberOfDisparities=0)-> StereoBMState
@@ -529,7 +529,7 @@ the calls to
 CreateStereoGCState
 -------------------

-`id=0.718216892131 Comments from the Wiki <http://opencv.willowgarage.com/wiki/documentation/py/calib3d/CreateStereoGCState>`__
+


 .. function:: CreateStereoGCState(numberOfDisparities,maxIters)-> StereoGCState
@@ -564,7 +564,7 @@ The function creates the stereo correspondence structure and initializes it. It
 CvStereoBMState
 ---------------

-`id=0.314911926499 Comments from the Wiki <http://opencv.willowgarage.com/wiki/documentation/py/calib3d/CvStereoBMState>`__
+

 .. class:: CvStereoBMState

@@ -698,7 +698,7 @@ Note that the algorithm searches for the corresponding blocks in x direction onl
 CvStereoGCState
 ---------------

-`id=0.396531770881 Comments from the Wiki <http://opencv.willowgarage.com/wiki/documentation/py/calib3d/CvStereoGCState>`__
+

 .. class:: CvStereoGCState

@@ -782,7 +782,7 @@ and then override necessary parameters if needed.
 DecomposeProjectionMatrix
 -------------------------

-`id=0.997149293534 Comments from the Wiki <http://opencv.willowgarage.com/wiki/documentation/py/calib3d/DecomposeProjectionMatrix>`__
+


 .. function:: DecomposeProjectionMatrix(projMatrix, cameraMatrix, rotMatrix, transVect, rotMatrX = None, rotMatrY = None, rotMatrZ = None) -> eulerAngles
@@ -851,7 +851,7 @@ The function is based on
 DrawChessboardCorners
 ---------------------

-`id=0.657339526052 Comments from the Wiki <http://opencv.willowgarage.com/wiki/documentation/py/calib3d/DrawChessboardCorners>`__
+


 .. function:: DrawChessboardCorners(image,patternSize,corners,patternWasFound)-> None
@@ -894,7 +894,7 @@ The function draws the individual chessboard corners detected as red circles if
 FindChessboardCorners
 ---------------------

-`id=0.629260035574 Comments from the Wiki <http://opencv.willowgarage.com/wiki/documentation/py/calib3d/FindChessboardCorners>`__
+


 .. function:: FindChessboardCorners(image, patternSize, flags=CV_CALIB_CB_ADAPTIVE_THRESH) -> corners
@@ -995,7 +995,7 @@ the function requires some white space (like a square-thick border, the wider th
 FindExtrinsicCameraParams2
 --------------------------

-`id=0.0389878424328 Comments from the Wiki <http://opencv.willowgarage.com/wiki/documentation/py/calib3d/FindExtrinsicCameraParams2>`__
+


 .. function:: FindExtrinsicCameraParams2(objectPoints,imagePoints,cameraMatrix,distCoeffs,rvec,tvec,useExtrinsicGuess=0)-> None
@@ -1061,7 +1061,7 @@ The function's counterpart in the C++ API is
 FindFundamentalMat
 ------------------

-`id=0.89177797951 Comments from the Wiki <http://opencv.willowgarage.com/wiki/documentation/py/calib3d/FindFundamentalMat>`__
+


 .. function:: FindFundamentalMat(points1, points2, fundamentalMatrix, method=CV_FM_RANSAC, param1=1., param2=0.99, status = None) -> None
@@ -1161,7 +1161,7 @@ to compute the rectification transformation.
 FindHomography
 --------------

-`id=0.964547232485 Comments from the Wiki <http://opencv.willowgarage.com/wiki/documentation/py/calib3d/FindHomography>`__
+


 .. function:: FindHomography(srcPoints,dstPoints,H,method,ransacReprojThreshold=3.0, status=None)-> None
@@ -1304,7 +1304,7 @@ See also:
 FindStereoCorrespondenceBM
 --------------------------

-`id=0.6416249077 Comments from the Wiki <http://opencv.willowgarage.com/wiki/documentation/py/calib3d/FindStereoCorrespondenceBM>`__
+


 .. function:: FindStereoCorrespondenceBM(left,right,disparity,state)-> None
@@ -1351,7 +1351,7 @@ in the case of 16-bit fixed-point disparity map)
 FindStereoCorrespondenceGC
 --------------------------

-`id=0.511426409323 Comments from the Wiki <http://opencv.willowgarage.com/wiki/documentation/py/calib3d/FindStereoCorrespondenceGC>`__
+


 .. function:: FindStereoCorrespondenceGC( left, right, dispLeft, dispRight, state, useDisparityGuess=(0))-> None
@@ -1458,7 +1458,7 @@ left disparity images are usually negative):
 GetOptimalNewCameraMatrix
 -------------------------

-`id=0.850139058889 Comments from the Wiki <http://opencv.willowgarage.com/wiki/documentation/py/calib3d/GetOptimalNewCameraMatrix>`__
+


 .. function:: GetOptimalNewCameraMatrix(cameraMatrix, distCoeffs, imageSize, alpha, newCameraMatrix, newImageSize=(0,0), validPixROI=0) -> None
@@ -1529,7 +1529,7 @@ to produce the maps for
 InitIntrinsicParams2D
 ---------------------

-`id=0.845508653607 Comments from the Wiki <http://opencv.willowgarage.com/wiki/documentation/py/calib3d/InitIntrinsicParams2D>`__
+


 .. function:: InitIntrinsicParams2D(objectPoints, imagePoints, npoints, imageSize, cameraMatrix, aspectRatio=1.) -> None
@@ -1583,7 +1583,7 @@ Currently, the function only supports planar calibration patterns, i.e. patterns
 InitUndistortMap
 ----------------

-`id=0.720345336817 Comments from the Wiki <http://opencv.willowgarage.com/wiki/documentation/py/calib3d/InitUndistortMap>`__
+


 .. function:: InitUndistortMap(cameraMatrix,distCoeffs,map1,map2)-> None
@@ -1632,7 +1632,7 @@ is identity matrix and
 InitUndistortRectifyMap
 -----------------------

-`id=0.00679135152837 Comments from the Wiki <http://opencv.willowgarage.com/wiki/documentation/py/calib3d/InitUndistortRectifyMap>`__
+


 .. function:: InitUndistortRectifyMap(cameraMatrix,distCoeffs,R,newCameraMatrix,map1,map2)-> None
@@ -1751,7 +1751,7 @@ can be chosen arbitrarily.
 POSIT
 -----

-`id=0.474051901242 Comments from the Wiki <http://opencv.willowgarage.com/wiki/documentation/py/calib3d/POSIT>`__
+


 .. function:: POSIT(posit_object,imagePoints,focal_length,criteria)-> (rotationMatrix,translation_vector)
@@ -1808,7 +1808,7 @@ serves to stop the algorithm if the difference is small.
 ProjectPoints2
 --------------

-`id=0.754356933502 Comments from the Wiki <http://opencv.willowgarage.com/wiki/documentation/py/calib3d/ProjectPoints2>`__
+


 .. function:: ProjectPoints2(objectPoints,rvec,tvec,cameraMatrix,distCoeffs, imagePoints,dpdrot=NULL,dpdt=NULL,dpdf=NULL,dpdc=NULL,dpddist=NULL)-> None
@@ -1907,7 +1907,7 @@ to 3x3 identity matrix, or by passing zero distortion coefficients, you can get
 ReprojectImageTo3D
 ------------------

-`id=0.392860739717 Comments from the Wiki <http://opencv.willowgarage.com/wiki/documentation/py/calib3d/ReprojectImageTo3D>`__
+


 .. function:: ReprojectImageTo3D(disparity, _3dImage, Q, handleMissingValues=0) -> None
@@ -1972,7 +1972,7 @@ matrix, e.g. the one computed by
 RQDecomp3x3
 -----------

-`id=0.479738869484 Comments from the Wiki <http://opencv.willowgarage.com/wiki/documentation/py/calib3d/RQDecomp3x3>`__
+


 .. function:: RQDecomp3x3(M, R, Q, Qx = None, Qy = None, Qz = None) -> eulerAngles
@@ -2035,7 +2035,7 @@ that could be used in OpenGL.
 Rodrigues2
 ----------

-`id=0.83168701891 Comments from the Wiki <http://opencv.willowgarage.com/wiki/documentation/py/calib3d/Rodrigues2>`__
+


 .. function:: Rodrigues2(src,dst,jacobian=0)-> None
@@ -2098,7 +2098,7 @@ or
 StereoCalibrate
 ---------------

-`id=0.0963893421715 Comments from the Wiki <http://opencv.willowgarage.com/wiki/documentation/py/calib3d/StereoCalibrate>`__
+


 .. function:: StereoCalibrate( objectPoints, imagePoints1, imagePoints2, pointCounts, cameraMatrix1, distCoeffs1, cameraMatrix2, distCoeffs2, imageSize, R, T, E=NULL, F=NULL, term_crit=(CV_TERMCRIT_ITER+CV_TERMCRIT_EPS,30,1e-6), flags=CV_CALIB_FIX_INTRINSIC)-> None
@@ -2273,7 +2273,7 @@ Similarly to
 StereoRectify
 -------------

-`id=0.482375127425 Comments from the Wiki <http://opencv.willowgarage.com/wiki/documentation/py/calib3d/StereoRectify>`__
+


 .. function:: StereoRectify( cameraMatrix1, cameraMatrix2, distCoeffs1, distCoeffs2, imageSize, R, T, R1, R2, P1, P2, Q=NULL, flags=CV_CALIB_ZERO_DISPARITY, alpha=-1, newImageSize=(0,0))-> (roi1, roi2)
@@ -2431,7 +2431,7 @@ and
 StereoRectifyUncalibrated
 -------------------------

-`id=0.234617492311 Comments from the Wiki <http://opencv.willowgarage.com/wiki/documentation/py/calib3d/StereoRectifyUncalibrated>`__
+


 .. function:: StereoRectifyUncalibrated(points1,points2,F,imageSize,H1,H2,threshold=5)-> None
@@ -2493,7 +2493,7 @@ and then the images can be corrected using
 Undistort2
 ----------

-`id=0.0228781107726 Comments from the Wiki <http://opencv.willowgarage.com/wiki/documentation/py/calib3d/Undistort2>`__
+


 .. function:: Undistort2(src,dst,cameraMatrix,distCoeffs)-> None
@@ -2563,7 +2563,7 @@ need to be scaled accordingly, while the distortion coefficients remain the same
 UndistortPoints
 ---------------

-`id=0.00872451686413 Comments from the Wiki <http://opencv.willowgarage.com/wiki/documentation/py/calib3d/UndistortPoints>`__
+


 .. function:: UndistortPoints(src,dst,cameraMatrix,distCoeffs,R=NULL,P=NULL)-> None
--- a/doc/opencv1/py/core_basic_structures.rst
+++ b/doc/opencv1/py/core_basic_structures.rst
@@ -12,7 +12,7 @@ Basic Structures
 CvPoint
 -------

-`id=0.407060643954 Comments from the Wiki <http://opencv.willowgarage.com/wiki/documentation/py/core/CvPoint>`__
+

 .. class:: CvPoint

@@ -31,7 +31,7 @@ CvPoint
 CvPoint2D32f
 ------------

-`id=0.638091190655 Comments from the Wiki <http://opencv.willowgarage.com/wiki/documentation/py/core/CvPoint2D32f>`__
+

 .. class:: CvPoint2D32f

@@ -50,7 +50,7 @@ CvPoint2D32f
 CvPoint3D32f
 ------------

-`id=0.334583364495 Comments from the Wiki <http://opencv.willowgarage.com/wiki/documentation/py/core/CvPoint3D32f>`__
+

 .. class:: CvPoint3D32f

@@ -69,7 +69,7 @@ CvPoint3D32f
 CvPoint2D64f
 ------------

-`id=0.352962148614 Comments from the Wiki <http://opencv.willowgarage.com/wiki/documentation/py/core/CvPoint2D64f>`__
+

 .. class:: CvPoint2D64f

@@ -88,7 +88,7 @@ CvPoint2D64f
 CvPoint3D64f
 ------------

-`id=0.00812295344272 Comments from the Wiki <http://opencv.willowgarage.com/wiki/documentation/py/core/CvPoint3D64f>`__
+

 .. class:: CvPoint3D64f

@@ -107,7 +107,7 @@ CvPoint3D64f
 CvSize
 ------

-`id=0.980418044509 Comments from the Wiki <http://opencv.willowgarage.com/wiki/documentation/py/core/CvSize>`__
+

 .. class:: CvSize

@@ -126,7 +126,7 @@ Size of a rectangle, represented as a tuple
 CvSize2D32f
 -----------

-`id=0.623013904609 Comments from the Wiki <http://opencv.willowgarage.com/wiki/documentation/py/core/CvSize2D32f>`__
+

 .. class:: CvSize2D32f

@@ -145,7 +145,7 @@ Size of a rectangle, represented as a tuple
 CvRect
 ------

-`id=0.706717090055 Comments from the Wiki <http://opencv.willowgarage.com/wiki/documentation/py/core/CvRect>`__
+

 .. class:: CvRect

@@ -164,7 +164,7 @@ Rectangle, represented as a tuple
 CvScalar
 --------

-`id=0.733448405451 Comments from the Wiki <http://opencv.willowgarage.com/wiki/documentation/py/core/CvScalar>`__
+

 .. class:: CvScalar

@@ -202,7 +202,7 @@ CvScalar is always represented as a 4-tuple.
 CvTermCriteria
 --------------

-`id=0.996691519996 Comments from the Wiki <http://opencv.willowgarage.com/wiki/documentation/py/core/CvTermCriteria>`__
+

 .. class:: CvTermCriteria

@@ -264,7 +264,7 @@ Represented by a tuple
 CvMat
 -----

-`id=0.619633266675 Comments from the Wiki <http://opencv.willowgarage.com/wiki/documentation/py/core/CvMat>`__
+

 .. class:: CvMat

@@ -332,7 +332,7 @@ A multi-channel 2D matrix.  Created by
 CvMatND
 -------

-`id=0.493284398358 Comments from the Wiki <http://opencv.willowgarage.com/wiki/documentation/py/core/CvMatND>`__
+

 .. class:: CvMatND

@@ -368,7 +368,7 @@ Multi-dimensional dense multi-channel array.
 IplImage
 --------

-`id=0.479556472461 Comments from the Wiki <http://opencv.willowgarage.com/wiki/documentation/py/core/IplImage>`__
+

 .. class:: IplImage

@@ -493,7 +493,7 @@ formats.
 CvArr
 -----

-`id=0.249942454209 Comments from the Wiki <http://opencv.willowgarage.com/wiki/documentation/py/core/CvArr>`__
+

 .. class:: CvArr

--- a/doc/opencv1/py/core_clustering.rst
+++ b/doc/opencv1/py/core_clustering.rst
@@ -12,7 +12,7 @@ Clustering
 KMeans2
 -------

-`id=0.682106387651 Comments from the Wiki <http://opencv.willowgarage.com/wiki/documentation/py/core/KMeans2>`__
+


 .. function:: KMeans2(samples,nclusters,labels,termcrit)-> None
--- a/doc/opencv1/py/core_drawing_functions.rst
+++ b/doc/opencv1/py/core_drawing_functions.rst
@@ -42,7 +42,7 @@ is simply copied to the repainted pixels. Thus, if you want to paint semi-transp
 Circle
 ------

-`id=0.300689351141 Comments from the Wiki <http://opencv.willowgarage.com/wiki/documentation/py/core/Circle>`__
+


 .. function:: Circle(img,center,radius,color,thickness=1,lineType=8,shift=0)-> None
@@ -101,7 +101,7 @@ given center and radius.
 ClipLine
 --------

-`id=0.251101842576 Comments from the Wiki <http://opencv.willowgarage.com/wiki/documentation/py/core/ClipLine>`__
+


 .. function:: ClipLine(imgSize, pt1, pt2) -> (clipped_pt1, clipped_pt2)
@@ -139,7 +139,7 @@ If the line segment is outside the image, it returns None. If the line segment i
 DrawContours
 ------------

-`id=0.919530584794 Comments from the Wiki <http://opencv.willowgarage.com/wiki/documentation/py/core/DrawContours>`__
+


 .. function:: DrawContours(img,contour,external_color,hole_color,max_level,thickness=1,lineType=8,offset=(0,0))-> None
@@ -207,7 +207,7 @@ or fills the area bounded by the contours if
 Ellipse
 -------

-`id=0.149495013833 Comments from the Wiki <http://opencv.willowgarage.com/wiki/documentation/py/core/Ellipse>`__
+


 .. function:: Ellipse(img,center,axes,angle,start_angle,end_angle,color,thickness=1,lineType=8,shift=0)-> None
@@ -292,7 +292,7 @@ Parameters of Elliptic Arc
 EllipseBox
 ----------

-`id=0.217567751917 Comments from the Wiki <http://opencv.willowgarage.com/wiki/documentation/py/core/EllipseBox>`__
+


 .. function:: EllipseBox(img,box,color,thickness=1,lineType=8,shift=0)-> None
@@ -344,7 +344,7 @@ do. The ellipse drawn is clipped by ROI rectangle. A piecewise-linear approximat
 FillConvexPoly
 --------------

-`id=0.27807950676 Comments from the Wiki <http://opencv.willowgarage.com/wiki/documentation/py/core/FillConvexPoly>`__
+


 .. function:: FillConvexPoly(img,pn,color,lineType=8,shift=0)-> None
@@ -398,7 +398,7 @@ line) twice at the most.
 FillPoly
 --------

-`id=0.470054743188 Comments from the Wiki <http://opencv.willowgarage.com/wiki/documentation/py/core/FillPoly>`__
+


 .. function:: FillPoly(img,polys,color,lineType=8,shift=0)-> None
@@ -448,7 +448,7 @@ areas with holes, contour self-intersection, and so forth.
 GetTextSize
 -----------

-`id=0.723985190989 Comments from the Wiki <http://opencv.willowgarage.com/wiki/documentation/py/core/GetTextSize>`__
+


 .. function:: GetTextSize(textString,font)-> (textSize,baseline)
@@ -491,7 +491,7 @@ The function calculates the dimensions of a rectangle to enclose a text string w
 InitFont
 --------

-`id=0.526488936836 Comments from the Wiki <http://opencv.willowgarage.com/wiki/documentation/py/core/InitFont>`__
+


 .. function:: InitFont(fontFace,hscale,vscale,shear=0,thickness=1,lineType=8)-> font
@@ -579,7 +579,7 @@ The function initializes the font structure that can be passed to text rendering
 InitLineIterator
 ----------------

-`id=0.352578115956 Comments from the Wiki <http://opencv.willowgarage.com/wiki/documentation/py/core/InitLineIterator>`__
+


 .. function:: InitLineIterator(image, pt1, pt2, connectivity=8, left_to_right=0) -> line_iterator
@@ -682,7 +682,7 @@ or more concisely using
 Line
 ----

-`id=0.32347581651 Comments from the Wiki <http://opencv.willowgarage.com/wiki/documentation/py/core/Line>`__
+


 .. function:: Line(img,pt1,pt2,color,thickness=1,lineType=8,shift=0)-> None
@@ -764,7 +764,7 @@ the line color, the user may use the macro
 PolyLine
 --------

-`id=0.899614274707 Comments from the Wiki <http://opencv.willowgarage.com/wiki/documentation/py/core/PolyLine>`__
+


 .. function:: PolyLine(img,polys,is_closed,color,thickness=1,lineType=8,shift=0)-> None
@@ -824,7 +824,7 @@ The function draws single or multiple polygonal curves.
 PutText
 -------

-`id=0.414755160642 Comments from the Wiki <http://opencv.willowgarage.com/wiki/documentation/py/core/PutText>`__
+


 .. function:: PutText(img,text,org,font,color)-> None
@@ -875,7 +875,7 @@ replaced with the symbol for a rectangle.
 Rectangle
 ---------

-`id=0.243634323886 Comments from the Wiki <http://opencv.willowgarage.com/wiki/documentation/py/core/Rectangle>`__
+


 .. function:: Rectangle(img,pt1,pt2,color,thickness=1,lineType=8,shift=0)-> None
@@ -937,7 +937,7 @@ and
 CV_RGB
 ------

-`id=0.224041402111 Comments from the Wiki <http://opencv.willowgarage.com/wiki/documentation/py/core/CV_RGB>`__
+


 .. function:: CV_RGB(red,grn,blu)->CvScalar
--- a/doc/opencv1/py/core_dynamic_structures.rst
+++ b/doc/opencv1/py/core_dynamic_structures.rst
@@ -12,7 +12,7 @@ Dynamic Structures
 CvMemStorage
 ------------

-`id=0.11586833925 Comments from the Wiki <http://opencv.willowgarage.com/wiki/documentation/py/core/CvMemStorage>`__
+

 .. class:: CvMemStorage

@@ -51,7 +51,7 @@ to release a CvMemStorage.
 CvSeq
 -----

-`id=0.0938210237552 Comments from the Wiki <http://opencv.willowgarage.com/wiki/documentation/py/core/CvSeq>`__
+

 .. class:: CvSeq

@@ -104,7 +104,7 @@ In this case the methods return the other sequences.  If no relation between seq
 CvSet
 -----

-`id=0.165386903844 Comments from the Wiki <http://opencv.willowgarage.com/wiki/documentation/py/core/CvSet>`__
+

 .. class:: CvSet

@@ -137,7 +137,7 @@ Some OpenCV functions return a CvSet object. The CvSet obect is iterable, for ex
 CloneSeq
 --------

-`id=0.893022984961 Comments from the Wiki <http://opencv.willowgarage.com/wiki/documentation/py/core/CloneSeq>`__
+


 .. function:: CloneSeq(seq,storage)-> None
@@ -170,7 +170,7 @@ The function makes a complete copy of the input sequence and returns it.
 CreateMemStorage
 ----------------

-`id=0.141261875659 Comments from the Wiki <http://opencv.willowgarage.com/wiki/documentation/py/core/CreateMemStorage>`__
+


 .. function:: CreateMemStorage(blockSize = 0) -> memstorage
@@ -200,7 +200,7 @@ description.
 SeqInvert
 ---------

-`id=0.420185773758 Comments from the Wiki <http://opencv.willowgarage.com/wiki/documentation/py/core/SeqInvert>`__
+


 .. function:: SeqInvert(seq)-> None
@@ -228,7 +228,7 @@ The function reverses the sequence in-place - makes the first element go last, t
 SeqRemove
 ---------

-`id=0.405976799419 Comments from the Wiki <http://opencv.willowgarage.com/wiki/documentation/py/core/SeqRemove>`__
+


 .. function:: SeqRemove(seq,index)-> None
@@ -268,7 +268,7 @@ the sequence elements between the nearest end of the sequence and the
 SeqRemoveSlice
 --------------

-`id=0.589674828285 Comments from the Wiki <http://opencv.willowgarage.com/wiki/documentation/py/core/SeqRemoveSlice>`__
+


 .. function:: SeqRemoveSlice(seq,slice)-> None
--- a/doc/opencv1/py/core_operations_on_arrays.rst
+++ b/doc/opencv1/py/core_operations_on_arrays.rst
--- a/doc/opencv1/py/core_utility_and_system_functions_and_macros.rst
+++ b/doc/opencv1/py/core_utility_and_system_functions_and_macros.rst
@@ -61,7 +61,7 @@ A function with the
 GetTickCount
 ------------

-`id=0.81706194546 Comments from the Wiki <http://opencv.willowgarage.com/wiki/documentation/py/core/GetTickCount>`__
+


 .. function:: GetTickCount() -> long
@@ -82,7 +82,7 @@ The function returns number of the ticks starting from some platform-dependent e
 GetTickFrequency
 ----------------

-`id=0.967317163838 Comments from the Wiki <http://opencv.willowgarage.com/wiki/documentation/py/core/GetTickFrequency>`__
+


 .. function:: GetTickFrequency() -> long
--- a/doc/opencv1/py/core_xml_yaml_persistence.rst
+++ b/doc/opencv1/py/core_xml_yaml_persistence.rst
@@ -12,7 +12,7 @@ XML/YAML Persistence
 Load
 ----

-`id=0.778290631419 Comments from the Wiki <http://opencv.willowgarage.com/wiki/documentation/py/core/Load>`__
+


 .. function:: Load(filename,storage=NULL,name=NULL)-> generic
@@ -56,7 +56,7 @@ should pass a valid memory storage destination to the function.
 Save
 ----

-`id=0.295047298682 Comments from the Wiki <http://opencv.willowgarage.com/wiki/documentation/py/core/Save>`__
+


 .. function:: Save(filename,structPtr,name=NULL,comment=NULL)-> None
--- a/doc/opencv1/py/features2d_feature_detection_and_description.rst
+++ b/doc/opencv1/py/features2d_feature_detection_and_description.rst
@@ -29,7 +29,7 @@ Feature detection and description
 CvSURFPoint
 -----------

-`id=0.785092904945 Comments from the Wiki <http://opencv.willowgarage.com/wiki/documentation/py/features2d/CvSURFPoint>`__
+

 .. class:: CvSURFPoint

@@ -99,7 +99,7 @@ A SURF keypoint, represented as a tuple
 ExtractSURF
 -----------

-`id=0.999928834286 Comments from the Wiki <http://opencv.willowgarage.com/wiki/documentation/py/features2d/ExtractSURF>`__
+


 .. function:: ExtractSURF(image,mask,storage,params)-> (keypoints,descriptors)
@@ -193,7 +193,7 @@ To extract strong SURF features from an image
 GetStarKeypoints
 ----------------

-`id=0.373658080009 Comments from the Wiki <http://opencv.willowgarage.com/wiki/documentation/py/features2d/GetStarKeypoints>`__
+


 .. function:: GetStarKeypoints(image,storage,params)-> keypoints
--- a/doc/opencv1/py/highgui_reading_and_writing_images_and_video.rst
+++ b/doc/opencv1/py/highgui_reading_and_writing_images_and_video.rst
@@ -12,7 +12,7 @@ Reading and Writing Images and Video
 LoadImage
 ---------

-`id=0.709113485048 Comments from the Wiki <http://opencv.willowgarage.com/wiki/documentation/py/highgui/LoadImage>`__
+


 .. function:: LoadImage(filename, iscolor=CV_LOAD_IMAGE_COLOR)->None
@@ -84,7 +84,7 @@ Note that in the current implementation the alpha channel, if any, is stripped f
 LoadImageM
 ----------

-`id=0.915605899901 Comments from the Wiki <http://opencv.willowgarage.com/wiki/documentation/py/highgui/LoadImageM>`__
+


 .. function:: LoadImageM(filename, iscolor=CV_LOAD_IMAGE_COLOR)->None
@@ -157,7 +157,7 @@ Note that in the current implementation the alpha channel, if any, is stripped f
 SaveImage
 ---------

-`id=0.496487139898 Comments from the Wiki <http://opencv.willowgarage.com/wiki/documentation/py/highgui/SaveImage>`__
+


 .. function:: SaveImage(filename,image)-> None
@@ -203,7 +203,7 @@ to save the image to XML or YAML format.
 CvCapture
 ---------

-`id=0.364337205432 Comments from the Wiki <http://opencv.willowgarage.com/wiki/documentation/py/highgui/CvCapture>`__
+

 .. class:: CvCapture

@@ -223,7 +223,7 @@ does not have a public interface and is used only as a parameter for video captu
 CaptureFromCAM
 --------------

-`id=0.68934258142 Comments from the Wiki <http://opencv.willowgarage.com/wiki/documentation/py/highgui/CaptureFromCAM>`__
+


 .. function:: CaptureFromCAM(index) -> CvCapture
@@ -258,7 +258,7 @@ To release the structure, use
 CaptureFromFile
 ---------------

-`id=0.627099214181 Comments from the Wiki <http://opencv.willowgarage.com/wiki/documentation/py/highgui/CaptureFromFile>`__
+


 .. function:: CaptureFromFile(filename) -> CvCapture
@@ -292,7 +292,7 @@ function.
 GetCaptureProperty
 ------------------

-`id=0.295657731336 Comments from the Wiki <http://opencv.willowgarage.com/wiki/documentation/py/highgui/GetCaptureProperty>`__
+


 .. function:: GetCaptureProperty(capture, property_id)->double
@@ -388,7 +388,7 @@ retrieves the specified property of the camera or video file.
 GrabFrame
 ---------

-`id=0.664037861142 Comments from the Wiki <http://opencv.willowgarage.com/wiki/documentation/py/highgui/GrabFrame>`__
+


 .. function:: GrabFrame(capture) -> int
@@ -423,7 +423,7 @@ should be used.
 QueryFrame
 ----------

-`id=0.15232451714 Comments from the Wiki <http://opencv.willowgarage.com/wiki/documentation/py/highgui/QueryFrame>`__
+


 .. function:: QueryFrame(capture) -> iplimage
@@ -457,7 +457,7 @@ and
 RetrieveFrame
 -------------

-`id=0.978271497895 Comments from the Wiki <http://opencv.willowgarage.com/wiki/documentation/py/highgui/RetrieveFrame>`__
+


 .. function:: RetrieveFrame(capture) -> iplimage
@@ -490,7 +490,7 @@ function. The returned image should not be released or modified by the user.  In
 SetCaptureProperty
 ------------------

-`id=0.42439239326 Comments from the Wiki <http://opencv.willowgarage.com/wiki/documentation/py/highgui/SetCaptureProperty>`__
+


 .. function:: SetCaptureProperty(capture, property_id,value)->None
@@ -596,7 +596,7 @@ NB This function currently does nothing when using the latest CVS download on li
 CreateVideoWriter
 -----------------

-`id=0.778639527068 Comments from the Wiki <http://opencv.willowgarage.com/wiki/documentation/py/highgui/CreateVideoWriter>`__
+


 .. function:: CreateVideoWriter(filename, fourcc, fps, frame_size, is_color) -> CvVideoWriter
@@ -650,7 +650,7 @@ Which codecs and file formats are supported depends on the back end library. On
 WriteFrame
 ----------

-`id=0.0385991600269 Comments from the Wiki <http://opencv.willowgarage.com/wiki/documentation/py/highgui/WriteFrame>`__
+


 .. function:: WriteFrame(writer, image)->int
--- a/doc/opencv1/py/highgui_user_interface.rst
+++ b/doc/opencv1/py/highgui_user_interface.rst
@@ -12,7 +12,7 @@ User Interface
 CreateTrackbar
 --------------

-`id=0.859200002353 Comments from the Wiki <http://opencv.willowgarage.com/wiki/documentation/py/highgui/CreateTrackbar>`__
+


 .. function:: CreateTrackbar(trackbarName, windowName, value, count, onChange) -> None
@@ -82,7 +82,7 @@ By clicking on the label of each trackbar, it is possible to edit the trackbar's
 DestroyAllWindows
 -----------------

-`id=0.386578572057 Comments from the Wiki <http://opencv.willowgarage.com/wiki/documentation/py/highgui/DestroyAllWindows>`__
+


 .. function:: DestroyAllWindows()-> None
@@ -103,7 +103,7 @@ destroys all of the opened HighGUI windows.
 DestroyWindow
 -------------

-`id=0.0256606142145 Comments from the Wiki <http://opencv.willowgarage.com/wiki/documentation/py/highgui/DestroyWindow>`__
+


 .. function:: DestroyWindow(name)-> None
@@ -133,7 +133,7 @@ destroys the window with the given name.
 GetTrackbarPos
 --------------

-`id=0.0119794922165 Comments from the Wiki <http://opencv.willowgarage.com/wiki/documentation/py/highgui/GetTrackbarPos>`__
+


 .. function:: GetTrackbarPos(trackbarName,windowName)-> None
@@ -178,7 +178,7 @@ qt-specific details:
 MoveWindow
 ----------

-`id=0.0432662100889 Comments from the Wiki <http://opencv.willowgarage.com/wiki/documentation/py/highgui/MoveWindow>`__
+


 .. function:: MoveWindow(name,x,y)-> None
@@ -218,7 +218,7 @@ changes the position of the window.
 NamedWindow
 -----------

-`id=0.155885062255 Comments from the Wiki <http://opencv.willowgarage.com/wiki/documentation/py/highgui/NamedWindow>`__
+


 .. function:: NamedWindow(name,flags=CV_WINDOW_AUTOSIZE)-> None
@@ -291,7 +291,7 @@ qt-specific details:
 ResizeWindow
 ------------

-`id=0.266699312987 Comments from the Wiki <http://opencv.willowgarage.com/wiki/documentation/py/highgui/ResizeWindow>`__
+


 .. function:: ResizeWindow(name,width,height)-> None
@@ -331,7 +331,7 @@ changes the size of the window.
 SetMouseCallback
 ----------------

-`id=0.299310906828 Comments from the Wiki <http://opencv.willowgarage.com/wiki/documentation/py/highgui/SetMouseCallback>`__
+


 .. function:: SetMouseCallback(windowName, onMouse, param) -> None
@@ -436,7 +436,7 @@ parameter is a combination of :
 SetTrackbarPos
 --------------

-`id=0.722744232916 Comments from the Wiki <http://opencv.willowgarage.com/wiki/documentation/py/highgui/SetTrackbarPos>`__
+


 .. function:: SetTrackbarPos(trackbarName,windowName,pos)-> None
@@ -486,7 +486,7 @@ qt-specific details:
 ShowImage
 ---------

-`id=0.260802502296 Comments from the Wiki <http://opencv.willowgarage.com/wiki/documentation/py/highgui/ShowImage>`__
+


 .. function:: ShowImage(name,image)-> None
@@ -540,7 +540,7 @@ flag then the image is shown with its original size, otherwise the image is scal
 WaitKey
 -------

-`id=0.742095797983 Comments from the Wiki <http://opencv.willowgarage.com/wiki/documentation/py/highgui/WaitKey>`__
+


 .. function:: WaitKey(delay=0)-> int
--- a/doc/opencv1/py/imgproc_feature_detection.rst
+++ b/doc/opencv1/py/imgproc_feature_detection.rst
@@ -12,7 +12,7 @@ Feature Detection
 Canny
 -----

-`id=0.573160740956 Comments from the Wiki <http://opencv.willowgarage.com/wiki/documentation/py/imgproc/Canny>`__
+


 .. function:: Canny(image,edges,threshold1,threshold2,aperture_size=3)-> None
@@ -68,7 +68,7 @@ is used for edge linking, the largest value is used to find the initial segments
 CornerEigenValsAndVecs
 ----------------------

-`id=0.769586068428 Comments from the Wiki <http://opencv.willowgarage.com/wiki/documentation/py/imgproc/CornerEigenValsAndVecs>`__
+


 .. function:: CornerEigenValsAndVecs(image,eigenvv,blockSize,aperture_size=3)-> None
@@ -145,7 +145,7 @@ where
 CornerHarris
 ------------

-`id=0.619256620171 Comments from the Wiki <http://opencv.willowgarage.com/wiki/documentation/py/imgproc/CornerHarris>`__
+


 .. function:: CornerHarris(image,harris_dst,blockSize,aperture_size=3,k=0.04)-> None
@@ -212,7 +212,7 @@ to the destination image. Corners in the image can be found as the local maxima
 CornerMinEigenVal
 -----------------

-`id=0.523904183834 Comments from the Wiki <http://opencv.willowgarage.com/wiki/documentation/py/imgproc/CornerMinEigenVal>`__
+


 .. function:: CornerMinEigenVal(image,eigenval,blockSize,aperture_size=3)-> None
@@ -259,7 +259,7 @@ in terms of the previous function.
 FindCornerSubPix
 ----------------

-`id=0.448453276565 Comments from the Wiki <http://opencv.willowgarage.com/wiki/documentation/py/imgproc/FindCornerSubPix>`__
+


 .. function:: FindCornerSubPix(image,corners,win,zero_zone,criteria)-> corners
@@ -370,7 +370,7 @@ and then iterates until the center keeps within a set threshold.
 GoodFeaturesToTrack
 -------------------

-`id=0.0875265840344 Comments from the Wiki <http://opencv.willowgarage.com/wiki/documentation/py/imgproc/GoodFeaturesToTrack>`__
+


 .. function:: GoodFeaturesToTrack(image,eigImage,tempImage,cornerCount,qualityLevel,minDistance,mask=NULL,blockSize=3,useHarris=0,k=0.04)-> corners
@@ -472,7 +472,7 @@ will be the prefix of the output corners array with
 HoughLines2
 -----------

-`id=0.925466467327 Comments from the Wiki <http://opencv.willowgarage.com/wiki/documentation/py/imgproc/HoughLines2>`__
+


 .. function:: HoughLines2(image,storage,method,rho,theta,threshold,param1=0,param2=0)-> lines
@@ -577,7 +577,7 @@ The function implements a few variants of the Hough transform for line detection
 PreCornerDetect
 ---------------

-`id=0.420590326716 Comments from the Wiki <http://opencv.willowgarage.com/wiki/documentation/py/imgproc/PreCornerDetect>`__
+


 .. function:: PreCornerDetect(image,corners,apertureSize=3)-> None
--- a/doc/opencv1/py/imgproc_geometric_image_transformations.rst
+++ b/doc/opencv1/py/imgproc_geometric_image_transformations.rst
@@ -69,7 +69,7 @@ and to the simplest and the fastest
 GetRotationMatrix2D
 -------------------

-`id=0.155746043393 Comments from the Wiki <http://opencv.willowgarage.com/wiki/documentation/py/imgproc/GetRotationMatrix2D>`__
+


 .. function:: GetRotationMatrix2D(center,angle,scale,mapMatrix)-> None
@@ -132,7 +132,7 @@ The transformation maps the rotation center to itself. If this is not the purpos
 GetAffineTransform
 ------------------

-`id=0.131853152013 Comments from the Wiki <http://opencv.willowgarage.com/wiki/documentation/py/imgproc/GetAffineTransform>`__
+


 .. function:: GetAffineTransform(src,dst,mapMatrix)-> None
@@ -188,7 +188,7 @@ where
 GetPerspectiveTransform
 -----------------------

-`id=0.411609579387 Comments from the Wiki <http://opencv.willowgarage.com/wiki/documentation/py/imgproc/GetPerspectiveTransform>`__
+


 .. function:: GetPerspectiveTransform(src,dst,mapMatrix)-> None
@@ -246,7 +246,7 @@ where
 GetQuadrangleSubPix
 -------------------

-`id=0.522776327076 Comments from the Wiki <http://opencv.willowgarage.com/wiki/documentation/py/imgproc/GetQuadrangleSubPix>`__
+


 .. function:: GetQuadrangleSubPix(src,dst,mapMatrix)-> None
@@ -319,7 +319,7 @@ The values of pixels at non-integer coordinates are retrieved using bilinear int
 GetRectSubPix
 -------------

-`id=0.947278759693 Comments from the Wiki <http://opencv.willowgarage.com/wiki/documentation/py/imgproc/GetRectSubPix>`__
+


 .. function:: GetRectSubPix(src,dst,center)-> None
@@ -376,7 +376,7 @@ pixel values beyond the image boundaries.
 LogPolar
 --------

-`id=0.991629705277 Comments from the Wiki <http://opencv.willowgarage.com/wiki/documentation/py/imgproc/LogPolar>`__
+


 .. function:: LogPolar(src,dst,center,M,flags=CV_INNER_LINEAR+CV_WARP_FILL_OUTLIERS)-> None
@@ -468,7 +468,7 @@ The function can not operate in-place.
 Remap
 -----

-`id=0.129979785029 Comments from the Wiki <http://opencv.willowgarage.com/wiki/documentation/py/imgproc/Remap>`__
+


 .. function:: Remap(src,dst,mapx,mapy,flags=CV_INNER_LINEAR+CV_WARP_FILL_OUTLIERS,fillval=(0,0,0,0))-> None
@@ -538,7 +538,7 @@ Note that the function can not operate in-place.
 Resize
 ------

-`id=0.923811087592 Comments from the Wiki <http://opencv.willowgarage.com/wiki/documentation/py/imgproc/Resize>`__
+


 .. function:: Resize(src,dst,interpolation=CV_INTER_LINEAR)-> None
@@ -593,7 +593,7 @@ so that it fits exactly into
 WarpAffine
 ----------

-`id=0.314654704506 Comments from the Wiki <http://opencv.willowgarage.com/wiki/documentation/py/imgproc/WarpAffine>`__
+


 .. function:: WarpAffine(src,dst,mapMatrix,flags=CV_INTER_LINEAR+CV_WARP_FILL_OUTLIERS,fillval=(0,0,0,0))-> None
@@ -684,7 +684,7 @@ function from cxcore.
 WarpPerspective
 ---------------

-`id=0.554206520217 Comments from the Wiki <http://opencv.willowgarage.com/wiki/documentation/py/imgproc/WarpPerspective>`__
+


 .. function:: WarpPerspective(src,dst,mapMatrix,flags=CV_INNER_LINEAR+CV_WARP_FILL_OUTLIERS,fillval=(0,0,0,0))-> None
--- a/doc/opencv1/py/imgproc_histograms.rst
+++ b/doc/opencv1/py/imgproc_histograms.rst
@@ -12,7 +12,7 @@ Histograms
 CvHistogram
 -----------

-`id=0.182438452658 Comments from the Wiki <http://opencv.willowgarage.com/wiki/documentation/py/imgproc/CvHistogram>`__
+

 .. class:: CvHistogram

@@ -35,7 +35,7 @@ containing the histogram counts.
 CalcBackProject
 ---------------

-`id=0.913786988566 Comments from the Wiki <http://opencv.willowgarage.com/wiki/documentation/py/imgproc/CalcBackProject>`__
+


 .. function:: CalcBackProject(image,back_project,hist)-> None
@@ -99,7 +99,7 @@ That is the approximate algorithm of Camshift color object tracker, except for t
 CalcBackProjectPatch
 --------------------

-`id=0.817068389137 Comments from the Wiki <http://opencv.willowgarage.com/wiki/documentation/py/imgproc/CalcBackProjectPatch>`__
+


 .. function:: CalcBackProjectPatch(images,dst,patch_size,hist,method,factor)-> None
@@ -194,7 +194,7 @@ Back Project Calculation by Patches
 CalcHist
 --------

-`id=0.937336139373 Comments from the Wiki <http://opencv.willowgarage.com/wiki/documentation/py/imgproc/CalcHist>`__
+


 .. function:: CalcHist(image,hist,accumulate=0,mask=NULL)-> None
@@ -244,7 +244,7 @@ input images.
 CalcProbDensity
 ---------------

-`id=0.656540136559 Comments from the Wiki <http://opencv.willowgarage.com/wiki/documentation/py/imgproc/CalcProbDensity>`__
+


 .. function:: CalcProbDensity(hist1,hist2,dst_hist,scale=255)-> None
@@ -298,7 +298,7 @@ So the destination histogram bins are within less than
 ClearHist
 ---------

-`id=0.0803392460869 Comments from the Wiki <http://opencv.willowgarage.com/wiki/documentation/py/imgproc/ClearHist>`__
+


 .. function:: ClearHist(hist)-> None
@@ -326,7 +326,7 @@ The function sets all of the histogram bins to 0 in the case of a dense histogra
 CompareHist
 -----------

-`id=0.913670879358 Comments from the Wiki <http://opencv.willowgarage.com/wiki/documentation/py/imgproc/CompareHist>`__
+


 .. function:: CompareHist(hist1,hist2,method)->float
@@ -448,7 +448,7 @@ function.
 CreateHist
 ----------

-`id=0.716036535258 Comments from the Wiki <http://opencv.willowgarage.com/wiki/documentation/py/imgproc/CreateHist>`__
+


 .. function:: CreateHist(dims, type, ranges, uniform = 1) -> hist
@@ -517,7 +517,7 @@ bin ranges, they assume thy are equally spaced in 0 to 255 bins.
 GetMinMaxHistValue
 ------------------

-`id=0.698817534292 Comments from the Wiki <http://opencv.willowgarage.com/wiki/documentation/py/imgproc/GetMinMaxHistValue>`__
+


 .. function:: GetMinMaxHistValue(hist)-> (min_value,max_value,min_idx,max_idx)
@@ -570,7 +570,7 @@ is returned.
 NormalizeHist
 -------------

-`id=0.905166705956 Comments from the Wiki <http://opencv.willowgarage.com/wiki/documentation/py/imgproc/NormalizeHist>`__
+


 .. function:: NormalizeHist(hist,factor)-> None
@@ -605,7 +605,7 @@ The function normalizes the histogram bins by scaling them, such that the sum of
 QueryHistValue_1D
 -----------------

-`id=0.26842391983 Comments from the Wiki <http://opencv.willowgarage.com/wiki/documentation/py/imgproc/QueryHistValue_1D>`__
+


 .. function:: QueryHistValue_1D(hist, idx0) -> float
@@ -636,7 +636,7 @@ QueryHistValue_1D
 QueryHistValue_2D
 -----------------

-`id=0.149356032534 Comments from the Wiki <http://opencv.willowgarage.com/wiki/documentation/py/imgproc/QueryHistValue_2D>`__
+


 .. function:: QueryHistValue_2D(hist, idx0, idx1) -> float
@@ -672,7 +672,7 @@ QueryHistValue_2D
 QueryHistValue_3D
 -----------------

-`id=0.846880584809 Comments from the Wiki <http://opencv.willowgarage.com/wiki/documentation/py/imgproc/QueryHistValue_3D>`__
+


 .. function:: QueryHistValue_3D(hist, idx0, idx1, idx2) -> float
@@ -713,7 +713,7 @@ QueryHistValue_3D
 QueryHistValue_nD
 -----------------

-`id=0.36909443826 Comments from the Wiki <http://opencv.willowgarage.com/wiki/documentation/py/imgproc/QueryHistValue_nD>`__
+


 .. function:: QueryHistValue_nD(hist, idx) -> float
@@ -744,7 +744,7 @@ QueryHistValue_nD
 ThreshHist
 ----------

-`id=0.255496509485 Comments from the Wiki <http://opencv.willowgarage.com/wiki/documentation/py/imgproc/ThreshHist>`__
+


 .. function:: ThreshHist(hist,threshold)-> None
--- a/doc/opencv1/py/imgproc_image_filtering.rst
+++ b/doc/opencv1/py/imgproc_image_filtering.rst
@@ -23,7 +23,7 @@ filter, then during the processing of the left-most pixels in each row we need p
 IplConvKernel
 -------------

-`id=0.589941281227 Comments from the Wiki <http://opencv.willowgarage.com/wiki/documentation/py/imgproc/IplConvKernel>`__
+

 .. class:: IplConvKernel

@@ -41,7 +41,7 @@ An IplConvKernel is a rectangular convolution kernel, created by function
 CopyMakeBorder
 --------------

-`id=0.392095677822 Comments from the Wiki <http://opencv.willowgarage.com/wiki/documentation/py/imgproc/CopyMakeBorder>`__
+


 .. function:: CopyMakeBorder(src,dst,offset,bordertype,value=(0,0,0,0))-> None
@@ -96,7 +96,7 @@ The function copies the source 2D array into the interior of the destination arr
 CreateStructuringElementEx
 --------------------------

-`id=0.317060827729 Comments from the Wiki <http://opencv.willowgarage.com/wiki/documentation/py/imgproc/CreateStructuringElementEx>`__
+


 .. function:: CreateStructuringElementEx(cols,rows,anchorX,anchorY,shape,values=None)-> kernel
@@ -165,7 +165,7 @@ The function CreateStructuringElementEx allocates and fills the structure
 Dilate
 ------

-`id=0.716788417488 Comments from the Wiki <http://opencv.willowgarage.com/wiki/documentation/py/imgproc/Dilate>`__
+


 .. function:: Dilate(src,dst,element=None,iterations=1)-> None
@@ -220,7 +220,7 @@ The function supports the in-place mode. Dilation can be applied several (
 Erode
 -----

-`id=0.842620131268 Comments from the Wiki <http://opencv.willowgarage.com/wiki/documentation/py/imgproc/Erode>`__
+


 .. function:: Erode(src,dst,element=None,iterations=1)-> None
@@ -275,7 +275,7 @@ The function supports the in-place mode. Erosion can be applied several (
 Filter2D
 --------

-`id=0.460981812748 Comments from the Wiki <http://opencv.willowgarage.com/wiki/documentation/py/imgproc/Filter2D>`__
+


 .. function:: Filter2D(src,dst,kernel,anchor=(-1,-1))-> None
@@ -318,7 +318,7 @@ The function applies an arbitrary linear filter to the image. In-place operation
 Laplace
 -------

-`id=0.292603296168 Comments from the Wiki <http://opencv.willowgarage.com/wiki/documentation/py/imgproc/Laplace>`__
+


 .. function:: Laplace(src,dst,apertureSize=3)-> None
@@ -378,7 +378,7 @@ function, no scaling is done and the same combinations of input and output forma
 MorphologyEx
 ------------

-`id=0.989292823459 Comments from the Wiki <http://opencv.willowgarage.com/wiki/documentation/py/imgproc/MorphologyEx>`__
+


 .. function:: MorphologyEx(src,dst,temp,element,operation,iterations=1)-> None
@@ -492,7 +492,7 @@ is required for a morphological gradient and, in the case of in-place operation,
 PyrDown
 -------

-`id=0.761058003811 Comments from the Wiki <http://opencv.willowgarage.com/wiki/documentation/py/imgproc/PyrDown>`__
+


 .. function:: PyrDown(src,dst,filter=CV_GAUSSIAN_5X5)-> None
@@ -530,7 +530,7 @@ The function performs the downsampling step of the Gaussian pyramid decompositio
 Smooth
 ------

-`id=0.981627398232 Comments from the Wiki <http://opencv.willowgarage.com/wiki/documentation/py/imgproc/Smooth>`__
+


 .. function:: Smooth(src,dst,smoothtype=CV_GAUSSIAN,param1=3,param2=0,param3=0,param4=0)-> None
@@ -616,7 +616,7 @@ Median and bilateral filters work with 1- or 3-channel 8-bit images and can not
 Sobel
 -----

-`id=0.141242620837 Comments from the Wiki <http://opencv.willowgarage.com/wiki/documentation/py/imgproc/Sobel>`__
+


 .. function:: Sobel(src,dst,xorder,yorder,apertureSize = 3)-> None
--- a/doc/opencv1/py/imgproc_miscellaneous_image_transformations.rst
+++ b/doc/opencv1/py/imgproc_miscellaneous_image_transformations.rst
@@ -12,7 +12,7 @@ Miscellaneous Image Transformations
 AdaptiveThreshold
 -----------------

-`id=0.347945671563 Comments from the Wiki <http://opencv.willowgarage.com/wiki/documentation/py/imgproc/AdaptiveThreshold>`__
+


 .. function:: AdaptiveThreshold(src,dst,maxValue, adaptive_method=CV_ADAPTIVE_THRESH_MEAN_C, thresholdType=CV_THRESH_BINARY,blockSize=3,param1=5)-> None
@@ -118,7 +118,7 @@ pixel neighborhood, minus
 CvtColor
 --------

-`id=0.514105031816 Comments from the Wiki <http://opencv.willowgarage.com/wiki/documentation/py/imgproc/CvtColor>`__
+


 .. function:: CvtColor(src,dst,code)-> None
@@ -701,7 +701,7 @@ The function can do the following transformations:
 DistTransform
 -------------

-`id=0.403544454308 Comments from the Wiki <http://opencv.willowgarage.com/wiki/documentation/py/imgproc/DistTransform>`__
+


 .. function:: DistTransform(src,dst,distance_type=CV_DIST_L2,mask_size=3,mask=None,labels=NULL)-> None
@@ -858,7 +858,7 @@ Voronoi diagram for the binary image.
 CvConnectedComp
 ---------------

-`id=0.582359535464 Comments from the Wiki <http://opencv.willowgarage.com/wiki/documentation/py/imgproc/CvConnectedComp>`__
+

 .. class:: CvConnectedComp

@@ -879,7 +879,7 @@ as a
 FloodFill
 ---------

-`id=0.993822136735 Comments from the Wiki <http://opencv.willowgarage.com/wiki/documentation/py/imgproc/FloodFill>`__
+


 .. function:: FloodFill(image,seed_point,new_val,lo_diff=(0,0,0,0),up_diff=(0,0,0,0),flags=4,mask=NULL)-> comp
@@ -1040,7 +1040,7 @@ is the value of one of pixel neighbors. That is, to be added to the connected co
 Inpaint
 -------

-`id=0.0263619127935 Comments from the Wiki <http://opencv.willowgarage.com/wiki/documentation/py/imgproc/Inpaint>`__
+


 .. function:: Inpaint(src,mask,dst,inpaintRadius,flags) -> None
@@ -1094,7 +1094,7 @@ The function reconstructs the selected image area from the pixel near the area b
 Integral
 --------

-`id=0.623787344698 Comments from the Wiki <http://opencv.willowgarage.com/wiki/documentation/py/imgproc/Integral>`__
+


 .. function:: Integral(image,sum,sqsum=NULL,tiltedSum=NULL)-> None
@@ -1170,7 +1170,7 @@ It makes possible to do a fast blurring or fast block correlation with variable
 PyrMeanShiftFiltering
 ---------------------

-`id=0.193607300873 Comments from the Wiki <http://opencv.willowgarage.com/wiki/documentation/py/imgproc/PyrMeanShiftFiltering>`__
+


 .. function:: PyrMeanShiftFiltering(src,dst,sp,sr,max_level=1,termcrit=(CV_TERMCRIT_ITER+CV_TERMCRIT_EPS,5,1))-> None
@@ -1274,7 +1274,7 @@ running the meanshift procedure on the whole original image (i.e. when
 PyrSegmentation
 ---------------

-`id=0.0663769417357 Comments from the Wiki <http://opencv.willowgarage.com/wiki/documentation/py/imgproc/PyrSegmentation>`__
+


 .. function:: PyrSegmentation(src,dst,storage,level,threshold1,threshold2)-> comp
@@ -1364,7 +1364,7 @@ should be 8-bit single-channel or 3-channel images or equal size.
 Threshold
 ---------

-`id=0.201828299143 Comments from the Wiki <http://opencv.willowgarage.com/wiki/documentation/py/imgproc/Threshold>`__
+


 .. function:: Threshold(src,dst,threshold,maxValue,thresholdType)-> None
--- a/doc/opencv1/py/imgproc_motion_analysis_and_object_tracking.rst
+++ b/doc/opencv1/py/imgproc_motion_analysis_and_object_tracking.rst
@@ -12,7 +12,7 @@ Motion Analysis and Object Tracking
 Acc
 ---

-`id=0.629029815041 Comments from the Wiki <http://opencv.willowgarage.com/wiki/documentation/py/imgproc/Acc>`__
+


 .. function:: Acc(image,sum,mask=NULL)-> None
@@ -61,7 +61,7 @@ or its selected region to the accumulator
 MultiplyAcc
 -----------

-`id=0.767428702085 Comments from the Wiki <http://opencv.willowgarage.com/wiki/documentation/py/imgproc/MultiplyAcc>`__
+


 .. function:: MultiplyAcc(image1,image2,acc,mask=NULL)-> None
@@ -113,7 +113,7 @@ The function adds the product of 2 images or their selected regions to the accum
 RunningAvg
 ----------

-`id=0.136357383909 Comments from the Wiki <http://opencv.willowgarage.com/wiki/documentation/py/imgproc/RunningAvg>`__
+


 .. function:: RunningAvg(image,acc,alpha,mask=NULL)-> None
@@ -173,7 +173,7 @@ regulates the update speed (how fast the accumulator forgets about previous fram
 SquareAcc
 ---------

-`id=0.606012635939 Comments from the Wiki <http://opencv.willowgarage.com/wiki/documentation/py/imgproc/SquareAcc>`__
+


 .. function:: SquareAcc(image,sqsum,mask=NULL)-> None
--- a/doc/opencv1/py/imgproc_object_detection.rst
+++ b/doc/opencv1/py/imgproc_object_detection.rst
@@ -12,7 +12,7 @@ Object Detection
 MatchTemplate
 -------------

-`id=0.180820664163 Comments from the Wiki <http://opencv.willowgarage.com/wiki/documentation/py/imgproc/MatchTemplate>`__
+


 .. function:: MatchTemplate(image,templ,result,method)-> None
--- a/doc/opencv1/py/imgproc_planar_subdivisions.rst
+++ b/doc/opencv1/py/imgproc_planar_subdivisions.rst
@@ -12,7 +12,7 @@ Planar Subdivisions
 CvSubdiv2D
 ----------

-`id=0.403332162742 Comments from the Wiki <http://opencv.willowgarage.com/wiki/documentation/py/imgproc/CvSubdiv2D>`__
+

 .. class:: CvSubdiv2D

@@ -68,7 +68,7 @@ morphing, fast location of points on the plane, building special graphs
 CvSubdiv2DPoint
 ---------------

-`id=0.753986010152 Comments from the Wiki <http://opencv.willowgarage.com/wiki/documentation/py/imgproc/CvSubdiv2DPoint>`__
+

 .. class:: CvSubdiv2DPoint

@@ -104,7 +104,7 @@ Point of original or dual subdivision.
 CalcSubdivVoronoi2D
 -------------------

-`id=0.119097157929 Comments from the Wiki <http://opencv.willowgarage.com/wiki/documentation/py/imgproc/CalcSubdivVoronoi2D>`__
+


 .. function:: CalcSubdivVoronoi2D(subdiv)-> None
@@ -135,7 +135,7 @@ cell at that point.
 ClearSubdivVoronoi2D
 --------------------

-`id=0.158437620754 Comments from the Wiki <http://opencv.willowgarage.com/wiki/documentation/py/imgproc/ClearSubdivVoronoi2D>`__
+


 .. function:: ClearSubdivVoronoi2D(subdiv)-> None
@@ -168,7 +168,7 @@ was modified after previous call to the function.
 CreateSubdivDelaunay2D
 ----------------------

-`id=0.918020754539 Comments from the Wiki <http://opencv.willowgarage.com/wiki/documentation/py/imgproc/CreateSubdivDelaunay2D>`__
+


 .. function:: CreateSubdivDelaunay2D(rect,storage)-> delaunay_triangulation
@@ -209,7 +209,7 @@ Note that the triangulation is a single large triangle that covers the given rec
 FindNearestPoint2D
 ------------------

-`id=0.679601866055 Comments from the Wiki <http://opencv.willowgarage.com/wiki/documentation/py/imgproc/FindNearestPoint2D>`__
+


 .. function:: FindNearestPoint2D(subdiv,pt)-> point
@@ -248,7 +248,7 @@ point. The function returns a pointer to the found subdivision vertex.
 Subdiv2DEdgeDst
 ---------------

-`id=0.723258652692 Comments from the Wiki <http://opencv.willowgarage.com/wiki/documentation/py/imgproc/Subdiv2DEdgeDst>`__
+


 .. function:: Subdiv2DEdgeDst(edge)-> point
@@ -281,7 +281,7 @@ can be calculated using the function
 Subdiv2DGetEdge
 ---------------

-`id=0.506587189348 Comments from the Wiki <http://opencv.willowgarage.com/wiki/documentation/py/imgproc/Subdiv2DGetEdge>`__
+


 .. function:: Subdiv2DGetEdge(edge,type)-> CvSubdiv2DEdge
@@ -348,7 +348,7 @@ The function returns one of the edges related to the input edge.
 Subdiv2DNextEdge
 ----------------

-`id=0.406592929731 Comments from the Wiki <http://opencv.willowgarage.com/wiki/documentation/py/imgproc/Subdiv2DNextEdge>`__
+


 .. function:: Subdiv2DNextEdge(edge)-> CvSubdiv2DEdge
@@ -386,7 +386,7 @@ is the input edge)
 Subdiv2DLocate
 --------------

-`id=0.614412184993 Comments from the Wiki <http://opencv.willowgarage.com/wiki/documentation/py/imgproc/Subdiv2DLocate>`__
+


 .. function:: Subdiv2DLocate(subdiv, pt) -> (loc, where)
@@ -481,7 +481,7 @@ The function locates the input point within the subdivision. There are 5 cases:
 Subdiv2DRotateEdge
 ------------------

-`id=0.775095566923 Comments from the Wiki <http://opencv.willowgarage.com/wiki/documentation/py/imgproc/Subdiv2DRotateEdge>`__
+


 .. function:: Subdiv2DRotateEdge(edge,rotate)-> CvSubdiv2DEdge
@@ -534,7 +534,7 @@ The function returns one of the edges of the same quad-edge as the input edge.
 SubdivDelaunay2DInsert
 ----------------------

-`id=0.291010420302 Comments from the Wiki <http://opencv.willowgarage.com/wiki/documentation/py/imgproc/SubdivDelaunay2DInsert>`__
+


 .. function:: SubdivDelaunay2DInsert(subdiv,pt)-> point
--- a/doc/opencv1/py/imgproc_structural_analysis_and_shape_descriptors.rst
+++ b/doc/opencv1/py/imgproc_structural_analysis_and_shape_descriptors.rst
@@ -12,7 +12,7 @@ Structural Analysis and Shape Descriptors
 ApproxChains
 ------------

-`id=0.891722904536 Comments from the Wiki <http://opencv.willowgarage.com/wiki/documentation/py/imgproc/ApproxChains>`__
+


 .. function:: ApproxChains(src_seq,storage,method=CV_CHAIN_APPROX_SIMPLE,parameter=0,minimal_perimeter=0,recursive=0)-> chains
@@ -73,7 +73,7 @@ fields of the returned structure.
 ApproxPoly
 ----------

-`id=0.511872225874 Comments from the Wiki <http://opencv.willowgarage.com/wiki/documentation/py/imgproc/ApproxPoly>`__
+


 .. function:: 
@@ -126,7 +126,7 @@ correspondence).
 ArcLength
 ---------

-`id=0.00865407229522 Comments from the Wiki <http://opencv.willowgarage.com/wiki/documentation/py/imgproc/ArcLength>`__
+


 .. function:: ArcLength(curve,slice=CV_WHOLE_SEQ,isClosed=-1)-> double
@@ -175,7 +175,7 @@ The function calculates the length or curve as the sum of lengths of segments be
 BoundingRect
 ------------

-`id=0.0890624819294 Comments from the Wiki <http://opencv.willowgarage.com/wiki/documentation/py/imgproc/BoundingRect>`__
+


 .. function:: BoundingRect(points,update=0)-> CvRect
@@ -223,7 +223,7 @@ Here is the list of possible combination of the flag values and type of
 BoxPoints
 ---------

-`id=0.833111863214 Comments from the Wiki <http://opencv.willowgarage.com/wiki/documentation/py/imgproc/BoxPoints>`__
+


 .. function:: BoxPoints(box)-> points
@@ -256,7 +256,7 @@ The function calculates the vertices of the input 2d box.
 CalcPGH
 -------

-`id=0.492952101193 Comments from the Wiki <http://opencv.willowgarage.com/wiki/documentation/py/imgproc/CalcPGH>`__
+


 .. function:: CalcPGH(contour,hist)-> None
@@ -299,7 +299,7 @@ definition). The histogram can be used for contour matching.
 CalcEMD2
 --------

-`id=0.390300478738 Comments from the Wiki <http://opencv.willowgarage.com/wiki/documentation/py/imgproc/CalcEMD2>`__
+


 .. function:: CalcEMD2(signature1, signature2, distance_type, distance_func = None, cost_matrix=None, flow=None, lower_bound=None, userdata = None) -> float
@@ -374,7 +374,7 @@ so that they cannot relate to the same object.
 CheckContourConvexity
 ---------------------

-`id=0.472970769213 Comments from the Wiki <http://opencv.willowgarage.com/wiki/documentation/py/imgproc/CheckContourConvexity>`__
+


 .. function:: CheckContourConvexity(contour)-> int
@@ -402,7 +402,7 @@ The function tests whether the input contour is convex or not. The contour must
 CvConvexityDefect
 -----------------

-`id=0.484949869638 Comments from the Wiki <http://opencv.willowgarage.com/wiki/documentation/py/imgproc/CvConvexityDefect>`__
+

 .. class:: CvConvexityDefect

@@ -462,7 +462,7 @@ A single contour convexity defect, represented by a tuple
 ContourArea
 -----------

-`id=0.958766756024 Comments from the Wiki <http://opencv.willowgarage.com/wiki/documentation/py/imgproc/ContourArea>`__
+


 .. function:: ContourArea(contour,slice=CV_WHOLE_SEQ)-> double
@@ -510,7 +510,7 @@ function from C runtime to get the absolute value of the area.
 ContourFromContourTree
 ----------------------

-`id=0.162786680111 Comments from the Wiki <http://opencv.willowgarage.com/wiki/documentation/py/imgproc/ContourFromContourTree>`__
+


 .. function:: ContourFromContourTree(tree,storage,criteria)-> contour
@@ -544,7 +544,7 @@ determines the accuracy and/or the number of tree levels used for reconstruction
 ConvexHull2
 -----------

-`id=0.277941655963 Comments from the Wiki <http://opencv.willowgarage.com/wiki/documentation/py/imgproc/ConvexHull2>`__
+


 .. function:: ConvexHull2(points,storage,orientation=CV_CLOCKWISE,return_points=0)-> convex_hull
@@ -593,7 +593,7 @@ is a CvMat, the function returns NULL.
 ConvexityDefects
 ----------------

-`id=0.819226332619 Comments from the Wiki <http://opencv.willowgarage.com/wiki/documentation/py/imgproc/ConvexityDefects>`__
+


 .. function:: ConvexityDefects(contour,convexhull,storage)-> convexity_defects
@@ -631,7 +631,7 @@ The function finds all convexity defects of the input contour and returns a sequ
 CreateContourTree
 -----------------

-`id=0.249344062216 Comments from the Wiki <http://opencv.willowgarage.com/wiki/documentation/py/imgproc/CreateContourTree>`__
+


 .. function:: CreateContourTree(contour,storage,threshold)-> contour_tree
@@ -671,7 +671,7 @@ is less than or equal to 0, the function creates a full binary tree representati
 FindContours
 ------------

-`id=0.577796431347 Comments from the Wiki <http://opencv.willowgarage.com/wiki/documentation/py/imgproc/FindContours>`__
+


 .. function:: FindContours(image, storage, mode=CV_RETR_LIST, method=CV_CHAIN_APPROX_SIMPLE, offset=(0,0)) -> cvseq
@@ -781,7 +781,7 @@ is modified by this function.
 FitEllipse2
 -----------

-`id=0.461296656973 Comments from the Wiki <http://opencv.willowgarage.com/wiki/documentation/py/imgproc/FitEllipse2>`__
+


 .. function:: FitEllipse2(points)-> Box2D
@@ -817,7 +817,7 @@ not half-lengths.
 FitLine
 -------

-`id=0.681153539505 Comments from the Wiki <http://opencv.willowgarage.com/wiki/documentation/py/imgproc/FitLine>`__
+


 .. function:: FitLine(points, dist_type, param, reps, aeps) -> line
@@ -947,7 +947,7 @@ is a distance function, one of:
 GetCentralMoment
 ----------------

-`id=0.28222157071 Comments from the Wiki <http://opencv.willowgarage.com/wiki/documentation/py/imgproc/GetCentralMoment>`__
+


 .. function:: GetCentralMoment(moments, x_order, y_order) -> double
@@ -1003,7 +1003,7 @@ are the coordinates of the gravity center:
 GetHuMoments
 ------------

-`id=0.855980556214 Comments from the Wiki <http://opencv.willowgarage.com/wiki/documentation/py/imgproc/GetHuMoments>`__
+


 .. function:: GetHuMoments(moments) -> hu
@@ -1070,7 +1070,7 @@ These values are proved to be invariant to the image scale, rotation, and reflec
 GetNormalizedCentralMoment
 --------------------------

-`id=0.725127020324 Comments from the Wiki <http://opencv.willowgarage.com/wiki/documentation/py/imgproc/GetNormalizedCentralMoment>`__
+


 .. function:: GetNormalizedCentralMoment(moments, x_order, y_order) -> double
@@ -1115,7 +1115,7 @@ The function retrieves the normalized central moment:
 GetSpatialMoment
 ----------------

-`id=0.191749557246 Comments from the Wiki <http://opencv.willowgarage.com/wiki/documentation/py/imgproc/GetSpatialMoment>`__
+


 .. function:: GetSpatialMoment(moments, x_order, y_order) -> double
@@ -1166,7 +1166,7 @@ is the intensity of the pixel
 MatchContourTrees
 -----------------

-`id=0.480547577878 Comments from the Wiki <http://opencv.willowgarage.com/wiki/documentation/py/imgproc/MatchContourTrees>`__
+


 .. function:: MatchContourTrees(tree1,tree2,method,threshold)-> double
@@ -1203,7 +1203,7 @@ The function calculates the value of the matching measure for two contour trees.
 MatchShapes
 -----------

-`id=0.317335085559 Comments from the Wiki <http://opencv.willowgarage.com/wiki/documentation/py/imgproc/MatchShapes>`__
+


 .. function:: MatchShapes(object1,object2,method,parameter=0)-> None
@@ -1312,7 +1312,7 @@ respectively.
 MinAreaRect2
 ------------

-`id=0.271581100753 Comments from the Wiki <http://opencv.willowgarage.com/wiki/documentation/py/imgproc/MinAreaRect2>`__
+


 .. function:: MinAreaRect2(points,storage=NULL)-> CvBox2D
@@ -1353,7 +1353,7 @@ Picture. Minimal-area bounding rectangle for contour
 MinEnclosingCircle
 ------------------

-`id=0.696424733079 Comments from the Wiki <http://opencv.willowgarage.com/wiki/documentation/py/imgproc/MinEnclosingCircle>`__
+


 .. function:: MinEnclosingCircle(points)-> (int,center,radius)
@@ -1394,7 +1394,7 @@ if the resultant circle contains all the input points and zero otherwise
 Moments
 -------

-`id=0.590982994221 Comments from the Wiki <http://opencv.willowgarage.com/wiki/documentation/py/imgproc/Moments>`__
+


 .. function:: Moments(arr, binary = 0) -> moments
@@ -1434,7 +1434,7 @@ The function calculates spatial and central moments up to the third order and wr
 PointPolygonTest
 ----------------

-`id=0.315610322671 Comments from the Wiki <http://opencv.willowgarage.com/wiki/documentation/py/imgproc/PointPolygonTest>`__
+


 .. function:: PointPolygonTest(contour,pt,measure_dist)-> double
--- a/doc/opencv1/py/objdetect_cascade_classification.rst
+++ b/doc/opencv1/py/objdetect_cascade_classification.rst
@@ -84,7 +84,7 @@ A simple demonstration of face detection, which draws a rectangle around each de
 HaarDetectObjects
 -----------------

-`id=0.467753723618 Comments from the Wiki <http://opencv.willowgarage.com/wiki/documentation/py/objdetect/HaarDetectObjects>`__
+


 .. function:: HaarDetectObjects(image,cascade,storage,scaleFactor=1.1,minNeighbors=3,flags=0,minSize=(0,0))-> detected_objects
--- a/doc/opencv1/py/py_index.rst
+++ b/doc/opencv1/py/py_index.rst
@@ -1,6 +1,6 @@
-################
-Python Reference
-################
+###############################
+OpenCV 1.x Python API Reference
+###############################

 .. highlight:: python

--- a/doc/opencv1/py/video_motion_analysis_and_object_tracking.rst
+++ b/doc/opencv1/py/video_motion_analysis_and_object_tracking.rst
@@ -12,7 +12,7 @@ Motion Analysis and Object Tracking
 CalcGlobalOrientation
 ---------------------

-`id=0.671861796406 Comments from the Wiki <http://opencv.willowgarage.com/wiki/documentation/py/video/CalcGlobalOrientation>`__
+


 .. function:: CalcGlobalOrientation(orientation,mask,mhi,timestamp,duration)-> float
@@ -67,7 +67,7 @@ a circular sum of the basic orientation and the shift.
 CalcMotionGradient
 ------------------

-`id=0.734160644258 Comments from the Wiki <http://opencv.willowgarage.com/wiki/documentation/py/video/CalcMotionGradient>`__
+


 .. function:: CalcMotionGradient(mhi,mask,orientation,delta1,delta2,apertureSize=3)-> None
@@ -161,7 +161,7 @@ neighborhood and assumes the gradient is valid only if
 CalcOpticalFlowBM
 -----------------

-`id=0.167052327583 Comments from the Wiki <http://opencv.willowgarage.com/wiki/documentation/py/video/CalcOpticalFlowBM>`__
+


 .. function:: CalcOpticalFlowBM(prev,curr,blockSize,shiftSize,max_range,usePrevious,velx,vely)-> None
@@ -241,7 +241,7 @@ function call (if
 CalcOpticalFlowHS
 -----------------

-`id=0.932788904949 Comments from the Wiki <http://opencv.willowgarage.com/wiki/documentation/py/video/CalcOpticalFlowHS>`__
+


 .. function:: CalcOpticalFlowHS(prev,curr,usePrevious,velx,vely,lambda,criteria)-> None
@@ -301,7 +301,7 @@ Horn81
 CalcOpticalFlowLK
 -----------------

-`id=0.849649850841 Comments from the Wiki <http://opencv.willowgarage.com/wiki/documentation/py/video/CalcOpticalFlowLK>`__
+


 .. function:: CalcOpticalFlowLK(prev,curr,winSize,velx,vely)-> None
@@ -351,7 +351,7 @@ Lucas81
 CalcOpticalFlowPyrLK
 --------------------

-`id=0.333066207955 Comments from the Wiki <http://opencv.willowgarage.com/wiki/documentation/py/video/CalcOpticalFlowPyrLK>`__
+


 .. function:: CalcOpticalFlowPyrLK(  prev, curr, prevPyr, currPyr, prevFeatures, winSize, level, criteria, flags, guesses = None) -> (currFeatures, status, track_error)
@@ -470,7 +470,7 @@ is set).
 CamShift
 --------

-`id=0.228709757227 Comments from the Wiki <http://opencv.willowgarage.com/wiki/documentation/py/video/CamShift>`__
+


 .. function:: CamShift(prob_image,window,criteria)-> (int, comp, box)
@@ -529,7 +529,7 @@ class declared in cv.hpp implements the color object tracker that uses the funct
 CvKalman
 --------

-`id=0.911390647458 Comments from the Wiki <http://opencv.willowgarage.com/wiki/documentation/py/video/CvKalman>`__
+

 .. class:: CvKalman

@@ -712,7 +712,7 @@ structure is allocated via
 CreateKalman
 ------------

-`id=0.636220879554 Comments from the Wiki <http://opencv.willowgarage.com/wiki/documentation/py/video/CreateKalman>`__
+


 .. function:: CreateKalman(dynam_params, measure_params, control_params=0) -> CvKalman
@@ -753,7 +753,7 @@ and all its matrices and initializes them somehow.
 KalmanCorrect
 -------------

-`id=0.175175296579 Comments from the Wiki <http://opencv.willowgarage.com/wiki/documentation/py/video/KalmanCorrect>`__
+


 .. function:: KalmanCorrect(kalman, measurement) -> cvmat
@@ -808,7 +808,7 @@ and returns it on output.
 KalmanPredict
 -------------

-`id=0.930945319496 Comments from the Wiki <http://opencv.willowgarage.com/wiki/documentation/py/video/KalmanPredict>`__
+


 .. function:: KalmanPredict(kalman, control=None) -> cvmat
@@ -880,7 +880,7 @@ Synonym for
 MeanShift
 ---------

-`id=0.555115149553 Comments from the Wiki <http://opencv.willowgarage.com/wiki/documentation/py/video/MeanShift>`__
+


 .. function:: MeanShift(prob_image,window,criteria)-> comp
@@ -927,7 +927,7 @@ of iterations. The function returns the number of iterations made.
 SegmentMotion
 -------------

-`id=0.698315173881 Comments from the Wiki <http://opencv.willowgarage.com/wiki/documentation/py/video/SegmentMotion>`__
+


 .. function:: SegmentMotion(mhi,seg_mask,storage,timestamp,seg_thresh)-> None
@@ -987,7 +987,7 @@ component
 SnakeImage
 ----------

-`id=0.218492276516 Comments from the Wiki <http://opencv.willowgarage.com/wiki/documentation/py/video/SnakeImage>`__
+


 .. function:: SnakeImage(image,points,alpha,beta,gamma,win,criteria,calc_gradient=1)-> new_points
@@ -1070,7 +1070,7 @@ The function returns the updated list of points.
 UpdateMotionHistory
 -------------------

-`id=0.316306086975 Comments from the Wiki <http://opencv.willowgarage.com/wiki/documentation/py/video/UpdateMotionHistory>`__
+


 .. function:: UpdateMotionHistory(silhouette,mhi,timestamp,duration)-> None