projects
/
platform
/
upstream
/
opencv.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
fe29af2
)
fixed
author
Elena Gvozdeva
<elena.gvozdeva@itseez.com>
Mon, 28 Jul 2014 08:21:00 +0000
(12:21 +0400)
committer
Elena Gvozdeva
<elena.gvozdeva@itseez.com>
Mon, 28 Jul 2014 08:21:00 +0000
(12:21 +0400)
modules/core/src/stat.cpp
patch
|
blob
|
history
diff --git
a/modules/core/src/stat.cpp
b/modules/core/src/stat.cpp
index
60c8dc8
..
a26d334
100644
(file)
--- a/
modules/core/src/stat.cpp
+++ b/
modules/core/src/stat.cpp
@@
-479,7
+479,7
@@
static bool ocl_sum( InputArray _src, Scalar & res, int sum_op, InputArray _mask
haveMask = _mask.kind() != _InputArray::NONE,
haveSrc2 = _src2.kind() != _InputArray::NONE;
int type = _src.type(), depth = CV_MAT_DEPTH(type), cn = CV_MAT_CN(type),
- kercn = cn == 1 && !haveMask ? ocl::predictOptimalVectorWidth(_src) : 1,
+ kercn = cn == 1 && !haveMask ? ocl::predictOptimalVectorWidth(_src
, _src2
) : 1,
mcn = std::max(cn, kercn);
CV_Assert(!haveSrc2 || _src2.type() == type);
int convert_cn = haveSrc2 ? mcn : cn;