Merge pull request #3117 from KruchDmitriy:canny_opt
authorVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Wed, 27 Aug 2014 10:07:55 +0000 (10:07 +0000)
committerVadim Pisarevsky <vadim.pisarevsky@gmail.com>
Wed, 27 Aug 2014 10:07:55 +0000 (10:07 +0000)

Trivial merge