third_party/opencv
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update documentation

Browse Source
This commit is contained in:
Andrey Kamaev
2013-04-08 13:21:19 +04:00
parent ae4e76395f
commit befd696720
5 changed files with 25 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/highgui/doc/qt_new_functions.rst
+3 -3
View File
@@ -123,7 +123,7 @@ fontQt
----------
Creates the font to draw a text on an image.
.. ocv:function:: CvFont fontQt(const String& nameFont, int pointSize = -1, Scalar color = Scalar::all(0), int weight = CV_FONT_NORMAL, int style = CV_STYLE_NORMAL, int spacing = 0)
.. ocv:function:: QtFont fontQt( const String& nameFont, int pointSize=-1, Scalar color=Scalar::all(0), int weight=QT_FONT_NORMAL, int style=QT_STYLE_NORMAL, int spacing=0 )
.. ocv:cfunction:: CvFont cvFontQt(const char* nameFont, int pointSize=-1, CvScalar color=cvScalarAll(0), int weight=CV_FONT_NORMAL, int style=CV_STYLE_NORMAL, int spacing=0)
@@ -169,7 +169,7 @@ addText
-----------
Creates the font to draw a text on an image.
.. ocv:function:: void addText( const Mat& img, const String& text, Point org, CvFont font )
.. ocv:function:: void addText( const Mat& img, const String& text, Point org, const QtFont& font )
.. ocv:cfunction:: void cvAddText( const CvArr* img, const char* text, CvPoint org, CvFont * arg2 )
@@ -302,7 +302,7 @@ createButton
----------------
Attaches a button to the control panel.
.. ocv:function:: int createButton( const String& bar_name, ButtonCallback on_change, void* userdata=NULL, int type=CV_PUSH_BUTTON, bool initial_button_state=0 )
.. ocv:function:: int createButton( const String& bar_name, ButtonCallback on_change, void* userdata=0, int type=QT_PUSH_BUTTON, bool initial_button_state=false )
.. ocv:cfunction:: int cvCreateButton( const char* button_name=NULL, CvButtonCallback on_change=NULL, void* userdata=NULL, int button_type=CV_PUSH_BUTTON, int initial_button_state=0 )
modules/highgui/doc/reading_and_writing_images_and_video.rst
+3 -3
View File
@@ -59,7 +59,7 @@ imread
------
Loads an image from a file.
.. ocv:function:: Mat imread( const String& filename, int flags=1 )
.. ocv:function:: Mat imread( const String& filename, int flags=IMREAD_COLOR )
.. ocv:pyfunction:: cv2.imread(filename[, flags]) -> retval
@@ -321,9 +321,9 @@ VideoCapture::retrieve
----------------------
Decodes and returns the grabbed video frame.
.. ocv:function:: bool VideoCapture::retrieve(Mat& image, int channel=0)
.. ocv:function:: bool VideoCapture::retrieve( Mat& image, int flag=0 )
.. ocv:pyfunction:: cv2.VideoCapture.retrieve([image[, channel]]) -> retval, image
.. ocv:pyfunction:: cv2.VideoCapture.retrieve([image[, flag]]) -> retval, image
.. ocv:cfunction:: IplImage* cvRetrieveFrame( CvCapture* capture, int streamIdx=0 )