Merge pull request #2774 from 23pointsNorth:lsd-nfa-fix
authorRoman Donchenko <roman.donchenko@itseez.com>
Thu, 26 Jun 2014 13:29:25 +0000 (17:29 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Thu, 26 Jun 2014 13:29:27 +0000 (17:29 +0400)
1  2 
modules/imgproc/src/lsd.cpp

Simple merge