potok/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2026-07-29 23:33:05 +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/test/gapi_desc_tests.cpp
+39
View File
@@ -40,6 +40,45 @@ TEST(GAPI_MetaDesc, MatDesc)
EXPECT_EQ(480, desc2.size.height);
}
TEST(GAPI_MetaDesc, VecMatDesc)
{
std::vector<cv::Mat> vec1 = {
cv::Mat(240, 320, CV_8U)};
const auto desc1 = cv::descr_of(vec1);
EXPECT_EQ(CV_8U, desc1[0].depth);
EXPECT_EQ(1, desc1[0].chan);
EXPECT_EQ(320, desc1[0].size.width);
EXPECT_EQ(240, desc1[0].size.height);
std::vector<cv::UMat> vec2 = {
cv::UMat(480, 640, CV_8UC3)};
const auto desc2 = cv::descr_of(vec2);
EXPECT_EQ(CV_8U, desc2[0].depth);
EXPECT_EQ(3, desc2[0].chan);
EXPECT_EQ(640, desc2[0].size.width);
EXPECT_EQ(480, desc2[0].size.height);
}
TEST(GAPI_MetaDesc, VecOwnMatDesc)
{
std::vector<cv::gapi::own::Mat> vec = {
cv::gapi::own::Mat(240, 320, CV_8U, nullptr),
cv::gapi::own::Mat(480, 640, CV_8UC3, nullptr)};
const auto desc = cv::gapi::own::descr_of(vec);
EXPECT_EQ(CV_8U, desc[0].depth);
EXPECT_EQ(1, desc[0].chan);
EXPECT_EQ(320, desc[0].size.width);
EXPECT_EQ(240, desc[0].size.height);
EXPECT_EQ(CV_8U, desc[1].depth);
EXPECT_EQ(3, desc[1].chan);
EXPECT_EQ(640, desc[1].size.width);
EXPECT_EQ(480, desc[1].size.height);
}
TEST(GAPI_MetaDesc, Compare_Equal_MatDesc)
{
const auto desc1 = cv::GMatDesc{CV_8U, 1, {64, 64}};