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:
ea5b411
)
fix for cv::norm (norm_inf)
author
Ilya Lavrenov
<ilya.lavrenov@itseez.com>
Tue, 13 May 2014 10:21:07 +0000
(14:21 +0400)
committer
Ilya Lavrenov
<ilya.lavrenov@itseez.com>
Tue, 13 May 2014 10:21:07 +0000
(14:21 +0400)
modules/core/src/opencl/reduce.cl
patch
|
blob
|
history
diff --git
a/modules/core/src/opencl/reduce.cl
b/modules/core/src/opencl/reduce.cl
index
6b4ccdd
..
a697cba
100644
(file)
--- a/
modules/core/src/opencl/reduce.cl
+++ b/
modules/core/src/opencl/reduce.cl
@@
-187,7
+187,7
@@
if (mask[mask_index]) \
{ \
temp = loadpix(srcptr + src_index); \
- maxval = max(maxval, (srcT)(temp >=
0
? temp : -temp)); \
+ maxval = max(maxval, (srcT)(temp >=
(srcT)(0)
? temp : -temp)); \
}
#define SET_LOCAL_1 \
localmem_max[lid] = maxval