Issue 361

[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 849f5be..96032b4 100644 (file)
--- a/core/src/com/google/zxing/datamatrix/decoder/BitMatrixParser.java
+++ b/core/src/com/google/zxing/datamatrix/decoder/BitMatrixParser.java
@@ -33,7 +33,7 @@ final class BitMatrixParser {
    * @throws FormatException if dimension is < 10 or > 144 or not 0 mod 2\r
    */\r
   BitMatrixParser(BitMatrix bitMatrix) throws FormatException {\r
-    int dimension = bitMatrix.getDimension();\r
+    int dimension = bitMatrix.getHeight();\r
     if (dimension < 10 || dimension > 144 || (dimension & 0x01) != 0) {\r
       throw FormatException.getFormatInstance();\r
     }\r
@@ -41,7 +41,7 @@ final class BitMatrixParser {
     version = readVersion(bitMatrix);\r
     this.mappingBitMatrix = extractDataRegion(bitMatrix);\r
     // TODO(bbrown): Make this work for rectangular symbols\r
-    this.readMappingMatrix = new BitMatrix(this.mappingBitMatrix.getDimension());\r
+    this.readMappingMatrix = new BitMatrix(this.mappingBitMatrix.getHeight());\r
   }\r
 \r
   /**\r
@@ -62,7 +62,7 @@ final class BitMatrixParser {
     }\r
 \r
     // TODO(bbrown): make this work for rectangular dimensions as well.\r
-    int numRows = bitMatrix.getDimension();\r
+    int numRows = bitMatrix.getHeight();\r
     int numColumns = numRows;\r
     \r
     return Version.getVersionForDimensions(numRows, numColumns);\r
@@ -84,7 +84,7 @@ final class BitMatrixParser {
     int row = 4;\r
     int column = 0;\r
     // TODO(bbrown): Data Matrix can be rectangular, assuming square for now\r
-    int numRows = mappingBitMatrix.getDimension();\r
+    int numRows = mappingBitMatrix.getHeight();\r
     int numColumns = numRows;\r
     \r
     boolean corner1Read = false;\r
@@ -408,7 +408,7 @@ final class BitMatrixParser {
     int symbolSizeColumns = version.getSymbolSizeColumns();\r
     \r
     // TODO(bbrown): Make this work with rectangular codes\r
-    if (bitMatrix.getDimension() != symbolSizeRows) {\r
+    if (bitMatrix.getHeight() != symbolSizeRows) {\r
       throw new IllegalArgumentException("Dimension of bitMarix must match the version size");\r
     }\r
     \r