Merge branch 'main' into thiserror

# Conflicts:
#	src/aztec/decoder.rs
#	src/datamatrix/decoder/decoded_bit_stream_parser.rs
This commit is contained in:
Steve Cook
2023-03-01 13:39:30 -05:00
36 changed files with 1452 additions and 145 deletions

View File

@@ -446,7 +446,7 @@ fn generateCheckWords(bitArray: &BitArray, totalBits: usize, wordSize: usize) ->
}
fn bitsToWords(stuffedBits: &BitArray, wordSize: usize, totalWords: usize) -> Vec<i32> {
let mut message = vec![0i32; totalWords];
let mut message = vec![0; totalWords];
let mut i = 0;
let n = stuffedBits.getSize() / wordSize;
while i < n {

View File

@@ -196,7 +196,7 @@ impl HighLevelEncoder {
// shown
pub const SHIFT_TABLE: [[i32; 6]; 6] = {
// mode shift codes, per table
let mut shift_table = [[-1i32; 6]; 6];
let mut shift_table = [[-1; 6]; 6];
shift_table[Self::MODE_UPPER][Self::MODE_PUNCT] = 0;