Merge pull request #6335 from themightyoarfish:canny_kernel_sz_fix
authorMaksim Shabunin <maksim.shabunin@itseez.com>
Wed, 13 Apr 2016 07:52:05 +0000 (07:52 +0000)
committerMaksim Shabunin <maksim.shabunin@itseez.com>
Wed, 13 Apr 2016 07:52:05 +0000 (07:52 +0000)

Trivial merge