Skip to content

Commit 7d7ab46

Browse files
committed
Merge pull request opencv#19130 from dmatveev:dm/fix_docs_ocv451
2 parents c4c21c2 + b74804f commit 7d7ab46

File tree

4 files changed

+7
-4
lines changed

4 files changed

+7
-4
lines changed

modules/gapi/include/opencv2/gapi/core.hpp

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1148,6 +1148,7 @@ GAPI_EXPORTS GMat bitwise_xor(const GMat& src1, const GScalar& src2);
11481148

11491149

11501150
/** @brief Inverts every bit of an array.
1151+
11511152
The function bitwise_not calculates per-element bit-wise inversion of the input
11521153
matrix:
11531154
\f[\texttt{dst} (I) = \neg \texttt{src} (I)\f]

modules/gapi/include/opencv2/gapi/gcommon.hpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -204,12 +204,12 @@ template<typename... Ts> GCompileArgs compile_args(Ts&&... args)
204204
return GCompileArgs{ GCompileArg(args)... };
205205
}
206206

207+
namespace gapi
208+
{
207209
/**
208210
* @brief Retrieves particular compilation argument by its type from
209211
* cv::GCompileArgs
210212
*/
211-
namespace gapi
212-
{
213213
template<typename T>
214214
inline cv::util::optional<T> getCompileArg(const cv::GCompileArgs &args)
215215
{

modules/gapi/include/opencv2/gapi/imgproc.hpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1344,6 +1344,7 @@ Output image is 8-bit unsigned 3-channel image @ref CV_8UC3.
13441344
GAPI_EXPORTS GMat BGR2RGB(const GMat& src);
13451345

13461346
/** @brief Converts an image from RGB color space to gray-scaled.
1347+
13471348
The conventional ranges for R, G, and B channel values are 0 to 255.
13481349
Resulting gray color value computed as
13491350
\f[\texttt{dst} (I)= \texttt{0.299} * \texttt{src}(I).R + \texttt{0.587} * \texttt{src}(I).G + \texttt{0.114} * \texttt{src}(I).B \f]
@@ -1370,6 +1371,7 @@ Resulting gray color value computed as
13701371
GAPI_EXPORTS GMat RGB2Gray(const GMat& src, float rY, float gY, float bY);
13711372

13721373
/** @brief Converts an image from BGR color space to gray-scaled.
1374+
13731375
The conventional ranges for B, G, and R channel values are 0 to 255.
13741376
Resulting gray color value computed as
13751377
\f[\texttt{dst} (I)= \texttt{0.114} * \texttt{src}(I).B + \texttt{0.587} * \texttt{src}(I).G + \texttt{0.299} * \texttt{src}(I).R \f]

modules/gapi/include/opencv2/gapi/infer/parsers.hpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -108,8 +108,8 @@ detection is smaller than confidence threshold, detection is rejected.
108108
relative box intersection area required for rejecting the box with a smaller confidence.
109109
If 1.f, nms is not performed and no boxes are rejected.
110110
@param anchors Anchors Yolo network was trained with.
111-
@note The default anchor values are taken from openvinotoolkit docs:
112-
https://docs.openvinotoolkit.org/latest/omz_models_intel_yolo_v2_tiny_vehicle_detection_0001_description_yolo_v2_tiny_vehicle_detection_0001.html#output.
111+
@note The default anchor values are specified for YOLO v2 Tiny as described in Intel Open Model Zoo
112+
<a href="https://github.com/openvinotoolkit/open_model_zoo/blob/master/models/public/yolo-v2-tiny-tf/yolo-v2-tiny-tf.md">documentation</a>.
113113
@return a tuple with a vector of detected boxes and a vector of appropriate labels.
114114
*/
115115
GAPI_EXPORTS std::tuple<GArray<Rect>, GArray<int>> parseYolo(const GMat& in,

0 commit comments

Comments
 (0)