third_party/opencv
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #13678 from smirnov-alexey:gapi_fix_descrof_overloading

Browse Source 
* Return vector of MetaArg instead of MatDesc and fix test with ADL check

* Fix construction of vector

* Change names and tests according to review
Also add GAPI_EXPORTS prefix for two ostream operators
This commit is contained in:
Alexey Smirnov
2019-01-28 16:26:32 +03:00
committed by Alexander Alekhin
parent e2dbf054ac
commit a65ccc0603
4 changed files with 38 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/gapi/test/gapi_desc_tests.cpp
+14 -16
View File
@@ -46,19 +46,13 @@ TEST(GAPI_MetaDesc, VecMatDesc)
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);
EXPECT_EQ((GMatDesc{CV_8U, 1, {320, 240}}), get<GMatDesc>(desc1[0]));
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);
EXPECT_EQ((GMatDesc{CV_8U, 3, {640, 480}}), get<GMatDesc>(desc2[0]));
}
TEST(GAPI_MetaDesc, VecOwnMatDesc)
@@ -68,15 +62,19 @@ TEST(GAPI_MetaDesc, VecOwnMatDesc)
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((GMatDesc{CV_8U, 1, {320, 240}}), get<GMatDesc>(desc[0]));
EXPECT_EQ((GMatDesc{CV_8U, 3, {640, 480}}), get<GMatDesc>(desc[1]));
}
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, AdlVecOwnMatDesc)
{
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 = descr_of(vec);
EXPECT_EQ((GMatDesc{CV_8U, 1, {320, 240}}), get<GMatDesc>(desc[0]));
EXPECT_EQ((GMatDesc{CV_8U, 3, {640, 480}}), get<GMatDesc>(desc[1]));
}
TEST(GAPI_MetaDesc, Compare_Equal_MatDesc)