fix haar

18505995 · perping · 1e2fb6de · 18505995
Commit 18505995 authored Nov 13, 2013 by perping
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 1 deletion

haar.cpp modules/ocl/src/haar.cpp +4 -1

No files found.
--- 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;