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
e7bb0ece
Commit
e7bb0ece
authored
Jul 18, 2019
by
Alexander Alekhin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
gapi: fix build with unique_ptr
avoid generation of copy ctors with unique_ptr members
parent
f6ec0cd8
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
3 deletions
+8
-3
gfluidbackend.cpp
modules/gapi/src/backends/fluid/gfluidbackend.cpp
+3
-2
gfluidbackend.hpp
modules/gapi/src/backends/fluid/gfluidbackend.hpp
+5
-1
No files found.
modules/gapi/src/backends/fluid/gfluidbackend.cpp
View file @
e7bb0ece
...
...
@@ -1328,7 +1328,7 @@ cv::gimpl::GParallelFluidExecutable::GParallelFluidExecutable(const ade::Graph
const
std
::
vector
<
GFluidOutputRois
>
&
parallelOutputRois
)
{
for
(
auto
&&
rois
:
parallelOutputRois
){
tiles
.
emplace_back
(
g
,
graph_data
,
rois
.
rois
);
tiles
.
emplace_back
(
new
GFluidExecutable
(
g
,
graph_data
,
rois
.
rois
)
);
}
}
...
...
@@ -1343,7 +1343,8 @@ void cv::gimpl::GParallelFluidExecutable::run(std::vector<InObj> &&input_objs,
std
::
vector
<
OutObj
>
&&
output_objs
)
{
for
(
auto
&
tile
:
tiles
){
tile
.
run
(
input_objs
,
output_objs
);
GAPI_Assert
((
bool
)
tile
);
tile
->
run
(
input_objs
,
output_objs
);
}
}
...
...
modules/gapi/src/backends/fluid/gfluidbackend.hpp
View file @
e7bb0ece
...
...
@@ -118,6 +118,8 @@ FluidGraphInputData fluidExtractInputDataFromGraph(const ade::Graph &m_g, const
class
GFluidExecutable
final
:
public
GIslandExecutable
{
GFluidExecutable
(
const
GFluidExecutable
&
)
=
delete
;
// due std::unique_ptr in members list
const
ade
::
Graph
&
m_g
;
GModel
::
ConstGraph
m_gm
;
...
...
@@ -161,7 +163,9 @@ public:
class
GParallelFluidExecutable
final
:
public
GIslandExecutable
{
std
::
vector
<
GFluidExecutable
>
tiles
;
GParallelFluidExecutable
(
const
GParallelFluidExecutable
&
)
=
delete
;
// due std::unique_ptr in members list
std
::
vector
<
std
::
unique_ptr
<
GFluidExecutable
>>
tiles
;
public
:
GParallelFluidExecutable
(
const
ade
::
Graph
&
g
,
const
FluidGraphInputData
&
graph_data
,
...
...
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