Issue 361

[zxing.git] / core / src / com / google / zxing / qrcode / QRCodeWriter.java

diff --git a/core/src/com/google/zxing/qrcode/QRCodeWriter.java b/core/src/com/google/zxing/qrcode/QRCodeWriter.java
index 7d516c6..c0a5e0a 100644 (file)
--- a/core/src/com/google/zxing/qrcode/QRCodeWriter.java
+++ b/core/src/com/google/zxing/qrcode/QRCodeWriter.java
@@ -20,7 +20,8 @@ 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.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;
@@ -28,7 +29,7 @@ import com.google.zxing.qrcode.encoder.QRCode;
 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)
  */
@@ -36,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) {
@@ -73,7 +74,7 @@ public final class QRCodeWriter implements Writer {
 
   // 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 static ByteMatrix renderResult(QRCode code, int width, int height) {
+  private static BitMatrix renderResult(QRCode code, int width, int height) {
     ByteMatrix input = code.getMatrix();
     int inputWidth = input.getWidth();
     int inputHeight = input.getHeight();
@@ -90,62 +91,18 @@ public final class QRCodeWriter implements Writer {
     int leftPadding = (outputWidth - (inputWidth * multiple)) / 2;
     int topPadding = (outputHeight - (inputHeight * multiple)) / 2;
 
-    ByteMatrix output = new ByteMatrix(outputWidth, outputHeight);
-    byte[][] outputArray = output.getArray();
+    BitMatrix output = new BitMatrix(outputWidth, outputHeight);
 
-    // 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
-    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;
-      }
-
-      // 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;
-    }
-  }
-
 }