mirror of
https://github.com/opencv/opencv.git
synced 2026-11-21 00:35:35 -06:00
Merge pull request #16995 from mpashchenkov:mp/ocv-gapi-standalone-mat
G-API: Mat's "deownification" * deowned Mat * boner * Removed canDescribe test for own::Mat * Removed STANDALONE flag for apply() and operator() * Removed: desc_tests for own::Mat, descr_of for own::Mat. * Returned: tests, cv::gapi::own::descr_of; fixed alignment; Removed own::Mat's headers * Removed unused header own/mat.hpp from gbackend.hpp
This commit is contained in:
committed by
GitHub
parent
f19d0ae41d
commit
94e36d8c8d
@@ -100,7 +100,7 @@ void cv::gimpl::GExecutor::initResource(const ade::NodeHandle &orig_nh)
|
||||
case GShape::GMAT:
|
||||
{
|
||||
const auto desc = util::get<cv::GMatDesc>(d.meta);
|
||||
auto& mat = m_res.slot<cv::gapi::own::Mat>()[d.rc];
|
||||
auto& mat = m_res.slot<cv::Mat>()[d.rc];
|
||||
createMat(desc, mat);
|
||||
}
|
||||
break;
|
||||
@@ -182,7 +182,7 @@ void cv::gimpl::GExecutor::run(cv::gimpl::GRuntimeArgs &&args)
|
||||
|
||||
auto check_own_mat = [&desc, &args, &index]()
|
||||
{
|
||||
auto& out_mat = *get<cv::gapi::own::Mat*>(args.outObjs.at(index));
|
||||
auto& out_mat = *get<cv::Mat*>(args.outObjs.at(index));
|
||||
GAPI_Assert(out_mat.data != nullptr &&
|
||||
desc.canDescribe(out_mat));
|
||||
};
|
||||
|
||||
Reference in New Issue
Block a user