Fixed documentation errors.

pull/1230/head
Roman Donchenko 12 years ago
parent 2f780ed994
commit 8bed7bb5f9
  1. 2
      modules/calib3d/doc/camera_calibration_and_3d_reconstruction.rst
  2. 6
      modules/core/doc/opengl_interop.rst
  3. 4
      modules/highgui/doc/user_interface.rst

@ -1214,7 +1214,7 @@ The class implements the modified H. Hirschmuller algorithm [HH08]_ that differs
* Mutual information cost function is not implemented. Instead, a simpler Birchfield-Tomasi sub-pixel metric from [BT98]_ is used. Though, the color images are supported as well.
* Some pre- and post- processing steps from K. Konolige algorithm :ocv:funcx:`StereoBM::operator()` are included, for example: pre-filtering (``CV_STEREO_BM_XSOBEL`` type) and post-filtering (uniqueness check, quadratic interpolation and speckle filtering).
* Some pre- and post- processing steps from K. Konolige algorithm ``StereoBM`` are included, for example: pre-filtering (``StereoBM::PREFILTER_XSOBEL`` type) and post-filtering (uniqueness check, quadratic interpolation and speckle filtering).
.. Sample code::

@ -158,14 +158,10 @@ ogl::Buffer::copyTo
-------------------
Copies from OpenGL buffer to host/device memory or another OpenGL buffer object.
.. ocv:function:: void ogl::Buffer::copyTo(OutputArray arr, Target target = ARRAY_BUFFER, bool autoRelease = false) const
.. ocv:function:: void ogl::Buffer::copyTo(OutputArray arr) const
:param arr: Destination array (host or device memory, can be :ocv:class:`Mat` , :ocv:class:`gpu::GpuMat` , ``std::vector`` or ``ogl::Buffer`` ).
:param target: Buffer usage for destination buffer (if ``arr`` is OpenGL buffer).
:param autoRelease: Auto release mode for destination buffer (if ``arr`` is OpenGL buffer).
ogl::Buffer::clone

@ -266,7 +266,7 @@ setOpenGlContext
----------------
Sets the specified window as current OpenGL context.
.. ocv:function:: void setOpenGlContext(const string& winname)
.. ocv:function:: void setOpenGlContext(const String& winname)
:param winname: Window name
@ -274,6 +274,6 @@ updateWindow
------------
Force window to redraw its context and call draw callback ( :ocv:func:`setOpenGlDrawCallback` ).
.. ocv:function:: void updateWindow(const string& winname)
.. ocv:function:: void updateWindow(const String& winname)
:param winname: Window name

Loading…
Cancel
Save