C++ 1D/cleanup first pass

git-svn-id: http://zxing.googlecode.com/svn/trunk@2603 59b500cc-1b3d-0410-9834-0bbf25fbcc57
fix a case that causes a variable not used warning/error

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