Continuing with the x, y coordinate push, BitMatrix is now standardized. I also conve...

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

diff --git a/core/src/com/google/zxing/qrcode/decoder/DataMask.java b/core/src/com/google/zxing/qrcode/decoder/DataMask.java
index 40d07a5..31da35e 100755 (executable)
--- a/core/src/com/google/zxing/qrcode/decoder/DataMask.java
+++ b/core/src/com/google/zxing/qrcode/decoder/DataMask.java
@@ -56,16 +56,16 @@ abstract class DataMask {
    * @param dimension dimension of QR Code, represented by bits, being unmasked\r
    */\r
   final void unmaskBitMatrix(BitMatrix bits, int dimension) {\r
-    for (int y = 0; y < dimension; y++) {\r
-      for (int x = 0; x < dimension; x++) {\r
-        if (isMasked(x, y)) {\r
-          bits.flip(x, y);\r
+    for (int i = 0; i < dimension; i++) {\r
+      for (int j = 0; j < dimension; j++) {\r
+        if (isMasked(i, j)) {\r
+          bits.flip(j, i);\r
         }\r
       }\r
     }\r
   }\r
 \r
-  abstract boolean isMasked(int x, int y);\r
+  abstract boolean isMasked(int i, int j);\r
 \r
   /**\r
    * @param reference a value between 0 and 7 indicating one of the eight possible\r
@@ -83,8 +83,8 @@ abstract class DataMask {
    * 000: mask bits for which (x + y) mod 2 == 0\r
    */\r
   private static class DataMask000 extends DataMask {\r
-    boolean isMasked(int x, int y) {\r
-      return ((x + y) & 0x01) == 0;\r
+    boolean isMasked(int i, int j) {\r
+      return ((i + j) & 0x01) == 0;\r
     }\r
   }\r
 \r
@@ -92,8 +92,8 @@ abstract class DataMask {
    * 001: mask bits for which x mod 2 == 0\r
    */\r
   private static class DataMask001 extends DataMask {\r
-    boolean isMasked(int x, int y) {\r
-      return (x & 0x01) == 0;\r
+    boolean isMasked(int i, int j) {\r
+      return (i & 0x01) == 0;\r
     }\r
   }\r
 \r
@@ -101,8 +101,8 @@ abstract class DataMask {
    * 010: mask bits for which y mod 3 == 0\r
    */\r
   private static class DataMask010 extends DataMask {\r
-    boolean isMasked(int x, int y) {\r
-      return y % 3 == 0;\r
+    boolean isMasked(int i, int j) {\r
+      return j % 3 == 0;\r
     }\r
   }\r
 \r
@@ -110,8 +110,8 @@ abstract class DataMask {
    * 011: mask bits for which (x + y) mod 3 == 0\r
    */\r
   private static class DataMask011 extends DataMask {\r
-    boolean isMasked(int x, int y) {\r
-      return (x + y) % 3 == 0;\r
+    boolean isMasked(int i, int j) {\r
+      return (i + j) % 3 == 0;\r
     }\r
   }\r
 \r
@@ -119,8 +119,8 @@ abstract class DataMask {
    * 100: mask bits for which (x/2 + y/3) mod 2 == 0\r
    */\r
   private static class DataMask100 extends DataMask {\r
-    boolean isMasked(int x, int y) {\r
-      return (((x >>> 1) + (y/3)) & 0x01) == 0;\r
+    boolean isMasked(int i, int j) {\r
+      return (((i >>> 1) + (j /3)) & 0x01) == 0;\r
     }\r
   }\r
 \r
@@ -128,8 +128,8 @@ abstract class DataMask {
    * 101: mask bits for which xy mod 2 + xy mod 3 == 0\r
    */\r
   private static class DataMask101 extends DataMask {\r
-    boolean isMasked(int x, int y) {\r
-      int temp = x * y;\r
+    boolean isMasked(int i, int j) {\r
+      int temp = i * j;\r
       return (temp & 0x01) + (temp % 3) == 0;\r
     }\r
   }\r
@@ -138,18 +138,18 @@ abstract class DataMask {
    * 110: mask bits for which (xy mod 2 + xy mod 3) mod 2 == 0\r
    */\r
   private static class DataMask110 extends DataMask {\r
-    boolean isMasked(int x, int y) {\r
-      int temp = x * y;\r
+    boolean isMasked(int i, int j) {\r
+      int temp = i * j;\r
       return (((temp & 0x01) + (temp % 3)) & 0x01) == 0;\r
     }\r
   }\r
 \r
   /**\r
-   * 111: mask bits for which ((i+j)mod 2 + ij mod 3) mod 2 == 0\r
+   * 111: mask bits for which ((x+y)mod 2 + xy mod 3) mod 2 == 0\r
    */\r
   private static class DataMask111 extends DataMask {\r
-    boolean isMasked(int x, int y) {\r
-      return ((((x + y) & 0x01) + ((x * y) % 3)) & 0x01) == 0;\r
+    boolean isMasked(int i, int j) {\r
+      return ((((i + j) & 0x01) + ((i * j) % 3)) & 0x01) == 0;\r
     }\r
   }\r
 }\r