From b74804f61f259b94e261c660dfb7592bd1ded3ed Mon Sep 17 00:00:00 2001 From: Dmitry Matveev Date: Tue, 15 Dec 2020 23:16:53 +0300 Subject: [PATCH] G-API: Fix various Doxygen isses for the 4.5.1 release --- modules/gapi/include/opencv2/gapi/core.hpp | 1 + modules/gapi/include/opencv2/gapi/gcommon.hpp | 4 ++-- modules/gapi/include/opencv2/gapi/imgproc.hpp | 2 ++ modules/gapi/include/opencv2/gapi/infer/parsers.hpp | 4 ++-- 4 files changed, 7 insertions(+), 4 deletions(-) diff --git a/modules/gapi/include/opencv2/gapi/core.hpp b/modules/gapi/include/opencv2/gapi/core.hpp index 6fca437d5a..8100044901 100644 --- a/modules/gapi/include/opencv2/gapi/core.hpp +++ b/modules/gapi/include/opencv2/gapi/core.hpp @@ -1153,6 +1153,7 @@ GAPI_EXPORTS GMat bitwise_xor(const GMat& src1, const GScalar& src2); /** @brief Inverts every bit of an array. + The function bitwise_not calculates per-element bit-wise inversion of the input matrix: \f[\texttt{dst} (I) = \neg \texttt{src} (I)\f] diff --git a/modules/gapi/include/opencv2/gapi/gcommon.hpp b/modules/gapi/include/opencv2/gapi/gcommon.hpp index a474140baa..8119e397eb 100644 --- a/modules/gapi/include/opencv2/gapi/gcommon.hpp +++ b/modules/gapi/include/opencv2/gapi/gcommon.hpp @@ -204,12 +204,12 @@ template GCompileArgs compile_args(Ts&&... args) return GCompileArgs{ GCompileArg(args)... }; } +namespace gapi +{ /** * @brief Retrieves particular compilation argument by its type from * cv::GCompileArgs */ -namespace gapi -{ template inline cv::util::optional getCompileArg(const cv::GCompileArgs &args) { diff --git a/modules/gapi/include/opencv2/gapi/imgproc.hpp b/modules/gapi/include/opencv2/gapi/imgproc.hpp index 699f64837a..63617b42ff 100644 --- a/modules/gapi/include/opencv2/gapi/imgproc.hpp +++ b/modules/gapi/include/opencv2/gapi/imgproc.hpp @@ -1344,6 +1344,7 @@ Output image is 8-bit unsigned 3-channel image @ref CV_8UC3. GAPI_EXPORTS GMat BGR2RGB(const GMat& src); /** @brief Converts an image from RGB color space to gray-scaled. + The conventional ranges for R, G, and B channel values are 0 to 255. Resulting gray color value computed as \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 GAPI_EXPORTS GMat RGB2Gray(const GMat& src, float rY, float gY, float bY); /** @brief Converts an image from BGR color space to gray-scaled. + The conventional ranges for B, G, and R channel values are 0 to 255. Resulting gray color value computed as \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] diff --git a/modules/gapi/include/opencv2/gapi/infer/parsers.hpp b/modules/gapi/include/opencv2/gapi/infer/parsers.hpp index 15742c6e55..396d31bb02 100644 --- a/modules/gapi/include/opencv2/gapi/infer/parsers.hpp +++ b/modules/gapi/include/opencv2/gapi/infer/parsers.hpp @@ -108,8 +108,8 @@ detection is smaller than confidence threshold, detection is rejected. relative box intersection area required for rejecting the box with a smaller confidence. If 1.f, nms is not performed and no boxes are rejected. @param anchors Anchors Yolo network was trained with. -@note The default anchor values are taken from openvinotoolkit docs: -https://docs.openvinotoolkit.org/latest/omz_models_intel_yolo_v2_tiny_vehicle_detection_0001_description_yolo_v2_tiny_vehicle_detection_0001.html#output. +@note The default anchor values are specified for YOLO v2 Tiny as described in Intel Open Model Zoo +documentation. @return a tuple with a vector of detected boxes and a vector of appropriate labels. */ GAPI_EXPORTS std::tuple, GArray> parseYolo(const GMat& in,