mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2024-11-29 13:47:32 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #13639 from andrey-golubev:gapi_fix_gcall_misuse

Browse Source
This commit is contained in:
Alexander Alekhin 2019-01-16 17:49:06 +00:00
commit 2ea4626911
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
modules/gapi/src/api/gcall.cpp
View File

@ -28,9 +28,14 @@ cv::GCall::GCall(const cv::GKernel &k)
cv::GCall::~GCall()
{
// FIXME: current behavior of the destructor can cause troubles in a threaded environment. GCall
// is not supposed to be accessed for modification within multiple threads. There should be a
// way to ensure somehow that no problem occurs in future. For now, this is a reminder that
// GCall is not supposed to be copied inside a code block that is executed in parallel.
// When a GCall object is destroyed (and GCall::Priv is likely still alive,
// as there might be other references), reset m_node to break cycle.
m_priv->m_node = GNode();
m_priv->m_node = GNode();
}
void cv::GCall::setArgs(std::vector<GArg> &&args)

2
modules/gapi/src/compiler/gmodelbuilder.cpp
View File

@ -128,7 +128,7 @@ cv::gimpl::Unrolled cv::gimpl::unrollExpr(const GProtoArgs &ins,
// then add its operands to stack to continue recursion.
ops.visit(&node.priv(), node);
const cv::GCall call = origin.node.call();
const cv::GCall& call = origin.node.call();
const cv::GCall::Priv& call_p = call.priv();
// Put the outputs object description of the node