Chiebot-Mirror
/
opencv
8
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #2887 from ilya-lavrenov:ipp_morph_fix

Browse Source
pull/2260/merge
Alexander Alekhin 11 years ago
parent 4f1d06d14a 863784efc6
commit 6d4c4dcd94
1 changed files with 1 additions and 1 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      modules/imgproc/src/morph.cpp

2
modules/imgproc/src/morph.cpp
Unescape 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) || if( !( depth == CV_8U || depth == CV_32F ) || !(cn == 1 || cn == 3 || cn == 4) ||
!( borderType == cv::BORDER_REPLICATE || (borderType == cv::BORDER_CONSTANT && borderValue == morphologyDefaultBorderValue()) ) !( 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; return false;
if( borderType == cv::BORDER_CONSTANT && kernel.data ) if( borderType == cv::BORDER_CONSTANT && kernel.data )

Write Preview
Loading…
Cancel
Save