mudhorn/zxing
1
0
Fork 0
mirror of https://github.com/zxing/zxing.git synced 2025-03-05 20:48:51 -08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Don't crash on unsupported barcode format like CODE_93

Browse source 
git-svn-id: https://zxing.googlecode.com/svn/trunk@2266 59b500cc-1b3d-0410-9834-0bbf25fbcc57
This commit is contained in:
srowen 2012-04-26 17:15:28 +00:00
parent 18c3b38a9a
commit 5af1cad965
1 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
android/src/com/google/zxing/client/android/encode/QRCodeEncoder.java
View file

@ -313,7 +313,13 @@ final class QRCodeEncoder {
hints.put(EncodeHintType.CHARACTER_SET, encoding); hints.put(EncodeHintType.CHARACTER_SET, encoding);
} }
MultiFormatWriter writer = new MultiFormatWriter(); MultiFormatWriter writer = new MultiFormatWriter();
BitMatrix result = writer.encode(contentsToEncode, format, dimension, dimension, hints); BitMatrix result;
try {
result = writer.encode(contentsToEncode, format, dimension, dimension, hints);
} catch (IllegalArgumentException iae) {
// Unsupported format
return null;
}
int width = result.getWidth(); int width = result.getWidth();
int height = result.getHeight(); int height = result.getHeight();
int[] pixels = new int[width * height]; int[] pixels = new int[width * height];