Merge pull request #15442 from alalek:fix_15293

This commit is contained in:
Alexander Alekhin 2019-09-03 12:05:57 +00:00
commit 61cc855564

View File

@ -227,11 +227,11 @@ TEST(OwnMatConversion, WithND)
{ {
data[i] = static_cast<uint8_t>(i); data[i] = static_cast<uint8_t>(i);
} }
cv::Mat cvMat(dims, CV_32S, data.data()); cv::Mat cvMat(dims, CV_8U, data.data());
auto ownMat = to_own(cvMat); auto ownMat = to_own(cvMat);
auto cvMatFromOwn = cv::gapi::own::to_ocv(ownMat); auto cvMatFromOwn = cv::gapi::own::to_ocv(ownMat);
EXPECT_EQ(0, cv::countNonZero(cvMat != cvMatFromOwn)) EXPECT_EQ(0, cv::norm(cvMat, cvMatFromOwn, NORM_INF))
<< cvMat << std::endl << cvMat << std::endl
<< (cvMat != cvMatFromOwn); << (cvMat != cvMatFromOwn);
} }