ak/rxing
1
0
Fork 0
mirror of https://github.com/starovoid/rxing.git synced 2026-07-26 20:32:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' into thiserror

Browse Source 
# 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
parent 35eb716813 f450c6e0f7
commit 51fcc98b34
36 changed files with 1452 additions and 145 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/aztec/decoder.rs
View File

@@ -162,7 +162,7 @@ fn get_encoded_data(corrected_bits: &[bool]) -> Result<String> {
result.push_str(
&encdr
.decode(&decoded_bytes, encoding::DecoderTrap::Strict)
.map_err(|a| Exceptions::illegal_state_with(a))?,
.map_err(Exceptions::illegal_state_with)?,
);
decoded_bytes.clear();
@@ -342,7 +342,7 @@ fn correct_bits(
}
let mut offset = rawbits.len() % codeword_size;
let mut data_words = vec![0i32; num_codewords];
let mut data_words = vec![0; num_codewords];
for word in data_words.iter_mut().take(num_codewords) {
// for i in 0..num_codewords {
// for (int i = 0; i < numCodewords; i++, offset += codewordSize) {