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:
baa6ab1
)
Fix error
author
vbystricky
<user@user-pc.(none)>
Mon, 14 Apr 2014 13:05:17 +0000
(17:05 +0400)
committer
vbystricky
<user@user-pc.(none)>
Fri, 18 Apr 2014 11:04:45 +0000
(15:04 +0400)
modules/imgproc/src/deriv.cpp
patch
|
blob
|
history
diff --git
a/modules/imgproc/src/deriv.cpp
b/modules/imgproc/src/deriv.cpp
index
854ca73
..
d6afe1a
100644
(file)
--- a/
modules/imgproc/src/deriv.cpp
+++ b/
modules/imgproc/src/deriv.cpp
@@
-408,7
+408,7
@@
static bool IPPDerivScharr(InputArray _src, OutputArray _dst, int ddepth, int dx
static bool IPPDeriv(InputArray _src, OutputArray _dst, int ddepth, int dx, int dy, int ksize, double scale, double delta)
{
- if (ksize != 3
||
ksize != 5)
+ if (ksize != 3
&&
ksize != 5)
return false;
if (fabs(delta) > 0.0001)
return false;