mirror/opencv
1
0
Fork 0
mirror of https://github.com/opencv/opencv.git synced 2024-11-26 04:00:30 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #5975 from terfendail:2.4

Browse Source
This commit is contained in:
Alexander Alekhin 2016-01-15 11:45:10 +00:00
commit 5c21ca2697
1 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
modules/imgproc/src/morph.cpp
View File

@ -584,19 +584,11 @@ typedef MorphFVec<VMax32f> DilateVec32f;
#else
#ifdef HAVE_TEGRA_OPTIMIZATION
using tegra::ErodeRowVec8u;
using tegra::DilateRowVec8u;
using tegra::ErodeColumnVec8u;
using tegra::DilateColumnVec8u;
#else
typedef MorphRowNoVec ErodeRowVec8u;
typedef MorphRowNoVec DilateRowVec8u;
typedef MorphColumnNoVec ErodeColumnVec8u;
typedef MorphColumnNoVec DilateColumnVec8u;
#endif
typedef MorphRowNoVec ErodeRowVec16u;
typedef MorphRowNoVec DilateRowVec16u;
@ -1114,6 +1106,17 @@ public:
Mat srcStripe = src.rowRange(row0, row1);
Mat dstStripe = dst.rowRange(row0, row1);
#if defined HAVE_TEGRA_OPTIMIZATION
//Iterative separable filters are converted to single iteration filters
//But anyway check that we really get 1 iteration prior to processing
if( countNonZero(kernel) == kernel.rows*kernel.cols && iterations == 1 &&
src.depth() == CV_8U && ( op == MORPH_ERODE || op == MORPH_DILATE ) &&
tegra::morphology(srcStripe, dstStripe, op, kernel, anchor,
rowBorderType, columnBorderType, borderValue) )
return;
#endif
Ptr<FilterEngine> f = createMorphologyFilter(op, src.type(), kernel, anchor,
rowBorderType, columnBorderType, borderValue );