Ported r2694 from ZXing

Original commit message: "Images to accompany last commit"