"Split" ReaderException into subclasses to enable more useful error reporting

[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 2446b30..7d516c6 100644 (file)
--- a/core/src/com/google/zxing/qrcode/QRCodeWriter.java
+++ b/core/src/com/google/zxing/qrcode/QRCodeWriter.java
@@ -20,8 +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.ByteArray;
 import com.google.zxing.common.ByteMatrix;
+import com.google.zxing.qrcode.decoder.ErrorCorrectionLevel;
 import com.google.zxing.qrcode.encoder.Encoder;
 import com.google.zxing.qrcode.encoder.QRCode;
 
@@ -54,43 +54,43 @@ 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);
     }
 
-    int errorCorrectionLevel = QRCode.EC_LEVEL_L;
+    ErrorCorrectionLevel errorCorrectionLevel = ErrorCorrectionLevel.L;
     if (hints != null) {
-      Integer requestedECLevel = (Integer) hints.get(EncodeHintType.ERROR_CORRECTION);
+      ErrorCorrectionLevel requestedECLevel = (ErrorCorrectionLevel) hints.get(EncodeHintType.ERROR_CORRECTION);
       if (requestedECLevel != null) {
-        errorCorrectionLevel = requestedECLevel.intValue();
+        errorCorrectionLevel = requestedECLevel;
       }
     }
 
     QRCode code = new QRCode();
-    Encoder.Encode(new ByteArray(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) {
-    ByteMatrix input = code.matrix();
-    int inputWidth = input.width();
-    int inputHeight = input.height();
-    int qrWidth = inputWidth + (QUIET_ZONE_SIZE * 2);
-    int qrHeight = inputHeight + (QUIET_ZONE_SIZE * 2);
+  private static ByteMatrix renderResult(QRCode code, int width, int height) {
+    ByteMatrix input = code.getMatrix();
+    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);
+    ByteMatrix output = new ByteMatrix(outputWidth, outputHeight);
     byte[][] outputArray = output.getArray();
 
     // We could be tricky and use the first row in each set of multiple as the temporary storage,
@@ -103,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++) {