package com.google.zxing.qrcode;
import com.google.zxing.BarcodeFormat;
+import com.google.zxing.EncodeHintType;
import com.google.zxing.Writer;
import com.google.zxing.WriterException;
import com.google.zxing.common.ByteMatrix;
-import com.google.zxing.common.ByteArray;
import com.google.zxing.qrcode.encoder.Encoder;
import com.google.zxing.qrcode.encoder.QRCode;
+import com.google.zxing.qrcode.decoder.ErrorCorrectionLevel;
import java.util.Hashtable;
private static final int QUIET_ZONE_SIZE = 4;
- public ByteMatrix encode(byte[] contents, BarcodeFormat format, int width, int height)
+ public ByteMatrix encode(String contents, BarcodeFormat format, int width, int height)
throws WriterException {
return encode(contents, format, width, height, null);
}
- public ByteMatrix encode(byte[] contents, BarcodeFormat format, int width, int height,
+ public ByteMatrix encode(String contents, BarcodeFormat format, int width, int height,
Hashtable hints) throws WriterException {
- if (contents == null || contents.length == 0) {
+ if (contents == null || contents.length() == 0) {
throw new IllegalArgumentException("Found empty contents");
}
height);
}
- // TODO: Check hints for error correction level instead of hardcoding
- int errorCorrectionLevel = QRCode.EC_LEVEL_L;
- QRCode code = new QRCode();
- if (Encoder.Encode(new ByteArray(contents), errorCorrectionLevel, code)) {
- return renderResult(code, width, height);
- } else {
- throw new WriterException("Could not generate a QR Code");
+ ErrorCorrectionLevel errorCorrectionLevel = ErrorCorrectionLevel.L;
+ if (hints != null) {
+ ErrorCorrectionLevel requestedECLevel = (ErrorCorrectionLevel) hints.get(EncodeHintType.ERROR_CORRECTION);
+ if (requestedECLevel != null) {
+ errorCorrectionLevel = requestedECLevel;
+ }
}
+
+ QRCode code = new QRCode();
+ Encoder.encode(contents, errorCorrectionLevel, code);
+ return renderResult(code, width, height);
}
// Note that the input matrix uses 0 == white, 1 == black, while the output matrix uses
// 0 == black, 255 == white (i.e. an 8 bit greyscale bitmap).
- private ByteMatrix renderResult(QRCode code, final int width, final int height) {
- ByteMatrix input = code.matrix();
+ private ByteMatrix renderResult(QRCode code, int width, int height) {
+ ByteMatrix input = code.getMatrix();
int inputWidth = input.width();
int inputHeight = input.height();
int qrWidth = inputWidth + (QUIET_ZONE_SIZE * 2);
}
// 2. Expand the QR image to the multiple
- final byte[][] inputArray = input.getArray();
+ byte[][] inputArray = input.getArray();
for (int y = 0; y < inputHeight; y++) {
// a. Write the white pixels at the left of each row
for (int x = 0; x < leftPadding; x++) {