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

1-3 integration sets pass

Browse Source
This commit is contained in:
Henry Schimke
2022-12-29 12:40:10 -06:00
parent 8e13f0e15a
commit 43c91900fe
1 changed files with 37 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
src/pdf417/decoder/detection_result.rs
View File

@@ -492,27 +492,31 @@ impl DetectionRXingResult {
codewordsColumn: usize, codewordsColumn: usize,
// codewords: &mut [Option<Codeword>], // codewords: &mut [Option<Codeword>],
) { ) {
let codewords = self.detectionRXingResultColumns[codewordsColumn] // let codewords = self.detectionRXingResultColumns[codewordsColumn]
// .as_mut()
// .unwrap()
// .getCodewordsMut();
let codewords_len = self.detectionRXingResultColumns[codewordsColumn]
.as_mut() .as_mut()
.unwrap() .unwrap()
.getCodewordsMut(); .getCodewordsMut()
.len();
let codewords_len = codewords.len(); // let codeword = &mut codewords[codewordsRow];
let codeword = &mut codewords[codewordsRow];
let previousColumnCodewords = self.detectionRXingResultColumns[barcodeColumn - 1] let previousColumnCodewords = self.detectionRXingResultColumns[barcodeColumn - 1]
.as_ref() .as_ref()
.unwrap() .unwrap()
.getCodewords(); .getCodewords().to_vec();
let mut nextColumnCodewords = previousColumnCodewords; let mut nextColumnCodewords = previousColumnCodewords.clone();
if self.detectionRXingResultColumns[barcodeColumn + 1].is_some() { if self.detectionRXingResultColumns[barcodeColumn + 1].is_some() {
nextColumnCodewords = self.detectionRXingResultColumns[barcodeColumn + 1] nextColumnCodewords = self.detectionRXingResultColumns[barcodeColumn + 1]
.as_ref() .as_ref()
.unwrap() .unwrap()
.getCodewords(); //col.getCodewords(); .getCodewords().to_vec(); //col.getCodewords();
} }
// if (self.detectionRXingResultColumns[barcodeColumn + 1] != null) { // if (self.detectionRXingResultColumns[barcodeColumn + 1] != null) {
// nextColumnCodewords = self.detectionRXingResultColumns[barcodeColumn + 1].getCodewords(); // nextColumnCodewords = self.detectionRXingResultColumns[barcodeColumn + 1].getCodewords();
@@ -524,27 +528,47 @@ impl DetectionRXingResult {
otherCodewords[3] = nextColumnCodewords[codewordsRow]; otherCodewords[3] = nextColumnCodewords[codewordsRow];
if codewordsRow > 0 { if codewordsRow > 0 {
otherCodewords[0] = codewords[codewordsRow - 1]; otherCodewords[0] = self.detectionRXingResultColumns[codewordsColumn]
.as_mut()
.unwrap()
.getCodewordsMut()[codewordsRow - 1];
otherCodewords[4] = previousColumnCodewords[codewordsRow - 1]; otherCodewords[4] = previousColumnCodewords[codewordsRow - 1];
otherCodewords[5] = nextColumnCodewords[codewordsRow - 1]; otherCodewords[5] = nextColumnCodewords[codewordsRow - 1];
} }
if codewordsRow > 1 { if codewordsRow > 1 {
otherCodewords[8] = codewords[codewordsRow - 2]; otherCodewords[8] = self.detectionRXingResultColumns[codewordsColumn]
.as_mut()
.unwrap()
.getCodewordsMut()[codewordsRow - 2];
otherCodewords[10] = previousColumnCodewords[codewordsRow - 2]; otherCodewords[10] = previousColumnCodewords[codewordsRow - 2];
otherCodewords[11] = nextColumnCodewords[codewordsRow - 2]; otherCodewords[11] = nextColumnCodewords[codewordsRow - 2];
} }
if codewordsRow < codewords_len - 1 { if codewordsRow < codewords_len - 1 {
otherCodewords[1] = codewords[codewordsRow + 1]; otherCodewords[1] = self.detectionRXingResultColumns[codewordsColumn]
.as_mut()
.unwrap()
.getCodewordsMut()[codewordsRow + 1];
otherCodewords[6] = previousColumnCodewords[codewordsRow + 1]; otherCodewords[6] = previousColumnCodewords[codewordsRow + 1];
otherCodewords[7] = nextColumnCodewords[codewordsRow + 1]; otherCodewords[7] = nextColumnCodewords[codewordsRow + 1];
} }
if codewordsRow < codewords_len - 2 { if codewordsRow < codewords_len - 2 {
otherCodewords[9] = codewords[codewordsRow + 2]; otherCodewords[9] = self.detectionRXingResultColumns[codewordsColumn]
.as_mut()
.unwrap()
.getCodewordsMut()[codewordsRow + 2];
otherCodewords[12] = previousColumnCodewords[codewordsRow + 2]; otherCodewords[12] = previousColumnCodewords[codewordsRow + 2];
otherCodewords[13] = nextColumnCodewords[codewordsRow + 2]; otherCodewords[13] = nextColumnCodewords[codewordsRow + 2];
} }
for otherCodeword in otherCodewords { for otherCodeword in otherCodewords {
if Self::adjustRowNumber(codeword.as_mut().unwrap(), &otherCodeword) { if Self::adjustRowNumber(
self.detectionRXingResultColumns[codewordsColumn]
.as_mut()
.unwrap()
.getCodewordsMut()[codewordsRow]
.as_mut()
.unwrap(),
&otherCodeword,
) {
return; return;
} }
} }