Used IntelliJ's amazing refactoring functions to change the argument ordering of...

git-svn-id: http://zxing.googlecode.com/svn/trunk@975 59b500cc-1b3d-0410-9834-0bbf25fbcc57

diff --git a/core/src/com/google/zxing/common/ByteMatrix.java b/core/src/com/google/zxing/common/ByteMatrix.java
index b924296..b028ba6 100644 (file)
--- a/core/src/com/google/zxing/common/ByteMatrix.java
+++ b/core/src/com/google/zxing/common/ByteMatrix.java
@@ -20,23 +20,21 @@ package com.google.zxing.common;
  * A class which wraps a 2D array of bytes. The default usage is signed. If you want to use it as a
  * unsigned container, it's up to you to do byteValue & 0xff at each location.
  *
- * JAVAPORT: I'm not happy about the argument ordering throughout the file, as I always like to have
- * the horizontal component first, but this is for compatibility with the C++ code. The original
- * code was a 2D array of ints, but since it only ever gets assigned -1, 0, and 1, I'm going to use
- * less memory and go with bytes.
+ * JAVAPORT: The original code was a 2D array of ints, but since it only ever gets assigned
+ * -1, 0, and 1, I'm going to use less memory and go with bytes.
  *
  * @author dswitkin@google.com (Daniel Switkin)
  */
 public final class ByteMatrix {
 
   private final byte[][] bytes;
-  private final int height;
   private final int width;
+  private final int height;
 
-  public ByteMatrix(int height, int width) {
+  public ByteMatrix(int width, int height) {
     bytes = new byte[height][width];
-    this.height = height;
     this.width = width;
+    this.height = height;
   }
 
   public int height() {
@@ -47,7 +45,7 @@ public final class ByteMatrix {
     return width;
   }
 
-  public byte get(int y, int x) {
+  public byte get(int x, int y) {
     return bytes[y][x];
   }
 
@@ -55,11 +53,11 @@ public final class ByteMatrix {
     return bytes;
   }
 
-  public void set(int y, int x, byte value) {
+  public void set(int x, int y, byte value) {
     bytes[y][x] = value;
   }
 
-  public void set(int y, int x, int value) {
+  public void set(int x, int y, int value) {
     bytes[y][x] = (byte) value;
   }
 

diff --git a/core/src/com/google/zxing/oned/AbstractUPCEANWriter.java b/core/src/com/google/zxing/oned/AbstractUPCEANWriter.java
index 10ea5a4..b2d2e4c 100644 (file)
--- a/core/src/com/google/zxing/oned/AbstractUPCEANWriter.java
+++ b/core/src/com/google/zxing/oned/AbstractUPCEANWriter.java
@@ -61,7 +61,7 @@ public abstract class AbstractUPCEANWriter implements UPCEANWriter {
     int multiple = outputWidth / fullWidth;
     int leftPadding = (outputWidth - (inputWidth * multiple)) / 2;
 
-    ByteMatrix output = new ByteMatrix(outputHeight, outputWidth);
+    ByteMatrix output = new ByteMatrix(outputWidth, outputHeight);
     byte[][] outputArray = output.getArray();
 
     byte[] row = new byte[outputWidth];

diff --git a/core/src/com/google/zxing/qrcode/QRCodeWriter.java b/core/src/com/google/zxing/qrcode/QRCodeWriter.java
index c8dd631..84ee4be 100644 (file)
--- a/core/src/com/google/zxing/qrcode/QRCodeWriter.java
+++ b/core/src/com/google/zxing/qrcode/QRCodeWriter.java
@@ -90,7 +90,7 @@ public final class QRCodeWriter implements Writer {
     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,

diff --git a/core/src/com/google/zxing/qrcode/encoder/MatrixUtil.java b/core/src/com/google/zxing/qrcode/encoder/MatrixUtil.java
index 9980bcf..5409cdf 100644 (file)
--- a/core/src/com/google/zxing/qrcode/encoder/MatrixUtil.java
+++ b/core/src/com/google/zxing/qrcode/encoder/MatrixUtil.java
@@ -180,18 +180,18 @@ public final class MatrixUtil {
       // Type info bits at the left top corner. See 8.9 of JISX0510:2004 (p.46).
       int x1 = TYPE_INFO_COORDINATES[i][0];
       int y1 = TYPE_INFO_COORDINATES[i][1];
-      matrix.set(y1, x1, bit);
+      matrix.set(x1, y1, bit);
 
       if (i < 8) {
         // Right top corner.
         int x2 = matrix.width() - i - 1;
         int y2 = 8;
-        matrix.set(y2, x2, bit);
+        matrix.set(x2, y2, bit);
       } else {
         // Left bottom corner.
         int x2 = 8;
         int y2 = matrix.height() - 7 + (i - 8);
-        matrix.set(y2, x2, bit);
+        matrix.set(x2, y2, bit);
       }
     }
   }
@@ -212,9 +212,9 @@ public final class MatrixUtil {
         int bit = versionInfoBits.at(bitIndex);
         bitIndex--;
         // Left bottom corner.
-        matrix.set(matrix.height() - 11 + j, i, bit);
-        // Right bottom corner.
         matrix.set(i, matrix.height() - 11 + j, bit);
+        // Right bottom corner.
+        matrix.set(matrix.height() - 11 + j, i, bit);
       }
     }
   }
@@ -238,7 +238,7 @@ public final class MatrixUtil {
         for (int i = 0; i < 2; ++i) {
           int xx = x - i;
           // Skip the cell if it's not empty.
-          if (!isEmpty(matrix.get(y, xx))) {
+          if (!isEmpty(matrix.get(xx, y))) {
             continue;
           }
           int bit;
@@ -257,7 +257,7 @@ public final class MatrixUtil {
               bit ^= 0x1;
             }
           }
-          matrix.set(y, xx, bit);
+          matrix.set(xx, y, bit);
         }
         y += direction;
       }
@@ -376,28 +376,28 @@ public final class MatrixUtil {
     for (int i = 8; i < matrix.width() - 8; ++i) {
       int bit = (i + 1) % 2;
       // Horizontal line.
-      if (!isValidValue(matrix.get(6, i))) {
+      if (!isValidValue(matrix.get(i, 6))) {
         throw new WriterException();
       }
-      if (isEmpty(matrix.get(6, i))) {
-        matrix.set(6, i, bit);
+      if (isEmpty(matrix.get(i, 6))) {
+        matrix.set(i, 6, bit);
       }
       // Vertical line.
-      if (!isValidValue(matrix.get(i, 6))) {
+      if (!isValidValue(matrix.get(6, i))) {
         throw new WriterException();
       }
-      if (isEmpty(matrix.get(i, 6))) {
-        matrix.set(i, 6, bit);
+      if (isEmpty(matrix.get(6, i))) {
+        matrix.set(6, i, bit);
       }
     }
   }
 
   // Embed the lonely dark dot at left bottom corner. JISX0510:2004 (p.46)
   private static void embedDarkDotAtLeftBottomCorner(ByteMatrix matrix) throws WriterException {
-    if (matrix.get(matrix.height() - 8, 8) == 0) {
+    if (matrix.get(8, matrix.height() - 8) == 0) {
       throw new WriterException();
     }
-    matrix.set(matrix.height() - 8, 8, 1);
+    matrix.set(8, matrix.height() - 8, 1);
   }
 
   private static void embedHorizontalSeparationPattern(int xStart, int yStart,
@@ -407,10 +407,10 @@ public final class MatrixUtil {
       throw new WriterException("Bad horizontal separation pattern");
     }
     for (int x = 0; x < 8; ++x) {
-      if (!isEmpty(matrix.get(yStart, xStart + x))) {
+      if (!isEmpty(matrix.get(xStart + x, yStart))) {
         throw new WriterException();
       }
-      matrix.set(yStart, xStart + x, HORIZONTAL_SEPARATION_PATTERN[0][x]);
+      matrix.set(xStart + x, yStart, HORIZONTAL_SEPARATION_PATTERN[0][x]);
     }
   }
 
@@ -421,10 +421,10 @@ public final class MatrixUtil {
       throw new WriterException("Bad vertical separation pattern");
     }
     for (int y = 0; y < 7; ++y) {
-      if (!isEmpty(matrix.get(yStart + y, xStart))) {
+      if (!isEmpty(matrix.get(xStart, yStart + y))) {
         throw new WriterException();
       }
-      matrix.set(yStart + y, xStart, VERTICAL_SEPARATION_PATTERN[y][0]);
+      matrix.set(xStart, yStart + y, VERTICAL_SEPARATION_PATTERN[y][0]);
     }
   }
 
@@ -439,10 +439,10 @@ public final class MatrixUtil {
     }
     for (int y = 0; y < 5; ++y) {
       for (int x = 0; x < 5; ++x) {
-        if (!isEmpty(matrix.get(yStart + y, xStart + x))) {
+        if (!isEmpty(matrix.get(xStart + x, yStart + y))) {
           throw new WriterException();
         }
-        matrix.set(yStart + y, xStart + x, POSITION_ADJUSTMENT_PATTERN[y][x]);
+        matrix.set(xStart + x, yStart + y, POSITION_ADJUSTMENT_PATTERN[y][x]);
       }
     }
   }
@@ -455,10 +455,10 @@ public final class MatrixUtil {
     }
     for (int y = 0; y < 7; ++y) {
       for (int x = 0; x < 7; ++x) {
-        if (!isEmpty(matrix.get(yStart + y, xStart + x))) {
+        if (!isEmpty(matrix.get(xStart + x, yStart + y))) {
           throw new WriterException();
         }
-        matrix.set(yStart + y, xStart + x, POSITION_DETECTION_PATTERN[y][x]);
+        matrix.set(xStart + x, yStart + y, POSITION_DETECTION_PATTERN[y][x]);
       }
     }
   }
@@ -512,7 +512,7 @@ public final class MatrixUtil {
           continue;
         }
         // If the cell is unset, we embed the position adjustment pattern here.
-        if (isEmpty(matrix.get(y, x))) {
+        if (isEmpty(matrix.get(x, y))) {
           // -2 is necessary since the x/y coordinates point to the center of the pattern, not the
           // left top corner.
           embedPositionAdjustmentPattern(x - 2, y - 2, matrix);

diff --git a/core/src/com/google/zxing/qrcode/encoder/QRCode.java b/core/src/com/google/zxing/qrcode/encoder/QRCode.java
index 7f0a291..2340ee1 100644 (file)
--- a/core/src/com/google/zxing/qrcode/encoder/QRCode.java
+++ b/core/src/com/google/zxing/qrcode/encoder/QRCode.java
@@ -107,7 +107,7 @@ public final class QRCode {
   // call cells in the matrix "modules". 1 represents a black cell, and 0 represents a white cell.
   public int at(int x, int y) {
     // The value must be zero or one.
-    int value = matrix.get(y, x);
+    int value = matrix.get(x, y);
     if (!(value == 0 || value == 1)) {
       // this is really like an assert... not sure what better exception to use?
       throw new RuntimeException("Bad value");

diff --git a/core/test/src/com/google/zxing/qrcode/QRCodeWriterTestCase.java b/core/test/src/com/google/zxing/qrcode/QRCodeWriterTestCase.java
index c63b375..4e83df1 100644 (file)
--- a/core/test/src/com/google/zxing/qrcode/QRCodeWriterTestCase.java
+++ b/core/test/src/com/google/zxing/qrcode/QRCodeWriterTestCase.java
@@ -59,14 +59,14 @@ public final class QRCodeWriterTestCase extends TestCase {
     int[] pixels = new int[width * height];
     image.getRGB(0, 0, width, height, pixels, 0, width);
 
-    ByteMatrix matrix = new ByteMatrix(height, width);
+    ByteMatrix matrix = new ByteMatrix(width, height);
     for (int y = 0; y < height; y++) {
       for (int x = 0; x < width; x++) {
         int pixel = pixels[y * width + x];
         int luminance = (306 * ((pixel >> 16) & 0xFF) +
             601 * ((pixel >> 8) & 0xFF) +
             117 * (pixel & 0xFF)) >> 10;
-        matrix.set(y, x, luminance);
+        matrix.set(x, y, luminance);
       }
     }
     return matrix;

diff --git a/core/test/src/com/google/zxing/qrcode/encoder/MaskUtilTestCase.java b/core/test/src/com/google/zxing/qrcode/encoder/MaskUtilTestCase.java
index 4b202bc..51790a8 100644 (file)
--- a/core/test/src/com/google/zxing/qrcode/encoder/MaskUtilTestCase.java
+++ b/core/test/src/com/google/zxing/qrcode/encoder/MaskUtilTestCase.java
@@ -27,26 +27,14 @@ import junit.framework.TestCase;
 public final class MaskUtilTestCase extends TestCase {
   public void testApplyMaskPenaltyRule1() {
     {
-      ByteMatrix matrix = new ByteMatrix(1, 4);
+      ByteMatrix matrix = new ByteMatrix(4, 1);
       matrix.set(0, 0, 0);
-      matrix.set(0, 1, 0);
-      matrix.set(0, 2, 0);
-      matrix.set(0, 3, 0);
+      matrix.set(1, 0, 0);
+      matrix.set(2, 0, 0);
+      matrix.set(3, 0, 0);
       assertEquals(0, MaskUtil.applyMaskPenaltyRule1(matrix));
     }
     {  // Horizontal.
-      ByteMatrix matrix = new ByteMatrix(1, 6);
-      matrix.set(0, 0, 0);
-      matrix.set(0, 1, 0);
-      matrix.set(0, 2, 0);
-      matrix.set(0, 3, 0);
-      matrix.set(0, 4, 0);
-      matrix.set(0, 5, 1);
-      assertEquals(3, MaskUtil.applyMaskPenaltyRule1(matrix));
-      matrix.set(0, 5, 0);
-      assertEquals(4, MaskUtil.applyMaskPenaltyRule1(matrix));
-    }
-    {  // Vertical.
       ByteMatrix matrix = new ByteMatrix(6, 1);
       matrix.set(0, 0, 0);
       matrix.set(1, 0, 0);
@@ -58,6 +46,18 @@ public final class MaskUtilTestCase extends TestCase {
       matrix.set(5, 0, 0);
       assertEquals(4, MaskUtil.applyMaskPenaltyRule1(matrix));
     }
+    {  // Vertical.
+      ByteMatrix matrix = new ByteMatrix(1, 6);
+      matrix.set(0, 0, 0);
+      matrix.set(0, 1, 0);
+      matrix.set(0, 2, 0);
+      matrix.set(0, 3, 0);
+      matrix.set(0, 4, 0);
+      matrix.set(0, 5, 1);
+      assertEquals(3, MaskUtil.applyMaskPenaltyRule1(matrix));
+      matrix.set(0, 5, 0);
+      assertEquals(4, MaskUtil.applyMaskPenaltyRule1(matrix));
+    }
   }
 
   public void testApplyMaskPenaltyRule2() {
@@ -69,29 +69,29 @@ public final class MaskUtilTestCase extends TestCase {
     {
       ByteMatrix matrix = new ByteMatrix(2, 2);
       matrix.set(0, 0, 0);
-      matrix.set(0, 1, 0);
       matrix.set(1, 0, 0);
+      matrix.set(0, 1, 0);
       matrix.set(1, 1, 1);
       assertEquals(0, MaskUtil.applyMaskPenaltyRule2(matrix));
     }
     {
       ByteMatrix matrix = new ByteMatrix(2, 2);
       matrix.set(0, 0, 0);
-      matrix.set(0, 1, 0);
       matrix.set(1, 0, 0);
+      matrix.set(0, 1, 0);
       matrix.set(1, 1, 0);
       assertEquals(3, MaskUtil.applyMaskPenaltyRule2(matrix));
     }
     {
       ByteMatrix matrix = new ByteMatrix(3, 3);
       matrix.set(0, 0, 0);
-      matrix.set(0, 1, 0);
-      matrix.set(0, 2, 0);
       matrix.set(1, 0, 0);
-      matrix.set(1, 1, 0);
-      matrix.set(1, 2, 0);
       matrix.set(2, 0, 0);
+      matrix.set(0, 1, 0);
+      matrix.set(1, 1, 0);
       matrix.set(2, 1, 0);
+      matrix.set(0, 2, 0);
+      matrix.set(1, 2, 0);
       matrix.set(2, 2, 0);
       // Four instances of 2x2 blocks.
       assertEquals(3 * 4, MaskUtil.applyMaskPenaltyRule2(matrix));
@@ -101,38 +101,6 @@ public final class MaskUtilTestCase extends TestCase {
   public void testApplyMaskPenaltyRule3() {
     {
       // Horizontal 00001011101.
-      ByteMatrix matrix = new ByteMatrix(1, 11);
-      matrix.set(0, 0, 0);
-      matrix.set(0, 1, 0);
-      matrix.set(0, 2, 0);
-      matrix.set(0, 3, 0);
-      matrix.set(0, 4, 1);
-      matrix.set(0, 5, 0);
-      matrix.set(0, 6, 1);
-      matrix.set(0, 7, 1);
-      matrix.set(0, 8, 1);
-      matrix.set(0, 9, 0);
-      matrix.set(0, 10, 1);
-      assertEquals(40, MaskUtil.applyMaskPenaltyRule3(matrix));
-    }
-    {
-      // Horizontal 10111010000.
-      ByteMatrix matrix = new ByteMatrix(1, 11);
-      matrix.set(0, 0, 1);
-      matrix.set(0, 1, 0);
-      matrix.set(0, 2, 1);
-      matrix.set(0, 3, 1);
-      matrix.set(0, 4, 1);
-      matrix.set(0, 5, 0);
-      matrix.set(0, 6, 1);
-      matrix.set(0, 7, 0);
-      matrix.set(0, 8, 0);
-      matrix.set(0, 9, 0);
-      matrix.set(0, 10, 0);
-      assertEquals(40, MaskUtil.applyMaskPenaltyRule3(matrix));
-    }
-    {
-      // Vertical 00001011101.
       ByteMatrix matrix = new ByteMatrix(11, 1);
       matrix.set(0, 0, 0);
       matrix.set(1, 0, 0);
@@ -148,7 +116,7 @@ public final class MaskUtilTestCase extends TestCase {
       assertEquals(40, MaskUtil.applyMaskPenaltyRule3(matrix));
     }
     {
-      // Vertical 10111010000.
+      // Horizontal 10111010000.
       ByteMatrix matrix = new ByteMatrix(11, 1);
       matrix.set(0, 0, 1);
       matrix.set(1, 0, 0);
@@ -163,6 +131,38 @@ public final class MaskUtilTestCase extends TestCase {
       matrix.set(10, 0, 0);
       assertEquals(40, MaskUtil.applyMaskPenaltyRule3(matrix));
     }
+    {
+      // Vertical 00001011101.
+      ByteMatrix matrix = new ByteMatrix(1, 11);
+      matrix.set(0, 0, 0);
+      matrix.set(0, 1, 0);
+      matrix.set(0, 2, 0);
+      matrix.set(0, 3, 0);
+      matrix.set(0, 4, 1);
+      matrix.set(0, 5, 0);
+      matrix.set(0, 6, 1);
+      matrix.set(0, 7, 1);
+      matrix.set(0, 8, 1);
+      matrix.set(0, 9, 0);
+      matrix.set(0, 10, 1);
+      assertEquals(40, MaskUtil.applyMaskPenaltyRule3(matrix));
+    }
+    {
+      // Vertical 10111010000.
+      ByteMatrix matrix = new ByteMatrix(1, 11);
+      matrix.set(0, 0, 1);
+      matrix.set(0, 1, 0);
+      matrix.set(0, 2, 1);
+      matrix.set(0, 3, 1);
+      matrix.set(0, 4, 1);
+      matrix.set(0, 5, 0);
+      matrix.set(0, 6, 1);
+      matrix.set(0, 7, 0);
+      matrix.set(0, 8, 0);
+      matrix.set(0, 9, 0);
+      matrix.set(0, 10, 0);
+      assertEquals(40, MaskUtil.applyMaskPenaltyRule3(matrix));
+    }
   }
 
   public void testApplyMaskPenaltyRule4() {
@@ -174,20 +174,20 @@ public final class MaskUtilTestCase extends TestCase {
     }
     {
       // Dark cell ratio = 5%
-      ByteMatrix matrix = new ByteMatrix(1, 2);
+      ByteMatrix matrix = new ByteMatrix(2, 1);
       matrix.set(0, 0, 0);
       matrix.set(0, 0, 1);
       assertEquals(0, MaskUtil.applyMaskPenaltyRule4(matrix));
     }
     {
       // Dark cell ratio = 66.67%
-      ByteMatrix matrix = new ByteMatrix(1, 6);
+      ByteMatrix matrix = new ByteMatrix(6, 1);
       matrix.set(0, 0, 0);
-      matrix.set(0, 1, 1);
-      matrix.set(0, 2, 1);
-      matrix.set(0, 3, 1);
-      matrix.set(0, 4, 1);
-      matrix.set(0, 5, 0);
+      matrix.set(1, 0, 1);
+      matrix.set(2, 0, 1);
+      matrix.set(3, 0, 1);
+      matrix.set(4, 0, 1);
+      matrix.set(5, 0, 0);
       assertEquals(30, MaskUtil.applyMaskPenaltyRule4(matrix));
     }
   }

diff --git a/core/test/src/com/google/zxing/qrcode/encoder/MatrixUtilTestCase.java b/core/test/src/com/google/zxing/qrcode/encoder/MatrixUtilTestCase.java
index f1965d6..12becfc 100644 (file)
--- a/core/test/src/com/google/zxing/qrcode/encoder/MatrixUtilTestCase.java
+++ b/core/test/src/com/google/zxing/qrcode/encoder/MatrixUtilTestCase.java
@@ -29,13 +29,13 @@ public final class MatrixUtilTestCase extends TestCase {
   public void testtoString() {
     ByteMatrix array = new ByteMatrix(3, 3);
     array.set(0, 0, 0);
-    array.set(0, 1, 1);
-    array.set(0, 2, 0);
     array.set(1, 0, 1);
+    array.set(2, 0, 0);
+    array.set(0, 1, 1);
     array.set(1, 1, 0);
-    array.set(1, 2, 1);
-    array.set(2, 0, -1);
-    array.set(2, 1, -1);
+    array.set(2, 1, 1);
+    array.set(0, 2, -1);
+    array.set(1, 2, -1);
     array.set(2, 2, -1);
     String expected = " 0 1 0\n" + " 1 0 1\n" + "      \n";
     assertEquals(expected, array.toString());
@@ -45,8 +45,8 @@ public final class MatrixUtilTestCase extends TestCase {
     ByteMatrix matrix = new ByteMatrix(2, 2);
     MatrixUtil.clearMatrix(matrix);
     assertEquals(-1, matrix.get(0, 0));
-    assertEquals(-1, matrix.get(0, 1));
     assertEquals(-1, matrix.get(1, 0));
+    assertEquals(-1, matrix.get(0, 1));
     assertEquals(-1, matrix.get(1, 1));
   }
 

diff --git a/core/test/src/com/google/zxing/qrcode/encoder/QRCodeTestCase.java b/core/test/src/com/google/zxing/qrcode/encoder/QRCodeTestCase.java
index 8166a8c..e17cf80 100644 (file)
--- a/core/test/src/com/google/zxing/qrcode/encoder/QRCodeTestCase.java
+++ b/core/test/src/com/google/zxing/qrcode/encoder/QRCodeTestCase.java
@@ -61,7 +61,7 @@ public final class QRCodeTestCase extends TestCase {
     // Just set bogus zero/one values.
     for (int y = 0; y < 45; ++y) {
       for (int x = 0; x < 45; ++x) {
-        matrix.set(y, x, (y + x) % 2);
+        matrix.set(x, y, (y + x) % 2);
       }
     }
 
@@ -146,7 +146,7 @@ public final class QRCodeTestCase extends TestCase {
       ByteMatrix matrix = new ByteMatrix(21, 21);
       for (int y = 0; y < 21; ++y) {
         for (int x = 0; x < 21; ++x) {
-          matrix.set(y, x, (y + x) % 2);
+          matrix.set(x, y, (y + x) % 2);
         }
       }
       qrCode.setMatrix(matrix);