Merge pull request #3407 from wangyan42164:canny_bug_fix
authorVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Wed, 12 Nov 2014 11:09:55 +0000 (11:09 +0000)
committerVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Wed, 12 Nov 2014 11:09:55 +0000 (11:09 +0000)

Trivial merge