mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2025-07-26 07:07:37 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

gapi: fix build with unique_ptr

Browse Source 
avoid generation of copy ctors with unique_ptr members
This commit is contained in:
Alexander Alekhin 2019-07-18 14:06:45 +03:00
parent f6ec0cd827
commit e7bb0ecee0
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
modules/gapi/src/backends/fluid/gfluidbackend.cpp
View File

@ -1328,7 +1328,7 @@ cv::gimpl::GParallelFluidExecutable::GParallelFluidExecutable(const ade::Graph
const std::vector<GFluidOutputRois> &parallelOutputRois) const std::vector<GFluidOutputRois> &parallelOutputRois)
{ {
for (auto&& rois : 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) std::vector<OutObj> &&output_objs)
{ {
for (auto& tile : tiles ){ for (auto& tile : tiles ){
tile.run(input_objs, output_objs); GAPI_Assert((bool)tile);
tile->run(input_objs, output_objs);
} }
} }

6
modules/gapi/src/backends/fluid/gfluidbackend.hpp
View File

@ -118,6 +118,8 @@ FluidGraphInputData fluidExtractInputDataFromGraph(const ade::Graph &m_g, const
class GFluidExecutable final: public GIslandExecutable class GFluidExecutable final: public GIslandExecutable
{ {
GFluidExecutable(const GFluidExecutable&) = delete; // due std::unique_ptr in members list
const ade::Graph &m_g; const ade::Graph &m_g;
GModel::ConstGraph m_gm; GModel::ConstGraph m_gm;
@ -161,7 +163,9 @@ public:
class GParallelFluidExecutable final: public GIslandExecutable { 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: public:
GParallelFluidExecutable(const ade::Graph &g, GParallelFluidExecutable(const ade::Graph &g,
const FluidGraphInputData &graph_data, const FluidGraphInputData &graph_data,