Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
O
opencv
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Packages
Packages
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
submodule
opencv
Commits
c8a89134
Commit
c8a89134
authored
Jan 16, 2019
by
Andrey Golubev
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
GAPI: fix GCall misuse in unrollExpr
parent
7e2ebecd
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
2 deletions
+7
-2
gcall.cpp
modules/gapi/src/api/gcall.cpp
+6
-1
gmodelbuilder.cpp
modules/gapi/src/compiler/gmodelbuilder.cpp
+1
-1
No files found.
modules/gapi/src/api/gcall.cpp
View file @
c8a89134
...
...
@@ -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
)
...
...
modules/gapi/src/compiler/gmodelbuilder.cpp
View file @
c8a89134
...
...
@@ -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
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment