Issue 1758: revert last change, applying penalty at edge is necessary. Try new change from original code to avoid applying in the "2 1 3 1 1" case

git-svn-id: https://zxing.googlecode.com/svn/trunk@2867 59b500cc-1b3d-0410-9834-0bbf25fbcc57