More small changes from code inspection

[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 1920465..c3f24ea 100644 (file)
--- a/core/src/com/google/zxing/qrcode/QRCodeWriter.java
+++ b/core/src/com/google/zxing/qrcode/QRCodeWriter.java
@@ -20,7 +20,6 @@ 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.qrcode.encoder.Encoder;
 import com.google.zxing.qrcode.encoder.QRCode;
@@ -55,7 +54,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,18 +67,18 @@ public final class QRCodeWriter implements Writer {
     }
 
     QRCode code = new QRCode();
-    Encoder.encode(new ByteArray(contents), errorCorrectionLevel, code);
+    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) {
+  private static 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);
-    int qrHeight = inputHeight + (QUIET_ZONE_SIZE * 2);
+    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);
 
@@ -104,7 +103,7 @@ public final class QRCodeWriter implements Writer {
     }
 
     // 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++) {