X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=core%2Fsrc%2Fcom%2Fgoogle%2Fzxing%2Fqrcode%2FQRCodeWriter.java;h=c0a5e0af435de958bdd58560b99dd9f671c4d4aa;hb=d0920ceb07da310eb8e10f6a11d5590bcb3184ea;hp=a870f1c5a925879dfbadf8fcbaf815a62f8b4f7d;hpb=7562cc405278d3b031d5b076995216dca076de3f;p=zxing.git diff --git a/core/src/com/google/zxing/qrcode/QRCodeWriter.java b/core/src/com/google/zxing/qrcode/QRCodeWriter.java index a870f1c5..c0a5e0af 100644 --- a/core/src/com/google/zxing/qrcode/QRCodeWriter.java +++ b/core/src/com/google/zxing/qrcode/QRCodeWriter.java @@ -20,16 +20,16 @@ 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.ByteArray; -import com.google.zxing.common.ByteMatrix; +import com.google.zxing.common.BitMatrix; +import com.google.zxing.qrcode.encoder.ByteMatrix; +import com.google.zxing.qrcode.decoder.ErrorCorrectionLevel; 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; /** - * This object renders a QR Code as a ByteMatrix 2D array of greyscale values. + * This object renders a QR Code as a BitMatrix 2D array of greyscale values. * * @author dswitkin@google.com (Daniel Switkin) */ @@ -37,13 +37,13 @@ public final class QRCodeWriter implements Writer { private static final int QUIET_ZONE_SIZE = 4; - public ByteMatrix encode(String contents, BarcodeFormat format, int width, int height) + public BitMatrix encode(String contents, BarcodeFormat format, int width, int height) throws WriterException { return encode(contents, format, width, height, null); } - public ByteMatrix encode(String contents, BarcodeFormat format, int width, int height, + public BitMatrix encode(String contents, BarcodeFormat format, int width, int height, Hashtable hints) throws WriterException { if (contents == null || contents.length() == 0) { @@ -55,7 +55,7 @@ public final class QRCodeWriter implements Writer { } if (width < 0 || height < 0) { - throw new IllegalArgumentException("Requested dimensions are too small: " + width + "x" + + throw new IllegalArgumentException("Requested dimensions are too small: " + width + 'x' + height); } @@ -68,85 +68,41 @@ public final class QRCodeWriter implements Writer { } QRCode code = new QRCode(); - Encoder.encode(contents, errorCorrectionLevel, code); + Encoder.encode(contents, errorCorrectionLevel, hints, 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) { + private static BitMatrix 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); - int qrHeight = inputHeight + (QUIET_ZONE_SIZE * 2); + int inputWidth = input.getWidth(); + int inputHeight = input.getHeight(); + int qrWidth = inputWidth + (QUIET_ZONE_SIZE << 1); + int qrHeight = inputHeight + (QUIET_ZONE_SIZE << 1); int outputWidth = Math.max(width, qrWidth); int outputHeight = Math.max(height, qrHeight); int multiple = Math.min(outputWidth / qrWidth, outputHeight / qrHeight); - // Padding includes both the quiet zone and the extra white pixels to accomodate the requested + // Padding includes both the quiet zone and the extra white pixels to accommodate the requested // dimensions. For example, if input is 25x25 the QR will be 33x33 including the quiet zone. // If the requested size is 200x160, the multiple will be 4, for a QR of 132x132. These will // handle all the padding from 100x100 (the actual QR) up to 200x160. int leftPadding = (outputWidth - (inputWidth * multiple)) / 2; int topPadding = (outputHeight - (inputHeight * multiple)) / 2; - ByteMatrix output = new ByteMatrix(outputHeight, outputWidth); - byte[][] outputArray = output.getArray(); - - // We could be tricky and use the first row in each set of multiple as the temporary storage, - // instead of allocating this separate array. - byte[] row = new byte[outputWidth]; - - // 1. Write the white lines at the top - for (int y = 0; y < topPadding; y++) { - setRowColor(outputArray[y], (byte) 255); - } - - // 2. Expand the QR image to the multiple - final 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++) { - row[x] = (byte) 255; - } + BitMatrix output = new BitMatrix(outputWidth, outputHeight); - // b. Write the contents of this row of the barcode - int offset = leftPadding; - for (int x = 0; x < inputWidth; x++) { - byte value = (inputArray[y][x] == 1) ? 0 : (byte) 255; - for (int z = 0; z < multiple; z++) { - row[offset + z] = value; + for (int inputY = 0, outputY = topPadding; inputY < inputHeight; inputY++, outputY += multiple) { + // Write the contents of this row of the barcode + for (int inputX = 0, outputX = leftPadding; inputX < inputWidth; inputX++, outputX += multiple) { + if (input.get(inputX, inputY) == 1) { + output.setRegion(outputX, outputY, multiple, multiple); } - offset += multiple; - } - - // c. Write the white pixels at the right of each row - offset = leftPadding + (inputWidth * multiple); - for (int x = offset; x < outputWidth; x++) { - row[x] = (byte) 255; - } - - // d. Write the completed row multiple times - offset = topPadding + (y * multiple); - for (int z = 0; z < multiple; z++) { - System.arraycopy(row, 0, outputArray[offset + z], 0, outputWidth); } } - // 3. Write the white lines at the bottom - int offset = topPadding + (inputHeight * multiple); - for (int y = offset; y < outputHeight; y++) { - setRowColor(outputArray[y], (byte) 255); - } - return output; } - private static void setRowColor(byte[] row, byte value) { - for (int x = 0; x < row.length; x++) { - row[x] = value; - } - } - }