potok/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2026-07-30 07:43:03 +04:00
Code Packages Releases Wiki Activity

Merge pull request #13664 from smirnov-alexey:gapi_add_descrof_overloading

Browse Source 
* Add version of descr_of function taking vector of Mat

* Overload descr_of function for cv::Mat

* Add template function instead of copypasting and change tests a little
This commit is contained in:
Alexey Smirnov
2019-01-22 13:14:33 +03:00
committed by Alexander Alekhin
parent e5917a8fa5
commit 5728679fd5
3 changed files with 67 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/gapi/include/opencv2/gapi/gmat.hpp
+3
View File
@@ -133,6 +133,8 @@ static inline GMatDesc empty_gmat_desc() { return GMatDesc{-1,-1,{-1,-1}}; }
class Mat;
GAPI_EXPORTS GMatDesc descr_of(const cv::Mat &mat);
GAPI_EXPORTS GMatDesc descr_of(const cv::UMat &mat);
GAPI_EXPORTS std::vector<GMatDesc> descr_of(const std::vector<cv::Mat> &vec);
GAPI_EXPORTS std::vector<GMatDesc> descr_of(const std::vector<cv::UMat> &vec);
#endif // !defined(GAPI_STANDALONE)
/** @} */
@@ -140,6 +142,7 @@ GAPI_EXPORTS GMatDesc descr_of(const cv::UMat &mat);
namespace gapi { namespace own {
class Mat;
GAPI_EXPORTS GMatDesc descr_of(const Mat &mat);
GAPI_EXPORTS std::vector<GMatDesc> descr_of(const std::vector<Mat> &vec);
}}//gapi::own
std::ostream& operator<<(std::ostream& os, const cv::GMatDesc &desc);