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:
1e2fb6d
)
fix haar
author
perping
<erping@multicorewareinc.com>
Wed, 13 Nov 2013 02:19:09 +0000
(10:19 +0800)
committer
perping
<erping@multicorewareinc.com>
Wed, 13 Nov 2013 02:19:09 +0000
(10:19 +0800)
modules/ocl/src/haar.cpp
patch
|
blob
|
history
diff --git
a/modules/ocl/src/haar.cpp
b/modules/ocl/src/haar.cpp
index
ac8a64e
..
deff867
100644
(file)
--- a/
modules/ocl/src/haar.cpp
+++ b/
modules/ocl/src/haar.cpp
@@
-1013,7
+1013,10
@@
CvSeq *cv::ocl::OclCascadeClassifier::oclHaarDetectObjects( oclMat &gimg, CvMemS
oclMat gsqsum;
oclMat gsqsum_t;
cv::ocl::integral(gimg, gsum, gsqsum_t);
- gsqsum_t.convertTo(gsqsum, CV_32FC1);
+ if(gsqsum_t.depth() == CV_64F)
+ gsqsum_t.convertTo(gsqsum, CV_32FC1);
+ else
+ gsqsum = gsqsum_t;
CvSize sz;
vector<CvSize> sizev;
vector<float> scalev;