Merge pull request #7075 from alalek:ocl_fix_canny_perf_test