projects
/
profile
/
ivi
/
opencv.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
6952b90
)
added extra condition
author
Ilya Lavrenov
<ilya.lavrenov@itseez.com>
Sun, 22 Jun 2014 15:18:14 +0000
(19:18 +0400)
committer
Ilya Lavrenov
<ilya.lavrenov@itseez.com>
Sun, 22 Jun 2014 15:18:14 +0000
(19:18 +0400)
modules/imgproc/src/morph.cpp
patch
|
blob
|
history
diff --git
a/modules/imgproc/src/morph.cpp
b/modules/imgproc/src/morph.cpp
index
61081c4
..
3ab495d
100644
(file)
--- a/
modules/imgproc/src/morph.cpp
+++ b/
modules/imgproc/src/morph.cpp
@@
-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()) )
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 )
return false;
if( borderType == cv::BORDER_CONSTANT && kernel.data )