Merge pull request #10095 from alalek:fix_canny_intrinsics
authorAlexander Alekhin <alexander.a.alekhin@gmail.com>
Sat, 25 Nov 2017 12:31:47 +0000 (12:31 +0000)
committerAlexander Alekhin <alexander.a.alekhin@gmail.com>
Sat, 25 Nov 2017 12:31:47 +0000 (12:31 +0000)

Trivial merge