C++ updates for r2574 and other java reconciliation

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