fix MACRO
some fixes and improvements in cv::matchTemplate
Merge pull request #2256 from ilya-lavrenov:tapi_matchTempl