third_party/opencv
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #15190 from andrey-golubev:fluid_invalid_roi

Browse Source 
G-API: verify y offset and height of Fluid output ROIs (#15190)

* G-API: validate GFluidOutputRoi y and height

* Rearrange tested ROIs
This commit is contained in:
Andrey Golubev
2019-08-01 19:30:05 +03:00
committed by Alexander Alekhin
parent 304e3ac12f
commit fc85f3644d
2 changed files with 45 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/gapi/src/backends/fluid/gfluidbackend.cpp
+8 -4
View File
@@ -565,16 +565,20 @@ void cv::gimpl::GFluidExecutable::initBufferRois(std::vector<int>& readStarts,
auto id = m_id_map.at(d.rc);
readStarts[id] = 0;
if (out_rois[idx] == gapi::own::Rect{})
const auto& out_roi = out_rois[idx];
if (out_roi == gapi::own::Rect{})
{
rois[id] = gapi::own::Rect{ 0, 0, desc.size.width, desc.size.height };
}
else
{
GAPI_Assert(out_roi.height > 0);
GAPI_Assert(out_roi.y + out_roi.height <= desc.size.height);
// Only slices are supported at the moment
GAPI_Assert(out_rois[idx].x == 0);
GAPI_Assert(out_rois[idx].width == desc.size.width);
rois[id] = out_rois[idx];
GAPI_Assert(out_roi.x == 0);
GAPI_Assert(out_roi.width == desc.size.width);
rois[id] = out_roi;
}
nodesToVisit.push(nh);