Many more little tweaks from IntelliJ inspections

[zxing.git] / core / src / com / google / zxing / datamatrix / decoder / BitMatrixParser.java

diff --git a/core/src/com/google/zxing/datamatrix/decoder/BitMatrixParser.java b/core/src/com/google/zxing/datamatrix/decoder/BitMatrixParser.java
index a14eb95..f54e9c1 100644 (file)
--- a/core/src/com/google/zxing/datamatrix/decoder/BitMatrixParser.java
+++ b/core/src/com/google/zxing/datamatrix/decoder/BitMatrixParser.java
@@ -40,7 +40,7 @@ final class BitMatrixParser {
     }\r
     \r
     version = readVersion(bitMatrix);\r
-    this.mappingBitMatrix = extractDataRegion(bitMatrix, version);\r
+    this.mappingBitMatrix = extractDataRegion(bitMatrix);\r
     // TODO(bbrown): Make this work for rectangular symbols\r
     this.readMappingMatrix = new BitMatrix(this.mappingBitMatrix.getDimension());\r
   }\r
@@ -394,10 +394,9 @@ final class BitMatrixParser {
    * alignment patterns.</p>\r
    * \r
    * @param bitMatrix Original {@link BitMatrix} with alignment patterns\r
-   * @param version {@link Version} information corresponding with the bitMatrix\r
    * @return BitMatrix that has the alignment patterns removed\r
    */\r
-  BitMatrix extractDataRegion(BitMatrix bitMatrix, Version version) {\r
+  BitMatrix extractDataRegion(BitMatrix bitMatrix) {\r
     int symbolSizeRows = version.getSymbolSizeRows();\r
     int symbolSizeColumns = version.getSymbolSizeColumns();\r
     \r
@@ -413,32 +412,28 @@ final class BitMatrixParser {
     int numDataRegionsColumn = symbolSizeColumns / dataRegionSizeColumns;\r
     \r
     int sizeDataRegionRow = numDataRegionsRow * dataRegionSizeRows;\r
-    int sizeDataRegionColumn = numDataRegionsColumn * dataRegionSizeColumns;\r
+    //int sizeDataRegionColumn = numDataRegionsColumn * dataRegionSizeColumns;\r
     \r
     // TODO(bbrown): Make this work with rectangular codes\r
-    BitMatrix mappingBitMatrix = new BitMatrix(sizeDataRegionRow);\r
-    int readRowOffset = 0;\r
-    int readColumnOffset = 0;\r
-    int writeRowOffset = 0;\r
-    int writeColumnOffset = 0;\r
+    BitMatrix bitMatrixWithoutAlignment = new BitMatrix(sizeDataRegionRow);\r
     for (int dataRegionRow = 0; dataRegionRow < numDataRegionsRow; ++dataRegionRow) {\r
       for (int dataRegionColumn = 0; dataRegionColumn < numDataRegionsColumn; ++dataRegionColumn) {\r
         for (int i = 0; i < dataRegionSizeRows; ++i) {\r
           for (int j = 0; j < dataRegionSizeColumns; ++j) {\r
-            readRowOffset = dataRegionRow * (dataRegionSizeRows + 2) + 1 + i;\r
-            readColumnOffset = dataRegionColumn * (dataRegionSizeColumns + 2) + 1 + j;\r
-            writeRowOffset = dataRegionRow * dataRegionSizeRows + i;\r
-            writeColumnOffset = dataRegionColumn * dataRegionSizeColumns + j;\r
-            \r
+            int readRowOffset = dataRegionRow * (dataRegionSizeRows + 2) + 1 + i;\r
+            int readColumnOffset = dataRegionColumn * (dataRegionSizeColumns + 2) + 1 + j;\r
+            int writeRowOffset = dataRegionRow * dataRegionSizeRows + i;\r
+            int writeColumnOffset = dataRegionColumn * dataRegionSizeColumns + j;\r
+\r
             if (bitMatrix.get(readRowOffset, readColumnOffset)) {\r
-              mappingBitMatrix.set(writeRowOffset, writeColumnOffset);\r
+              bitMatrixWithoutAlignment.set(writeRowOffset, writeColumnOffset);\r
             }\r
           }\r
         }\r
       }\r
     }\r
     \r
-    return mappingBitMatrix;\r
+    return bitMatrixWithoutAlignment;\r
   }\r
 \r
 }
\ No newline at end of file