Another attack on integrating encoder and decoder: Version is done. Attempted to...

[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 3c1c00c..d99c68c 100644 (file)
--- a/core/src/com/google/zxing/qrcode/encoder/MaskUtil.java
+++ b/core/src/com/google/zxing/qrcode/encoder/MaskUtil.java
@@ -28,26 +28,15 @@ public final class MaskUtil {
     // do nothing
   }
 
-  // The mask penalty calculation is complicated.  See Table 21 of JISX0510:2004 (p.45) for details.
-  // Basically it applies four rules and summate all penalties.
-  public static int calculateMaskPenalty(final ByteMatrix matrix) {
-    int penalty = 0;
-    penalty += applyMaskPenaltyRule1(matrix);
-    penalty += applyMaskPenaltyRule2(matrix);
-    penalty += applyMaskPenaltyRule3(matrix);
-    penalty += applyMaskPenaltyRule4(matrix);
-    return penalty;
-  }
-
   // Apply mask penalty rule 1 and return the penalty. Find repetitive cells with the same color and
   // give penalty to them. Example: 00000 or 11111.
-  public static int applyMaskPenaltyRule1(final ByteMatrix matrix) {
+  public static int applyMaskPenaltyRule1(ByteMatrix matrix) {
     return applyMaskPenaltyRule1Internal(matrix, true) + applyMaskPenaltyRule1Internal(matrix, false);
   }
 
   // Apply mask penalty rule 2 and return the penalty. Find 2x2 blocks with the same color and give
   // penalty to them.
-  public static int applyMaskPenaltyRule2(final ByteMatrix matrix) {
+  public static int applyMaskPenaltyRule2(ByteMatrix matrix) {
     int penalty = 0;
     byte[][] array = matrix.getArray();
     int width = matrix.width();
@@ -66,7 +55,7 @@ public final class MaskUtil {
   // Apply mask penalty rule 3 and return the penalty. Find consecutive cells of 00001011101 or
   // 10111010000, and give penalty to them.  If we find patterns like 000010111010000, we give
   // penalties twice (i.e. 40 * 2).
-  public static int applyMaskPenaltyRule3(final ByteMatrix matrix) {
+  public static int applyMaskPenaltyRule3(ByteMatrix matrix) {
     int penalty = 0;
     byte[][] array = matrix.getArray();
     int width = matrix.width();
@@ -128,7 +117,7 @@ public final class MaskUtil {
   // -  55% =>  10
   // -  55% =>  20
   // - 100% => 100
-  public static int applyMaskPenaltyRule4(final ByteMatrix matrix) {
+  public static int applyMaskPenaltyRule4(ByteMatrix matrix) {
     int numDarkCells = 0;
     byte[][] array = matrix.getArray();
     int width = matrix.width();
@@ -140,14 +129,14 @@ public final class MaskUtil {
         }
       }
     }
-    final int numTotalCells = matrix.height() * matrix.width();
+    int numTotalCells = matrix.height() * matrix.width();
     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(final int maskPattern, final int x, final int y) {
+  public static int getDataMaskBit(int maskPattern, int x, int y) {
     if (!QRCode.isValidMaskPattern(maskPattern)) {
       throw new IllegalArgumentException("Invalid mask pattern");
     }
@@ -174,7 +163,7 @@ public final class MaskUtil {
 
   // Helper function for applyMaskPenaltyRule1. We need this for doing this calculation in both
   // vertical and horizontal orders respectively.
-  private static int applyMaskPenaltyRule1Internal(final ByteMatrix matrix, boolean isHorizontal) {
+  private static int applyMaskPenaltyRule1Internal(ByteMatrix matrix, boolean isHorizontal) {
     int penalty = 0;
     int numSameBitCells = 0;
     int prevBit = -1;
@@ -186,12 +175,12 @@ 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);
-    final int iLimit = isHorizontal ? matrix.height() : matrix.width();
-    final int jLimit = isHorizontal ? matrix.width() : matrix.height();
+    int iLimit = isHorizontal ? matrix.height() : matrix.width();
+    int jLimit = isHorizontal ? matrix.width() : matrix.height();
     byte[][] array = matrix.getArray();
     for (int i = 0; i < iLimit; ++i) {
       for (int j = 0; j < jLimit; ++j) {
-        final int bit = isHorizontal ? array[i][j] : array[j][i];
+        int bit = isHorizontal ? array[i][j] : array[j][i];
         if (bit == prevBit) {
           numSameBitCells += 1;
           // Found five repetitive cells with the same color (bit).