\r
package com.google.zxing.datamatrix.decoder;\r
\r
-import com.google.zxing.ReaderException;\r
+import com.google.zxing.FormatException;\r
import com.google.zxing.common.BitMatrix;\r
\r
/**\r
\r
/**\r
* @param bitMatrix {@link BitMatrix} to parse\r
- * @throws ReaderException if dimension is < 10 or > 144 or not 0 mod 2\r
+ * @throws FormatException if dimension is < 8 or > 144 or not 0 mod 2\r
*/\r
- BitMatrixParser(BitMatrix bitMatrix) throws ReaderException {\r
- int dimension = bitMatrix.getDimension();\r
- if (dimension < 10 || dimension > 144 || (dimension & 0x01) != 0) {\r
- throw ReaderException.getInstance();\r
+ BitMatrixParser(BitMatrix bitMatrix) throws FormatException {\r
+ int dimension = bitMatrix.getHeight();\r
+ if (dimension < 8 || dimension > 144 || (dimension & 0x01) != 0) {\r
+ throw FormatException.getFormatInstance();\r
}\r
\r
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.getWidth(), this.mappingBitMatrix.getHeight());\r
+ }\r
+\r
+ Version getVersion() {\r
+ return version;\r
}\r
\r
/**\r
* \r
* @param bitMatrix Original {@link BitMatrix} including alignment patterns\r
* @return {@link Version} encapsulating the Data Matrix Code's "version"\r
- * @throws ReaderException if the dimensions of the mapping matrix are not valid\r
+ * @throws FormatException if the dimensions of the mapping matrix are not valid\r
* Data Matrix dimensions.\r
*/\r
- Version readVersion(BitMatrix bitMatrix) throws ReaderException {\r
-\r
- if (version != null) {\r
- return version;\r
- }\r
-\r
- // TODO(bbrown): make this work for rectangular dimensions as well.\r
- int numRows = bitMatrix.getDimension();\r
- int numColumns = numRows;\r
- \r
+ private static Version readVersion(BitMatrix bitMatrix) throws FormatException {\r
+ int numRows = bitMatrix.getHeight();\r
+ int numColumns = bitMatrix.getWidth();\r
return Version.getVersionForDimensions(numRows, numColumns);\r
}\r
\r
* Data Matrix Code.</p>\r
*\r
* @return bytes encoded within the Data Matrix Code\r
- * @throws ReaderException if the exact number of bytes expected is not read\r
+ * @throws FormatException if the exact number of bytes expected is not read\r
*/\r
- byte[] readCodewords() throws ReaderException {\r
+ byte[] readCodewords() throws FormatException {\r
\r
byte[] result = new byte[version.getTotalCodewords()];\r
int resultOffset = 0;\r
\r
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 numColumns = numRows;\r
+\r
+ int numRows = mappingBitMatrix.getHeight();\r
+ int numColumns = mappingBitMatrix.getWidth();\r
\r
boolean corner1Read = false;\r
boolean corner2Read = false;\r
} else {\r
// Sweep upward diagonally to the right\r
do {\r
- if ((row < numRows) && (column >= 0) && !readMappingMatrix.get(row, column)) {\r
+ if ((row < numRows) && (column >= 0) && !readMappingMatrix.get(column, row)) {\r
result[resultOffset++] = (byte) readUtah(row, column, numRows, numColumns);\r
}\r
row -= 2;\r
\r
// Sweep downward diagonally to the left\r
do {\r
- if ((row >= 0) && (column < numColumns) && !readMappingMatrix.get(row, column)) {\r
+ if ((row >= 0) && (column < numColumns) && !readMappingMatrix.get(column, row)) {\r
result[resultOffset++] = (byte) readUtah(row, column, numRows, numColumns);\r
}\r
row += 2;\r
} while ((row < numRows) || (column < numColumns));\r
\r
if (resultOffset != version.getTotalCodewords()) {\r
- throw ReaderException.getInstance();\r
+ throw FormatException.getFormatInstance();\r
}\r
return result;\r
}\r
column += numColumns;\r
row += 4 - ((numColumns + 4) & 0x07);\r
}\r
- readMappingMatrix.set(row, column);\r
- return mappingBitMatrix.get(row, column);\r
+ readMappingMatrix.set(column, row);\r
+ return mappingBitMatrix.get(column, row);\r
}\r
\r
/**\r
- * <p>Reads the 8 bits of the standard utah shaped pattern.</p>\r
+ * <p>Reads the 8 bits of the standard Utah-shaped pattern.</p>\r
* \r
* <p>See ISO 16022:2006, 5.8.1 Figure 6</p>\r
* \r
int symbolSizeRows = version.getSymbolSizeRows();\r
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
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 bitMatrixWithoutAlignment = new BitMatrix(sizeDataRegionRow);\r
+ BitMatrix bitMatrixWithoutAlignment = new BitMatrix(sizeDataRegionColumn, sizeDataRegionRow);\r
for (int dataRegionRow = 0; dataRegionRow < numDataRegionsRow; ++dataRegionRow) {\r
int dataRegionRowOffset = dataRegionRow * dataRegionSizeRows;\r
for (int dataRegionColumn = 0; dataRegionColumn < numDataRegionsColumn; ++dataRegionColumn) {\r
int writeRowOffset = dataRegionRowOffset + i;\r
for (int j = 0; j < dataRegionSizeColumns; ++j) {\r
int readColumnOffset = dataRegionColumn * (dataRegionSizeColumns + 2) + 1 + j;\r
- if (bitMatrix.get(readRowOffset, readColumnOffset)) {\r
+ if (bitMatrix.get(readColumnOffset, readRowOffset)) {\r
int writeColumnOffset = dataRegionColumnOffset + j;\r
- bitMatrixWithoutAlignment.set(writeRowOffset, writeColumnOffset);\r
+ bitMatrixWithoutAlignment.set(writeColumnOffset, writeRowOffset);\r
}\r
}\r
}\r
projects / zxing.git / blobdiff