Merge pull request #7072 from alalek:ocl_fix_canny
authorAlexander Alekhin <alexander.a.alekhin@gmail.com>
Wed, 10 Aug 2016 10:44:52 +0000 (13:44 +0300)
committerGitHub <noreply@github.com>
Wed, 10 Aug 2016 10:44:52 +0000 (13:44 +0300)

Trivial merge