Small style stuff

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

diff --git a/core/src/com/google/zxing/qrcode/encoder/MaskUtil.java b/core/src/com/google/zxing/qrcode/encoder/MaskUtil.java
index d99c68c..c7f3c48 100644 (file)
--- a/core/src/com/google/zxing/qrcode/encoder/MaskUtil.java
+++ b/core/src/com/google/zxing/qrcode/encoder/MaskUtil.java
@@ -16,8 +16,6 @@
 
 package com.google.zxing.qrcode.encoder;
 
-import com.google.zxing.common.ByteMatrix;
-
 /**
  * @author satorux@google.com (Satoru Takabayashi) - creator
  * @author dswitkin@google.com (Daniel Switkin) - ported from C++
@@ -39,8 +37,8 @@ public final class MaskUtil {
   public static int applyMaskPenaltyRule2(ByteMatrix matrix) {
     int penalty = 0;
     byte[][] array = matrix.getArray();
-    int width = matrix.width();
-    int height = matrix.height();
+    int width = matrix.getWidth();
+    int height = matrix.getHeight();
     for (int y = 0; y < height - 1; ++y) {
       for (int x = 0; x < width - 1; ++x) {
         int value = array[y][x];
@@ -58,8 +56,8 @@ public final class MaskUtil {
   public static int applyMaskPenaltyRule3(ByteMatrix matrix) {
     int penalty = 0;
     byte[][] array = matrix.getArray();
-    int width = matrix.width();
-    int height = matrix.height();
+    int width = matrix.getWidth();
+    int height = matrix.getHeight();
     for (int y = 0; y < height; ++y) {
       for (int x = 0; x < width; ++x) {
         // Tried to simplify following conditions but failed.
@@ -120,8 +118,8 @@ public final class MaskUtil {
   public static int applyMaskPenaltyRule4(ByteMatrix matrix) {
     int numDarkCells = 0;
     byte[][] array = matrix.getArray();
-    int width = matrix.width();
-    int height = matrix.height();
+    int width = matrix.getWidth();
+    int height = matrix.getHeight();
     for (int y = 0; y < height; ++y) {
       for (int x = 0; x < width; ++x) {
         if (array[y][x] == 1) {
@@ -129,36 +127,50 @@ public final class MaskUtil {
         }
       }
     }
-    int numTotalCells = matrix.height() * matrix.width();
+    int numTotalCells = matrix.getHeight() * matrix.getWidth();
     double darkRatio = (double) numDarkCells / numTotalCells;
     return Math.abs((int) (darkRatio * 100 - 50)) / 5 * 10;
   }
 
   // Return the mask bit for "getMaskPattern" at "x" and "y". See 8.8 of JISX0510:2004 for mask
   // pattern conditions.
-  public static int getDataMaskBit(int maskPattern, int x, int y) {
+  public static boolean getDataMaskBit(int maskPattern, int x, int y) {
     if (!QRCode.isValidMaskPattern(maskPattern)) {
       throw new IllegalArgumentException("Invalid mask pattern");
     }
+    int intermediate, temp;
     switch (maskPattern) {
       case 0:
-        return ((y + x) % 2 == 0) ? 1 : 0;
+        intermediate = (y + x) & 0x1;
+        break;
       case 1:
-        return (y % 2 == 0) ? 1 : 0;
+        intermediate = y & 0x1;
+        break;
       case 2:
-        return (x % 3 == 0) ? 1 : 0;
+        intermediate = x % 3;
+        break;
       case 3:
-        return ((y + x) % 3 == 0) ? 1 : 0;
+        intermediate = (y + x) % 3;
+        break;
       case 4:
-        return (((y / 2) + (x / 3)) % 2 == 0) ? 1 : 0;
+        intermediate = ((y >>> 1) + (x / 3)) & 0x1;
+        break;
       case 5:
-        return (((y * x) % 2) + ((y * x) % 3) == 0) ? 1 : 0;
+        temp = y * x;
+        intermediate = (temp & 0x1) + (temp % 3);
+        break;
       case 6:
-        return ((((y * x) % 2) + ((y * x) % 3)) % 2 == 0) ? 1 : 0;
+        temp = y * x;
+        intermediate = (((temp & 0x1) + (temp % 3)) & 0x1);
+        break;
       case 7:
-        return ((((y * x) % 3) + ((y + x) % 2)) % 2 == 0) ? 1 : 0;
+        temp = y * x;
+        intermediate = (((temp % 3) + ((y + x) & 0x1)) & 0x1);
+        break;
+      default:
+        throw new IllegalArgumentException("Invalid mask pattern: " + maskPattern);
     }
-    throw new IllegalArgumentException("invalid mask pattern: " + maskPattern);
+    return intermediate == 0;
   }
 
   // Helper function for applyMaskPenaltyRule1. We need this for doing this calculation in both
@@ -175,8 +187,8 @@ public final class MaskUtil {
     //   for (int i = 0; i < matrix.width(); ++i) {
     //     for (int j = 0; j < matrix.height(); ++j) {
     //       int bit = matrix.get(j, i);
-    int iLimit = isHorizontal ? matrix.height() : matrix.width();
-    int jLimit = isHorizontal ? matrix.width() : matrix.height();
+    int iLimit = isHorizontal ? matrix.getHeight() : matrix.getWidth();
+    int jLimit = isHorizontal ? matrix.getWidth() : matrix.getHeight();
     byte[][] array = matrix.getArray();
     for (int i = 0; i < iLimit; ++i) {
       for (int j = 0; j < jLimit; ++j) {