8 Commits

Author	SHA1	Message	Date
Ilya Lavrenov	b73490f86c	eliminated restriction src[i].channels() == 1 in cv::merge	2014-03-19 13:56:31 +04:00
Ilya Lavrenov	0ef16125ae	improved cv::matchTemplate OpenCL part	2014-02-22 14:30:19 +04:00
Ilya Lavrenov	e844c08203	some fixes and improvements in cv::matchTemplate	2014-02-02 19:20:37 +04:00
Elena Gvozdeva	4d86804f11	Fixed merge conflicts	2014-01-23 15:31:32 +04:00
Elena Gvozdeva	b4652e2cb3	Added perf test for ocl_matchTemplate	2014-01-23 14:50:29 +04:00
Elena Gvozdeva	47b572f99f	fixed	2014-01-23 14:50:28 +04:00
Elena Gvozdeva	da4d33ec26	Fixed test_match_template	2014-01-23 14:50:28 +04:00
Elena Gvozdeva	86636dc265	Added ocl_matchTemplate( without dft)	2014-01-23 14:50:28 +04:00