Merge pull request #2391 from ilya-lavrenov:tapi_match_template

c9d8025f · Andrey Pavlenko · OpenCV Buildbot · c00f0faf · 653b99c9 · c9d8025f
Commit c9d8025f authored Mar 04, 2014 by Andrey Pavlenko Committed by OpenCV Buildbot Mar 04, 2014
Showing with 1 addition and 2 deletions

match_template.cl modules/imgproc/src/opencl/match_template.cl +0 -0

templmatch.cpp modules/imgproc/src/templmatch.cpp +0 -0

test_match_template.cpp modules/imgproc/test/ocl/test_match_template.cpp +1 -2

No files found.
--- a/modules/imgproc/src/opencl/match_template.cl
+++ b/modules/imgproc/src/opencl/match_template.cl
--- a/modules/imgproc/src/templmatch.cpp
+++ b/modules/imgproc/src/templmatch.cpp
--- a/modules/imgproc/test/ocl/test_match_template.cpp
+++ b/modules/imgproc/test/ocl/test_match_template.cpp
@@ -53,8 +53,7 @@ namespace ocl {

 ///////////////////////////////////////////// matchTemplate //////////////////////////////////////////////////////////

-CV_ENUM(MatchTemplType, CV_TM_SQDIFF, CV_TM_SQDIFF_NORMED, CV_TM_CCORR,
-        CV_TM_CCORR_NORMED, CV_TM_CCOEFF, CV_TM_CCOEFF_NORMED)
+CV_ENUM(MatchTemplType, CV_TM_CCORR, CV_TM_CCORR_NORMED, CV_TM_SQDIFF, CV_TM_SQDIFF_NORMED, CV_TM_CCOEFF, CV_TM_CCOEFF_NORMED)

 PARAM_TEST_CASE(MatchTemplate, MatDepth, Channels, MatchTemplType, bool)
 {