swapped x,y in elbp_
Merge pull request #1897 from berak:b_3393_24