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

@@ -241,7 +241,7 @@ impl GlobalHistogramBinarizer {
// Find a valley between them that is low and closer to the white peak.
let mut bestValley = secondPeak - 1;
let mut bestValleyScore = -1i32;
let mut bestValleyScore = -1;
let mut x = secondPeak;
while x > firstPeak {
// for (int x = secondPeak - 1; x > firstPeak; x--) {