this.readMappingMatrix = new BitMatrix(this.mappingBitMatrix.getWidth(), this.mappingBitMatrix.getHeight());\r
}\r
\r
+ Version getVersion() {\r
+ return version;\r
+ }\r
+\r
/**\r
* <p>Creates the version object based on the dimension of the original bit matrix from \r
* the datamatrix code.</p>\r
* @throws FormatException if the dimensions of the mapping matrix are not valid\r
* Data Matrix dimensions.\r
*/\r
- Version readVersion(BitMatrix bitMatrix) throws FormatException {\r
-\r
- if (version != null) {\r
- return version;\r
- }\r
-\r
+ private static Version readVersion(BitMatrix bitMatrix) throws FormatException {\r
int numRows = bitMatrix.getHeight();\r
int numColumns = bitMatrix.getWidth();\r
- \r
return Version.getVersionForDimensions(numRows, numColumns);\r
}\r
\r
int sizeDataRegionRow = numDataRegionsRow * dataRegionSizeRows;\r
int sizeDataRegionColumn = numDataRegionsColumn * dataRegionSizeColumns;\r
\r
- // TODO(bbrown): Make this work with rectangular codes\r
BitMatrix bitMatrixWithoutAlignment = new BitMatrix(sizeDataRegionColumn, sizeDataRegionRow);\r
for (int dataRegionRow = 0; dataRegionRow < numDataRegionsRow; ++dataRegionRow) {\r
int dataRegionRowOffset = dataRegionRow * dataRegionSizeRows;\r