ak/rxing
1
0
Fork 0
mirror of https://github.com/starovoid/rxing.git synced 2026-07-26 04:12: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

2
src/datamatrix/decoder/datamatrix_decoder.rs
View File

@@ -153,7 +153,7 @@ impl Decoder {
fn correctErrors(&self, codewordBytes: &mut [u8], numDataCodewords: u32) -> Result<()> {
let _numCodewords = codewordBytes.len();
// First read into an array of ints
// let codewordsInts = vec![0i32;numCodewords];
// let codewordsInts = vec![0;numCodewords];
// for i in 0..numCodewords {
// // for (int i = 0; i < numCodewords; i++) {
// codewordsInts[i] = codewordBytes[i];

2
src/datamatrix/decoder/decoded_bit_stream_parser.rs
View File

@@ -732,7 +732,7 @@ fn decodeBase256Segment(
result.append_string(
&encoding::all::ISO_8859_1
.decode(&bytes, encoding::DecoderTrap::Strict)
.map_err(|e| Exceptions::parse_with(e))?,
.map_err(Exceptions::parse_with)?,
);
byteSegments.push(bytes);

2
src/datamatrix/encoder/minimal_encoder.rs
View File

@@ -375,7 +375,7 @@ fn addEdges(
//We create 4 EDF edges, with 1, 2 3 or 4 characters length. The fourth normally doesn't have a latch to ASCII
//unless it is 2 characters away from the end of the input.
let mut i = 0u32;
let mut i: u32 = 0;
while i < 3 {
// for (i = 0; i < 3; i++) {
let pos = from + i;