Merge pull request #7072 from alalek:ocl_fix_canny