From 0fd1203b3b3863f524afe9adb99b3d074c4b3519 Mon Sep 17 00:00:00 2001
From: Nisarg Thakkar <nisargtha@gmail.com>
Date: Tue, 21 Apr 2015 10:37:50 +0530
Subject: [PATCH] Fixed Doc Errors Bug#4282
---
modules/videoio/include/opencv2/videoio.hpp | 76 ++++++++++-----------
1 file changed, 38 insertions(+), 38 deletions(-)
diff --git a/modules/videoio/include/opencv2/videoio.hpp b/modules/videoio/include/opencv2/videoio.hpp
index ae958bcee8..d1d3d73806 100644
--- a/modules/videoio/include/opencv2/videoio.hpp
+++ b/modules/videoio/include/opencv2/videoio.hpp
@@ -528,27 +528,27 @@ public:
/** @brief Sets a property in the VideoCapture.
@param propId Property identifier. It can be one of the following:
- - **CV_CAP_PROP_POS_MSEC** Current position of the video file in milliseconds.
- - **CV_CAP_PROP_POS_FRAMES** 0-based index of the frame to be decoded/captured next.
- - **CV_CAP_PROP_POS_AVI_RATIO** Relative position of the video file: 0 - start of the
+ - **CAP_PROP_POS_MSEC** Current position of the video file in milliseconds.
+ - **CAP_PROP_POS_FRAMES** 0-based index of the frame to be decoded/captured next.
+ - **CAP_PROP_POS_AVI_RATIO** Relative position of the video file: 0 - start of the
film, 1 - end of the film.
- - **CV_CAP_PROP_FRAME_WIDTH** Width of the frames in the video stream.
- - **CV_CAP_PROP_FRAME_HEIGHT** Height of the frames in the video stream.
- - **CV_CAP_PROP_FPS** Frame rate.
- - **CV_CAP_PROP_FOURCC** 4-character code of codec.
- - **CV_CAP_PROP_FRAME_COUNT** Number of frames in the video file.
- - **CV_CAP_PROP_FORMAT** Format of the Mat objects returned by retrieve() .
- - **CV_CAP_PROP_MODE** Backend-specific value indicating the current capture mode.
- - **CV_CAP_PROP_BRIGHTNESS** Brightness of the image (only for cameras).
- - **CV_CAP_PROP_CONTRAST** Contrast of the image (only for cameras).
- - **CV_CAP_PROP_SATURATION** Saturation of the image (only for cameras).
- - **CV_CAP_PROP_HUE** Hue of the image (only for cameras).
- - **CV_CAP_PROP_GAIN** Gain of the image (only for cameras).
- - **CV_CAP_PROP_EXPOSURE** Exposure (only for cameras).
- - **CV_CAP_PROP_CONVERT_RGB** Boolean flags indicating whether images should be converted
+ - **CAP_PROP_FRAME_WIDTH** Width of the frames in the video stream.
+ - **CAP_PROP_FRAME_HEIGHT** Height of the frames in the video stream.
+ - **CAP_PROP_FPS** Frame rate.
+ - **CAP_PROP_FOURCC** 4-character code of codec.
+ - **CAP_PROP_FRAME_COUNT** Number of frames in the video file.
+ - **CAP_PROP_FORMAT** Format of the Mat objects returned by retrieve() .
+ - **CAP_PROP_MODE** Backend-specific value indicating the current capture mode.
+ - **CAP_PROP_BRIGHTNESS** Brightness of the image (only for cameras).
+ - **CAP_PROP_CONTRAST** Contrast of the image (only for cameras).
+ - **CAP_PROP_SATURATION** Saturation of the image (only for cameras).
+ - **CAP_PROP_HUE** Hue of the image (only for cameras).
+ - **CAP_PROP_GAIN** Gain of the image (only for cameras).
+ - **CAP_PROP_EXPOSURE** Exposure (only for cameras).
+ - **CAP_PROP_CONVERT_RGB** Boolean flags indicating whether images should be converted
to RGB.
- - **CV_CAP_PROP_WHITE_BALANCE** Currently unsupported
- - **CV_CAP_PROP_RECTIFICATION** Rectification flag for stereo cameras (note: only supported
+ - **CAP_PROP_WHITE_BALANCE** Currently unsupported
+ - **CAP_PROP_RECTIFICATION** Rectification flag for stereo cameras (note: only supported
by DC1394 v 2.x backend currently)
@param value Value of the property.
*/
@@ -557,28 +557,28 @@ public:
/** @brief Returns the specified VideoCapture property
@param propId Property identifier. It can be one of the following:
- - **CV_CAP_PROP_POS_MSEC** Current position of the video file in milliseconds or video
+ - **CAP_PROP_POS_MSEC** Current position of the video file in milliseconds or video
capture timestamp.
- - **CV_CAP_PROP_POS_FRAMES** 0-based index of the frame to be decoded/captured next.
- - **CV_CAP_PROP_POS_AVI_RATIO** Relative position of the video file: 0 - start of the
+ - **CAP_PROP_POS_FRAMES** 0-based index of the frame to be decoded/captured next.
+ - **CAP_PROP_POS_AVI_RATIO** Relative position of the video file: 0 - start of the
film, 1 - end of the film.
- - **CV_CAP_PROP_FRAME_WIDTH** Width of the frames in the video stream.
- - **CV_CAP_PROP_FRAME_HEIGHT** Height of the frames in the video stream.
- - **CV_CAP_PROP_FPS** Frame rate.
- - **CV_CAP_PROP_FOURCC** 4-character code of codec.
- - **CV_CAP_PROP_FRAME_COUNT** Number of frames in the video file.
- - **CV_CAP_PROP_FORMAT** Format of the Mat objects returned by retrieve() .
- - **CV_CAP_PROP_MODE** Backend-specific value indicating the current capture mode.
- - **CV_CAP_PROP_BRIGHTNESS** Brightness of the image (only for cameras).
- - **CV_CAP_PROP_CONTRAST** Contrast of the image (only for cameras).
- - **CV_CAP_PROP_SATURATION** Saturation of the image (only for cameras).
- - **CV_CAP_PROP_HUE** Hue of the image (only for cameras).
- - **CV_CAP_PROP_GAIN** Gain of the image (only for cameras).
- - **CV_CAP_PROP_EXPOSURE** Exposure (only for cameras).
- - **CV_CAP_PROP_CONVERT_RGB** Boolean flags indicating whether images should be converted
+ - **CAP_PROP_FRAME_WIDTH** Width of the frames in the video stream.
+ - **CAP_PROP_FRAME_HEIGHT** Height of the frames in the video stream.
+ - **CAP_PROP_FPS** Frame rate.
+ - **CAP_PROP_FOURCC** 4-character code of codec.
+ - **CAP_PROP_FRAME_COUNT** Number of frames in the video file.
+ - **CAP_PROP_FORMAT** Format of the Mat objects returned by retrieve() .
+ - **CAP_PROP_MODE** Backend-specific value indicating the current capture mode.
+ - **CAP_PROP_BRIGHTNESS** Brightness of the image (only for cameras).
+ - **CAP_PROP_CONTRAST** Contrast of the image (only for cameras).
+ - **CAP_PROP_SATURATION** Saturation of the image (only for cameras).
+ - **CAP_PROP_HUE** Hue of the image (only for cameras).
+ - **CAP_PROP_GAIN** Gain of the image (only for cameras).
+ - **CAP_PROP_EXPOSURE** Exposure (only for cameras).
+ - **CAP_PROP_CONVERT_RGB** Boolean flags indicating whether images should be converted
to RGB.
- - **CV_CAP_PROP_WHITE_BALANCE** Currently not supported
- - **CV_CAP_PROP_RECTIFICATION** Rectification flag for stereo cameras (note: only supported
+ - **CAP_PROP_WHITE_BALANCE** Currently not supported
+ - **CAP_PROP_RECTIFICATION** Rectification flag for stereo cameras (note: only supported
by DC1394 v 2.x backend currently)
**Note**: When querying a property that is not supported by the backend used by the VideoCapture