BitMatrixParser.java (zxing-zxing-3.4.1) | : | BitMatrixParser.java (zxing-zxing-3.5.0) | ||
---|---|---|---|---|
skipping to change at line 129 | skipping to change at line 129 | |||
} | } | |||
row -= 2; | row -= 2; | |||
column += 2; | column += 2; | |||
} while ((row >= 0) && (column < numColumns)); | } while ((row >= 0) && (column < numColumns)); | |||
row += 1; | row += 1; | |||
column += 3; | column += 3; | |||
// Sweep downward diagonally to the left | // Sweep downward diagonally to the left | |||
do { | do { | |||
if ((row >= 0) && (column < numColumns) && !readMappingMatrix.get(colu mn, row)) { | if ((row >= 0) && (column < numColumns) && !readMappingMatrix.get(colu mn, row)) { | |||
result[resultOffset++] = (byte) readUtah(row, column, numRows, numC olumns); | result[resultOffset++] = (byte) readUtah(row, column, numRows, numCo lumns); | |||
} | } | |||
row += 2; | row += 2; | |||
column -= 2; | column -= 2; | |||
} while ((row < numRows) && (column >= 0)); | } while ((row < numRows) && (column >= 0)); | |||
row += 3; | row += 3; | |||
column += 1; | column += 1; | |||
} | } | |||
} while ((row < numRows) || (column < numColumns)); | } while ((row < numRows) || (column < numColumns)); | |||
if (resultOffset != version.getTotalCodewords()) { | if (resultOffset != version.getTotalCodewords()) { | |||
skipping to change at line 164 | skipping to change at line 164 | |||
private boolean readModule(int row, int column, int numRows, int numColumns) { | private boolean readModule(int row, int column, int numRows, int numColumns) { | |||
// Adjust the row and column indices based on boundary wrapping | // Adjust the row and column indices based on boundary wrapping | |||
if (row < 0) { | if (row < 0) { | |||
row += numRows; | row += numRows; | |||
column += 4 - ((numRows + 4) & 0x07); | column += 4 - ((numRows + 4) & 0x07); | |||
} | } | |||
if (column < 0) { | if (column < 0) { | |||
column += numColumns; | column += numColumns; | |||
row += 4 - ((numColumns + 4) & 0x07); | row += 4 - ((numColumns + 4) & 0x07); | |||
} | } | |||
if (row >= numRows) { | ||||
row -= numRows; | ||||
} | ||||
readMappingMatrix.set(column, row); | readMappingMatrix.set(column, row); | |||
return mappingBitMatrix.get(column, row); | return mappingBitMatrix.get(column, row); | |||
} | } | |||
/** | /** | |||
* <p>Reads the 8 bits of the standard Utah-shaped pattern.</p> | * <p>Reads the 8 bits of the standard Utah-shaped pattern.</p> | |||
* | * | |||
* <p>See ISO 16022:2006, 5.8.1 Figure 6</p> | * <p>See ISO 16022:2006, 5.8.1 Figure 6</p> | |||
* | * | |||
* @param row Current row in the mapping matrix, anchored at the 8th bit (LSB) of the pattern | * @param row Current row in the mapping matrix, anchored at the 8th bit (LSB) of the pattern | |||
End of changes. 2 change blocks. | ||||
1 lines changed or deleted | 4 lines changed or added |