generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #2887 from ilya-lavrenov:ipp_morph_fix

Browse Source
This commit is contained in:
Alexander Alekhin 2014-06-23 14:27:10 +00:00
commit 6d4c4dcd94
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1272,7 +1272,7 @@ static bool IPPMorphOp(int op, InputArray _src, OutputArray _dst,
if( !( depth == CV_8U || depth == CV_32F ) || !(cn == 1 || cn == 3 || cn == 4) ||
!( borderType == cv::BORDER_REPLICATE || (borderType == cv::BORDER_CONSTANT && borderValue == morphologyDefaultBorderValue()) )
|| !( op == MORPH_DILATE || op == MORPH_ERODE) )
|| !( op == MORPH_DILATE || op == MORPH_ERODE) || _src.isSubmatrix() )
return false;
if( borderType == cv::BORDER_CONSTANT && kernel.data )