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

port integration for pdf 417 1-3

Browse Source
This commit is contained in:
Henry Schimke
2022-12-26 14:22:37 -06:00
parent 3021c163d4
commit cba6a10c4b
7 changed files with 69 additions and 121 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/multi_format_reader.rs
View File

@@ -18,8 +18,9 @@ use std::collections::HashMap;
use crate::{
aztec::AztecReader, datamatrix::DataMatrixReader, maxicode::MaxiCodeReader,
oned::MultiFormatOneDReader, qrcode::QRCodeReader, BarcodeFormat, BinaryBitmap, DecodeHintType,
DecodeHintValue, DecodingHintDictionary, Exceptions, RXingResult, Reader,
oned::MultiFormatOneDReader, pdf417::PDF417Reader, qrcode::QRCodeReader, BarcodeFormat,
BinaryBitmap, DecodeHintType, DecodeHintValue, DecodingHintDictionary, Exceptions, RXingResult,
Reader,
};
/**
@@ -136,8 +137,7 @@ impl MultiFormatReader {
readers.push(Box::new(AztecReader {}));
}
if formats.contains(&BarcodeFormat::PDF_417) {
unimplemented!("");
// readers.push(new PDF417Reader());
readers.push(Box::new(PDF417Reader {}));
}
if formats.contains(&BarcodeFormat::MAXICODE) {
readers.push(Box::new(MaxiCodeReader {}));
@@ -150,19 +150,17 @@ impl MultiFormatReader {
if readers.is_empty() {
if !tryHarder {
readers.push(Box::new(MultiFormatOneDReader::new(hints)));
//TODO: ADD MultiformatOneDReader here
}
readers.push(Box::new(QRCodeReader {}));
readers.push(Box::new(DataMatrixReader {}));
readers.push(Box::new(AztecReader {}));
// readers.push( PDF417Reader());
readers.push(Box::new(PDF417Reader {}));
readers.push(Box::new(MaxiCodeReader {}));
// unimplemented!("");
if tryHarder {
readers.push(Box::new(MultiFormatOneDReader::new(hints)));
//TODO: ADD MultiformatOneDReader here
}
}
self.readers = readers; //Vec::new(); //readers.toArray(EMPTY_READER_ARRAY);

6
src/pdf417/decoder/pdf_417_scanning_decoder.rs
View File

@@ -803,7 +803,7 @@ fn adjustCodewordStartColumn(
{
return codewordStartColumn;
}
correctedStartColumn += increment as u32;
correctedStartColumn = (correctedStartColumn as i32 + increment) as u32;
}
increment = -increment;
leftToRight = !leftToRight;
@@ -893,7 +893,7 @@ fn getBitCountForCodeword(codeword: u32) -> [u32; 8] {
let mut codeword = codeword;
let mut result = [0; 8]; //new int[8];
let mut previousValue = 0;
let mut i = result.len() - 1;
let mut i = result.len() as isize - 1;
loop {
if (codeword & 0x1) != previousValue {
previousValue = codeword & 0x1;
@@ -902,7 +902,7 @@ fn getBitCountForCodeword(codeword: u32) -> [u32; 8] {
break;
}
}
result[i] += 1;
result[i as usize ] += 1;
codeword >>= 1;
}