Merge pull request #2275 from ElenaGvozdeva:ocl_matchTemplate

5968b881 · Andrey Pavlenko · OpenCV Buildbot · 92c8b94b · 85d519b6 · 5968b881
Commit 5968b881 authored Feb 04, 2014 by Andrey Pavlenko Committed by OpenCV Buildbot Feb 04, 2014
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 2 deletions

templmatch.cpp modules/imgproc/src/templmatch.cpp +7 -2

No files found.
--- a/modules/imgproc/src/templmatch.cpp
+++ b/modules/imgproc/src/templmatch.cpp
@@ -191,8 +191,13 @@ static bool matchTemplate_CCOEFF(InputArray _image, InputArray _templ, OutputArr
 {
    matchTemplate(_image, _templ, _result, CV_TM_CCORR);

-    UMat image_sums;
-    integral(_image, image_sums);
+    UMat image_sums, temp;
+    integral(_image, temp);
+
+    if(temp.depth() == CV_64F)
+        temp.convertTo(image_sums, CV_32F);
+    else
+        image_sums = temp;

    int type = image_sums.type(), depth = CV_MAT_DEPTH(type), cn = CV_MAT_CN(type);