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:
6bc060f
)
fix ocl/match_template compiling error on Linux
author
bitwangyaoyao
<bitwangyaoyao@gmail.com>
Sat, 11 Aug 2012 05:10:43 +0000
(13:10 +0800)
committer
bitwangyaoyao
<bitwangyaoyao@gmail.com>
Sat, 11 Aug 2012 05:10:43 +0000
(13:10 +0800)
modules/ocl/src/match_template.cpp
patch
|
blob
|
history
diff --git
a/modules/ocl/src/match_template.cpp
b/modules/ocl/src/match_template.cpp
index
ad31b00
..
4b50903
100644
(file)
--- a/
modules/ocl/src/match_template.cpp
+++ b/
modules/ocl/src/match_template.cpp
@@
-105,7
+105,7
@@
namespace cv { namespace ocl
if (depth == CV_8U) return 300;
break;
case CV_TM_SQDIFF:
- if (depth == CV_32F) return
MAXSHORT
; // do naive SQDIFF for CV_32F
+ if (depth == CV_32F) return
0x7fffffff
; // do naive SQDIFF for CV_32F
if (depth == CV_8U) return 300;
break;
}