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

zxing: fa19d4758f38daa5d0ea6557af9a64721cfcce07

Browse Source
This commit is contained in:
Henry Schimke
2023-01-09 09:43:04 -06:00
parent 2bc5e5464b
commit af9b5fc0ed
2 changed files with 17 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/pdf417/decoder/decoded_bit_stream_parser.rs
View File

@@ -277,25 +277,37 @@ pub fn decodeMacroBlock(
let mut segmentCount = ECIStringBuilder::new(); let mut segmentCount = ECIStringBuilder::new();
codeIndex = numericCompaction(codewords, codeIndex + 1, &mut segmentCount)?; codeIndex = numericCompaction(codewords, codeIndex + 1, &mut segmentCount)?;
segmentCount = segmentCount.build_result(); segmentCount = segmentCount.build_result();
resultMetadata.setSegmentCount(segmentCount.to_string().parse().unwrap()); let Ok(parsed_segment_count) = segmentCount.to_string().parse() else {
return Err(Exceptions::FormatException(None));
};
resultMetadata.setSegmentCount(parsed_segment_count);
} }
MACRO_PDF417_OPTIONAL_FIELD_TIME_STAMP => { MACRO_PDF417_OPTIONAL_FIELD_TIME_STAMP => {
let mut timestamp = ECIStringBuilder::new(); let mut timestamp = ECIStringBuilder::new();
codeIndex = numericCompaction(codewords, codeIndex + 1, &mut timestamp)?; codeIndex = numericCompaction(codewords, codeIndex + 1, &mut timestamp)?;
timestamp = timestamp.build_result(); timestamp = timestamp.build_result();
resultMetadata.setTimestamp(timestamp.to_string().parse().unwrap()); let Ok(parsed_timestamp) = timestamp.to_string().parse() else {
return Err(Exceptions::FormatException(None));
};
resultMetadata.setTimestamp(parsed_timestamp);
} }
MACRO_PDF417_OPTIONAL_FIELD_CHECKSUM => { MACRO_PDF417_OPTIONAL_FIELD_CHECKSUM => {
let mut checksum = ECIStringBuilder::new(); let mut checksum = ECIStringBuilder::new();
codeIndex = numericCompaction(codewords, codeIndex + 1, &mut checksum)?; codeIndex = numericCompaction(codewords, codeIndex + 1, &mut checksum)?;
checksum = checksum.build_result(); checksum = checksum.build_result();
resultMetadata.setChecksum(checksum.to_string().parse().unwrap()); let Ok(parsed_checksum ) = checksum.to_string().parse() else {
return Err(Exceptions::FormatException(None));
};
resultMetadata.setChecksum(parsed_checksum);
} }
MACRO_PDF417_OPTIONAL_FIELD_FILE_SIZE => { MACRO_PDF417_OPTIONAL_FIELD_FILE_SIZE => {
let mut fileSize = ECIStringBuilder::new(); let mut fileSize = ECIStringBuilder::new();
codeIndex = numericCompaction(codewords, codeIndex + 1, &mut fileSize)?; codeIndex = numericCompaction(codewords, codeIndex + 1, &mut fileSize)?;
fileSize = fileSize.build_result(); fileSize = fileSize.build_result();
resultMetadata.setFileSize(fileSize.to_string().parse().unwrap()); let Ok(parsed_file_size)= fileSize.to_string().parse()else {
return Err(Exceptions::FormatException(None));
};
resultMetadata.setFileSize(parsed_file_size);
} }
_ => return Err(Exceptions::FormatException(None)), _ => return Err(Exceptions::FormatException(None)),
} }

3
src/qrcode/QRCodeWriterTestCase.rs
View File

@@ -19,8 +19,7 @@ use std::{collections::HashMap, path::PathBuf};
use image::DynamicImage; use image::DynamicImage;
use crate::{ use crate::{
common::BitMatrix, qrcode::QRCodeWriter, BarcodeFormat, common::BitMatrix, qrcode::QRCodeWriter, BarcodeFormat, EncodeHintType, EncodeHintValue, Writer,
EncodeHintType, EncodeHintValue, Writer,
}; };
use super::decoder::ErrorCorrectionLevel; use super::decoder::ErrorCorrectionLevel;