potok/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2026-07-30 07:43:03 +04:00
Code Packages Releases Wiki Activity

Merge pull request #10591 from drkoller:master

Browse Source
This commit is contained in:
Alexander Alekhin
2018-01-19 09:44:21 +00:00
parent 8226bd25c4 d1a3b530be
commit c3569211d5
2 changed files with 87 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/dnn/src/layers/crop_layer.cpp
+4 -18
View File
@@ -110,26 +110,12 @@ public:
}
crop_ranges.resize(dims, Range::all());
for (int i = 0; i < dims; i++)
for (int i = start_axis; i < dims; i++)
{
if( i < start_axis )
continue;
if (offset_final[i] < 0 || offset_final[i] + inpSzBlob.size[i] > inpBlob.size[i])
CV_Error(Error::StsBadArg, "invalid crop parameters or blob sizes");
if (!offset.empty()) //normal case
{
if (offset_final[i] < 0 || offset_final[i] + inpSzBlob.size[i] > inpBlob.size[i])
CV_Error(Error::StsBadArg, "invalid crop parameters");
crop_ranges[i] = Range(offset_final[i], offset_final[i] + inpSzBlob.size[i]);
}
else //detect offset automatically so that cropped image is center of original one
{
if (inpSzBlob.size[i] > inpBlob.size[i])
CV_Error(Error::StsBadArg, "invalid output blob size");
int cur_crop = (inpBlob.size[i] - inpSzBlob.size[i]) / 2;
crop_ranges[i] = Range(cur_crop, cur_crop + inpSzBlob.size[i]);
}
crop_ranges[i] = Range(offset_final[i], offset_final[i] + inpSzBlob.size[i]);
}
}