Add IPP support in cvtColor function
macros -> template in IPP support cvtColor
Restored one executable bit that was lost during the war on whitespace.
appended ocl::finish to test_cycle defines
Merge pull request #1349 from ilya-lavrenov:ocl_perf_finish
Merge pull request #1213 from kdrobnyh:color