mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2024-12-11 14:39:11 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #3948 from PhilLab:markdownPatch

Browse Source
This commit is contained in:
Vadim Pisarevsky 2015-04-22 11:02:50 +00:00
commit bac4999ae4
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
doc/tutorials/introduction/biicode/tutorial_biicode.markdown
View File

@ -41,7 +41,7 @@ Windows users also execute:
$ bii cpp:configure -G "Visual Studio 12" $ bii cpp:configure -G "Visual Studio 12"
@endcode @endcode
Now execute ``bii cpp:build`` to build the project. **Note** that this can take a while, until it downloads and builds OpenCV. However, this is downloaded just once in your machine in your "user/.biicode" folder. If the OpenCV installation process fails, you might simply go there, delete OpenCV files inside "user/.biicode" and repeat. Now execute ``bii cpp:build`` to build the project. @note This can take a while, until it downloads and builds OpenCV. However, this is downloaded just once in your machine to your "user/.biicode" folder. If the OpenCV installation process fails, you might simply go there, delete OpenCV files inside "user/.biicode" and repeat.
@code{.bash} @code{.bash}
$ bii cpp:build $ bii cpp:build
@ -137,7 +137,7 @@ replace with:
diego/opencv(beta): 0 diego/opencv(beta): 0
@endcode @endcode
**Note** that the first time you switch to 3.0-beta, it will also take a while to download and build the 3.0-beta release. From that point you can change back and forth between versions, just modifying your *biicode.conf requirements*. @note The first time you switch to 3.0-beta, it will also take a while to download and build the 3.0-beta release. From that point on you can change back and forth between versions just by modifying your *biicode.conf requirements*.
Find the hooks and examples: Find the hooks and examples:
* [OpenCV 2.4.10](http://www.biicode.com/diego/opencv) * [OpenCV 2.4.10](http://www.biicode.com/diego/opencv)

4
modules/videoio/include/opencv2/videoio.hpp
View File

@ -581,7 +581,7 @@ public:
- **CAP_PROP_RECTIFICATION** Rectification flag for stereo cameras (note: only supported - **CAP_PROP_RECTIFICATION** Rectification flag for stereo cameras (note: only supported
by DC1394 v 2.x backend currently) by DC1394 v 2.x backend currently)
**Note**: When querying a property that is not supported by the backend used by the VideoCapture @note When querying a property that is not supported by the backend used by the VideoCapture
class, value 0 is returned. class, value 0 is returned.
*/ */
CV_WRAP virtual double get(int propId) const; CV_WRAP virtual double get(int propId) const;
@ -659,7 +659,7 @@ public:
- **VIDEOWRITER_PROP_QUALITY** Current quality of the encoded videostream. - **VIDEOWRITER_PROP_QUALITY** Current quality of the encoded videostream.
- **VIDEOWRITER_PROP_FRAMEBYTES** (Read-only) Size of just encoded video frame; note that the encoding order may be different from representation order. - **VIDEOWRITER_PROP_FRAMEBYTES** (Read-only) Size of just encoded video frame; note that the encoding order may be different from representation order.
**Note**: When querying a property that is not supported by the backend used by the VideoWriter @note When querying a property that is not supported by the backend used by the VideoWriter
class, value 0 is returned. class, value 0 is returned.
*/ */
CV_WRAP virtual double get(int propId) const; CV_WRAP virtual double get(int propId) const;