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:
17a6b8c
)
Fix error in OCL minmaxloc
author
vbystricky
<user@user-pc.(none)>
Thu, 31 Jul 2014 13:29:06 +0000
(17:29 +0400)
committer
vbystricky
<user@user-pc.(none)>
Thu, 31 Jul 2014 15:04:38 +0000
(19:04 +0400)
modules/core/src/opencl/minmaxloc.cl
patch
|
blob
|
history
diff --git
a/modules/core/src/opencl/minmaxloc.cl
b/modules/core/src/opencl/minmaxloc.cl
index 664673e5a2250722c8ae2896414751507c700223..1d84567ef987f98e0a1bce02b816d511965fae32 100644
(file)
--- a/
modules/core/src/opencl/minmaxloc.cl
+++ b/
modules/core/src/opencl/minmaxloc.cl
@@
-209,7
+209,7
@@
__kernel void minmaxloc(__global const uchar * srcptr, int src_step, int src_off
#if kercn == 1
#ifdef NEED_MINVAL
-#if NEED_MINLOC
+#if
def
NEED_MINLOC
if (minval > temp)
{
minval = temp;
@@
-326,7
+326,7
@@
__kernel void minmaxloc(__global const uchar * srcptr, int src_step, int src_off
int lid2 = lsize + lid;
#ifdef NEED_MINVAL
-#ifdef NEED_M
AX
LOC
+#ifdef NEED_M
IN
LOC
if (localmem_min[lid] >= localmem_min[lid2])
{
if (localmem_min[lid] == localmem_min[lid2])