From 71d7987c285f25dd97cb8dc34a26a17c6f30499d Mon Sep 17 00:00:00 2001 From: "srowen@gmail.com" Date: Wed, 29 May 2013 11:46:20 +0000 Subject: [PATCH] Issue 1694 NPE when no hints git-svn-id: https://zxing.googlecode.com/svn/trunk@2812 59b500cc-1b3d-0410-9834-0bbf25fbcc57 --- core/src/com/google/zxing/aztec/AztecWriter.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/core/src/com/google/zxing/aztec/AztecWriter.java b/core/src/com/google/zxing/aztec/AztecWriter.java index 6105cb673..4e304c182 100644 --- a/core/src/com/google/zxing/aztec/AztecWriter.java +++ b/core/src/com/google/zxing/aztec/AztecWriter.java @@ -37,8 +37,8 @@ public final class AztecWriter implements Writer { @Override public BitMatrix encode(String contents, BarcodeFormat format, int width, int height, Map hints) { - String charset = (String) hints.get(EncodeHintType.CHARACTER_SET); - Number eccPercent = (Number) hints.get(EncodeHintType.ERROR_CORRECTION); + String charset = hints == null ? null : (String) hints.get(EncodeHintType.CHARACTER_SET); + Number eccPercent = hints == null ? null : (Number) hints.get(EncodeHintType.ERROR_CORRECTION); return encode(contents, format, charset == null ? DEFAULT_CHARSET : Charset.forName(charset),