mirror of
https://github.com/starovoid/rxing.git
synced 2026-07-26 04:12:34 +00:00
Cleanup of many components of the code.
Many unwraps, expects, and panics removed or handled. More rustification of the codebase. Squashed commit of the following: commit 80c6483cf8c819496a7b781f9e3a149d1f18d5fe Author: Henry <henry@azule.info> Date: Fri Feb 10 20:36:57 2023 -0600 add other parsed result option commit 412d92ae585e7bf194697f5282dbc045e448bace Author: Henry <henry@azule.info> Date: Fri Feb 10 19:06:34 2023 -0600 fix some panics commit 9108d3e931aadec00fc0bf346ebc52d24e5d8146 Author: Henry <henry@azule.info> Date: Fri Feb 10 18:56:30 2023 -0600 clippy --fix commit 8cd89d314323f54f342f15fc73297b62d418ac79 Author: Henry <henry@azule.info> Date: Fri Feb 10 18:55:45 2023 -0600 some more cleanup in aztec commit fb7f9242e273b85a4bb212f22a185a0dcbfafc36 Author: Henry <henry@azule.info> Date: Fri Feb 10 18:19:54 2023 -0600 cleanup root commit 4fb7c0639830869149332b29be789e891eade3e7 Author: Henry Schimke <henry@azule.info> Date: Fri Feb 10 16:50:15 2023 -0600 format commit 3ac271af657b25fbe5ee39cbdf8859e5aa38ea41 Author: Henry Schimke <henry@azule.info> Date: Fri Feb 10 16:43:14 2023 -0600 clippy --fix commit 0c5b4c1477159db93a9da9645039f51cd1a7c574 Author: Henry Schimke <henry@azule.info> Date: Fri Feb 10 16:04:31 2023 -0600 qrcode cleanup complete commit 70c1d107cc672e45d46567c650c46fece7e7da9c Author: Henry Schimke <henry@azule.info> Date: Fri Feb 10 13:28:25 2023 -0600 clippy --fix commit e13263d0f1f2a13dbb59b6e60d8b871a32babc92 Author: Henry Schimke <henry@azule.info> Date: Fri Feb 10 13:27:44 2023 -0600 qrcode detector cleanup commit f7f2855099e469fe1091868c6099196705d0ae83 Author: Henry Schimke <henry@azule.info> Date: Fri Feb 10 11:48:13 2023 -0600 qrcode decoder commit bdbaaba597b3479639c2ed3726465a69e3004471 Author: Henry Schimke <henry@azule.info> Date: Fri Feb 10 11:13:18 2023 -0600 clippy --fix commit fd6dbcaeb1f45dc91ae98f0e7c58aad48d67df78 Author: Henry Schimke <henry@azule.info> Date: Fri Feb 10 11:12:28 2023 -0600 pdf417 cleanup complete commit 7bbd47604c2639a5eb61bdb5533e71be3bce95a1 Author: Henry Schimke <henry@azule.info> Date: Fri Feb 10 10:39:28 2023 -0600 clippy --fix commit 8f4962b7bb5f133524fe4d3d4948e5672a88c545 Author: Henry Schimke <henry@azule.info> Date: Fri Feb 10 10:39:00 2023 -0600 cleanup on pdf417 hie commit 254c8243953776d3c8704dd81529aadd05d5a94e Author: Henry <henry@azule.info> Date: Fri Feb 10 02:51:21 2023 +0000 partway through pdf417 hle commit d4a5b00fde8c0282b0c6e4175a21c1e111b11533 Author: Henry <henry@azule.info> Date: Wed Feb 8 21:35:25 2023 +0000 clippy --fix commit 2bd4a8e218aa963a88997b50bc5a198f9a88205e Author: Henry <henry@azule.info> Date: Wed Feb 8 21:31:55 2023 +0000 pdf417 decode and detect cleanup commit 05130ac54a72c2303045d64507bf6185aa74e531 Author: Henry Schimke <henry@azule.info> Date: Tue Feb 7 08:06:25 2023 -0600 at decodeTextCompaction in decoded_bit_straem_parser commit 924c023a7d2339dfffa6ef0c4a805fb192576796 Author: Henry Schimke <henry@azule.info> Date: Mon Feb 6 18:22:02 2023 -0600 clippy --fix commit 5cfb81a885c22b4b5ec937a79be31d0815def211 Author: Henry Schimke <henry@azule.info> Date: Mon Feb 6 18:20:22 2023 -0600 oned cleanup commit 0649b64854baf56a8e3314728d4f6cf4063db8b2 Author: Henry Schimke <henry@azule.info> Date: Mon Feb 6 11:47:28 2023 -0600 rss cleanup commit 2d3127898fc11f7e65d590e983cda799b798b646 Author: Henry Schimke <henry@azule.info> Date: Mon Feb 6 10:19:56 2023 -0600 multi cleanup commit 7e8b43a159083a2096123e6204d4d1d359c59981 Author: Henry <henry@azule.info> Date: Sun Feb 5 21:41:59 2023 -0600 cargo fmt commit df8285e8da07b4bffd48ca6e596de3f010eb8d9e Author: Henry <henry@azule.info> Date: Sun Feb 5 21:41:29 2023 -0600 maxicode cleanup commit a51f923a14016eb416ca202b2194258808dde3e7 Author: Henry <henry@azule.info> Date: Sun Feb 5 21:27:57 2023 -0600 cargo fmt commit 332d7eef4a25318611025a3fcb0b70c604d917be Author: Henry <henry@azule.info> Date: Sun Feb 5 21:27:48 2023 -0600 cleanup datamatrix commit eb2311c476a9c9993f271ab6cf9fd359aedca26f Author: Henry <henry@azule.info> Date: Sun Feb 5 21:27:26 2023 -0600 cargo clippy --fix commit 2abaa4c51d287f619d4c7a438f85ba2a30f159cf Author: Henry <henry@azule.info> Date: Sun Feb 5 19:13:02 2023 -0600 finish cleanup in parsers commit 716aa2fbf728716cff36657a5fd80e7bca5276b7 Author: Henry Schimke <henry@azule.info> Date: Sun Feb 5 17:44:56 2023 -0600 cleanup continues commit 7d843788a49fa9cc82c4616d226c0f882e73612b Author: Henry Schimke <henry@azule.info> Date: Sun Feb 5 15:15:09 2023 -0600 common cleanup commit fd251866c68f22d450dd428c93d7a3620bf1be27 Author: Henry Schimke <henry@azule.info> Date: Sun Feb 5 10:24:54 2023 -0600 cleanup reedsolomon commit 132e27ed1468f5c1ce998516ff5a00687217c3e6 Author: Henry Schimke <henry@azule.info> Date: Sun Feb 5 09:52:04 2023 -0600 make MathUtils more generic commit d8352b7fff4cb4f9ecc8e8a969710d26ef410e8b Author: Henry Schimke <henry@azule.info> Date: Sun Feb 5 09:29:33 2023 -0600 cleanup some string handling in ResultParser There may still be some edge cases where multi-byte characters break the parser
This commit is contained in:
Henry
@@ -62,6 +62,8 @@ const MACRO_PDF417_OPTIONAL_FIELD_ADDRESSEE: u32 = 4;
|
||||
const MACRO_PDF417_OPTIONAL_FIELD_FILE_SIZE: u32 = 5;
|
||||
const MACRO_PDF417_OPTIONAL_FIELD_CHECKSUM: u32 = 6;
|
||||
|
||||
const PRE_TEXT_COMPACTION_MODE_LATCH: u32 = TEXT_COMPACTION_MODE_LATCH - 1;
|
||||
|
||||
const PL: u32 = 25;
|
||||
const LL: u32 = 27;
|
||||
const AS: u32 = 27;
|
||||
@@ -89,12 +91,11 @@ use once_cell::sync::Lazy;
|
||||
static EXP900: Lazy<Vec<BigUint>> = Lazy::new(|| {
|
||||
const EXP_LEN: usize = 16;
|
||||
let mut exp900 = Vec::with_capacity(EXP_LEN); //[0;16];
|
||||
exp900.push(ToBigUint::to_biguint(&1).unwrap());
|
||||
let nineHundred = ToBigUint::to_biguint(&900).unwrap();
|
||||
exp900.push(ToBigUint::to_biguint(&1).unwrap_or_default());
|
||||
let nineHundred = ToBigUint::to_biguint(&900).unwrap_or_default();
|
||||
exp900.push(nineHundred);
|
||||
let mut i = 2;
|
||||
while i < EXP_LEN {
|
||||
// for (int i = 2; i < EXP900.length; i++) {
|
||||
exp900.push(&exp900[i - 1] * 900_u32);
|
||||
|
||||
i += 1;
|
||||
@@ -103,28 +104,6 @@ static EXP900: Lazy<Vec<BigUint>> = Lazy::new(|| {
|
||||
exp900
|
||||
});
|
||||
|
||||
// /**
|
||||
// * Table containing values for the exponent of 900.
|
||||
// * This is used in the numeric compaction decode algorithm.
|
||||
// */
|
||||
// const EXP900 : [u128;16] =
|
||||
|
||||
// {
|
||||
// let mut exp900 = [0;16];
|
||||
// exp900[0] = 1;
|
||||
// let nineHundred = 900;
|
||||
// exp900[1] = nineHundred;
|
||||
// let mut i = 2;
|
||||
// while i < exp900.len() {
|
||||
// // for (int i = 2; i < EXP900.length; i++) {
|
||||
// exp900[i] = exp900[i - 1] * (nineHundred);
|
||||
|
||||
// i+=1;
|
||||
// }
|
||||
|
||||
// exp900
|
||||
// };
|
||||
|
||||
const NUMBER_OF_SEQUENCE_CODEWORDS: usize = 2;
|
||||
|
||||
pub fn decode(codewords: &[u32], ecLevel: &str) -> Result<DecoderRXingResult, Exceptions> {
|
||||
@@ -142,7 +121,9 @@ pub fn decode(codewords: &[u32], ecLevel: &str) -> Result<DecoderRXingResult, Ex
|
||||
codeIndex = byteCompaction(code, codewords, codeIndex, &mut result)?
|
||||
}
|
||||
MODE_SHIFT_TO_BYTE_COMPACTION_MODE => {
|
||||
result.append_char(char::from_u32(codewords[codeIndex]).unwrap());
|
||||
result.append_char(
|
||||
char::from_u32(codewords[codeIndex]).ok_or(Exceptions::ParseException(None))?,
|
||||
);
|
||||
codeIndex += 1;
|
||||
}
|
||||
NUMERIC_COMPACTION_MODE_LATCH => {
|
||||
@@ -212,7 +193,6 @@ pub fn decodeMacroBlock(
|
||||
.iter_mut()
|
||||
.take(NUMBER_OF_SEQUENCE_CODEWORDS)
|
||||
{
|
||||
// for (int i = 0; i < NUMBER_OF_SEQUENCE_CODEWORDS; i++, codeIndex++) {
|
||||
*seq = codewords[codeIndex];
|
||||
codeIndex += 1;
|
||||
}
|
||||
@@ -304,7 +284,7 @@ pub fn decodeMacroBlock(
|
||||
let mut fileSize = ECIStringBuilder::new();
|
||||
codeIndex = numericCompaction(codewords, codeIndex + 1, &mut fileSize)?;
|
||||
fileSize = fileSize.build_result();
|
||||
let Ok(parsed_file_size)= fileSize.to_string().parse()else {
|
||||
let Ok(parsed_file_size)= fileSize.to_string().parse() else {
|
||||
return Err(Exceptions::FormatException(None));
|
||||
};
|
||||
resultMetadata.setFileSize(parsed_file_size);
|
||||
@@ -327,8 +307,7 @@ pub fn decodeMacroBlock(
|
||||
// do not include terminator
|
||||
optionalFieldsLength -= 1;
|
||||
}
|
||||
// resultMetadata.setOptionalData(
|
||||
// Arrays.copyOfRange(codewords, optionalFieldsStart, optionalFieldsStart + optionalFieldsLength));
|
||||
|
||||
resultMetadata.setOptionalData(
|
||||
codewords[optionalFieldsStart as usize
|
||||
..(optionalFieldsStart + optionalFieldsLength as isize) as usize]
|
||||
@@ -363,58 +342,60 @@ fn textCompaction(
|
||||
let mut index = 0;
|
||||
let mut end = false;
|
||||
let mut subMode = Mode::Alpha;
|
||||
|
||||
while (codeIndex < codewords[0] as usize) && !end {
|
||||
let mut code = codewords[codeIndex];
|
||||
codeIndex += 1;
|
||||
if code < TEXT_COMPACTION_MODE_LATCH {
|
||||
textCompactionData[index] = code / 30;
|
||||
textCompactionData[index + 1] = code % 30;
|
||||
index += 2;
|
||||
} else {
|
||||
match code {
|
||||
TEXT_COMPACTION_MODE_LATCH => {
|
||||
// reinitialize text compaction mode to alpha sub mode
|
||||
textCompactionData[index] = TEXT_COMPACTION_MODE_LATCH;
|
||||
index += 1;
|
||||
}
|
||||
BYTE_COMPACTION_MODE_LATCH
|
||||
| BYTE_COMPACTION_MODE_LATCH_6
|
||||
| NUMERIC_COMPACTION_MODE_LATCH
|
||||
| BEGIN_MACRO_PDF417_CONTROL_BLOCK
|
||||
| BEGIN_MACRO_PDF417_OPTIONAL_FIELD
|
||||
| MACRO_PDF417_TERMINATOR => {
|
||||
codeIndex -= 1;
|
||||
end = true;
|
||||
}
|
||||
MODE_SHIFT_TO_BYTE_COMPACTION_MODE => {
|
||||
// The Mode Shift codeword 913 shall cause a temporary
|
||||
// switch from Text Compaction mode to Byte Compaction Mode::
|
||||
// This switch shall be in effect for only the next codeword,
|
||||
// after which the mode shall revert to the prevailing sub-mode
|
||||
// of the Text Compaction Mode:: Codeword 913 is only available
|
||||
// in Text Compaction mode; its use is described in 5.4.2.4.
|
||||
textCompactionData[index] = MODE_SHIFT_TO_BYTE_COMPACTION_MODE;
|
||||
code = codewords[codeIndex];
|
||||
codeIndex += 1;
|
||||
byteCompactionData[index] = code;
|
||||
index += 1;
|
||||
}
|
||||
ECI_CHARSET => {
|
||||
subMode = decodeTextCompaction(
|
||||
&textCompactionData,
|
||||
&byteCompactionData,
|
||||
index,
|
||||
result,
|
||||
subMode,
|
||||
);
|
||||
result.appendECI(codewords[codeIndex])?;
|
||||
codeIndex += 1;
|
||||
textCompactionData = vec![0; (codewords[0] as usize - codeIndex) * 2];
|
||||
byteCompactionData = vec![0; (codewords[0] as usize - codeIndex) * 2];
|
||||
index = 0;
|
||||
}
|
||||
_ => {}
|
||||
|
||||
match code {
|
||||
..=PRE_TEXT_COMPACTION_MODE_LATCH => {
|
||||
textCompactionData[index] = code / 30;
|
||||
textCompactionData[index + 1] = code % 30;
|
||||
index += 2;
|
||||
}
|
||||
TEXT_COMPACTION_MODE_LATCH => {
|
||||
// reinitialize text compaction mode to alpha sub mode
|
||||
textCompactionData[index] = TEXT_COMPACTION_MODE_LATCH;
|
||||
index += 1;
|
||||
}
|
||||
BYTE_COMPACTION_MODE_LATCH
|
||||
| BYTE_COMPACTION_MODE_LATCH_6
|
||||
| NUMERIC_COMPACTION_MODE_LATCH
|
||||
| BEGIN_MACRO_PDF417_CONTROL_BLOCK
|
||||
| BEGIN_MACRO_PDF417_OPTIONAL_FIELD
|
||||
| MACRO_PDF417_TERMINATOR => {
|
||||
codeIndex -= 1;
|
||||
end = true;
|
||||
}
|
||||
MODE_SHIFT_TO_BYTE_COMPACTION_MODE => {
|
||||
// The Mode Shift codeword 913 shall cause a temporary
|
||||
// switch from Text Compaction mode to Byte Compaction Mode::
|
||||
// This switch shall be in effect for only the next codeword,
|
||||
// after which the mode shall revert to the prevailing sub-mode
|
||||
// of the Text Compaction Mode:: Codeword 913 is only available
|
||||
// in Text Compaction mode; its use is described in 5.4.2.4.
|
||||
textCompactionData[index] = MODE_SHIFT_TO_BYTE_COMPACTION_MODE;
|
||||
code = codewords[codeIndex];
|
||||
codeIndex += 1;
|
||||
byteCompactionData[index] = code;
|
||||
index += 1;
|
||||
}
|
||||
ECI_CHARSET => {
|
||||
subMode = decodeTextCompaction(
|
||||
&textCompactionData,
|
||||
&byteCompactionData,
|
||||
index,
|
||||
result,
|
||||
subMode,
|
||||
)
|
||||
.ok_or(Exceptions::IllegalStateException(None))?;
|
||||
result.appendECI(codewords[codeIndex])?;
|
||||
codeIndex += 1;
|
||||
textCompactionData = vec![0; (codewords[0] as usize - codeIndex) * 2];
|
||||
byteCompactionData = vec![0; (codewords[0] as usize - codeIndex) * 2];
|
||||
index = 0;
|
||||
}
|
||||
_ => {}
|
||||
}
|
||||
}
|
||||
decodeTextCompaction(
|
||||
@@ -452,7 +433,7 @@ fn decodeTextCompaction(
|
||||
length: usize,
|
||||
result: &mut ECIStringBuilder,
|
||||
startMode: Mode,
|
||||
) -> Mode {
|
||||
) -> Option<Mode> {
|
||||
// Beginning from an initial state
|
||||
// The default compaction mode for PDF417 in effect at the start of each symbol shall always be Text
|
||||
// Compaction mode Alpha sub-mode (uppercase alphabetic). A latch codeword from another mode to the Text
|
||||
@@ -461,6 +442,8 @@ fn decodeTextCompaction(
|
||||
let mut priorToShiftMode = startMode;
|
||||
let mut latchedMode = startMode;
|
||||
let mut i = 0;
|
||||
const PRE_PL: u32 = PL - 1;
|
||||
const PRE_PAL: u32 = PAL - 1;
|
||||
while i < length {
|
||||
let subModeCh = textCompactionData[i];
|
||||
let mut ch = 0 as char;
|
||||
@@ -468,153 +451,137 @@ fn decodeTextCompaction(
|
||||
Mode::Alpha =>
|
||||
// Alpha (uppercase alphabetic)
|
||||
{
|
||||
if subModeCh < 26 {
|
||||
match subModeCh {
|
||||
// Upper case Alpha Character
|
||||
ch = char::from_u32('A' as u32 + subModeCh).unwrap();
|
||||
} else {
|
||||
match subModeCh {
|
||||
26 => ch = ' ',
|
||||
LL => {
|
||||
subMode = Mode::Lower;
|
||||
latchedMode = subMode;
|
||||
}
|
||||
ML => {
|
||||
subMode = Mode::Mixed;
|
||||
latchedMode = subMode;
|
||||
}
|
||||
PS => {
|
||||
// Shift to punctuation
|
||||
priorToShiftMode = subMode;
|
||||
subMode = Mode::PunctShift;
|
||||
}
|
||||
MODE_SHIFT_TO_BYTE_COMPACTION_MODE => {
|
||||
result.append_char(char::from_u32(byteCompactionData[i]).unwrap())
|
||||
}
|
||||
TEXT_COMPACTION_MODE_LATCH => {
|
||||
subMode = Mode::Alpha;
|
||||
latchedMode = subMode;
|
||||
}
|
||||
_ => {}
|
||||
0..=25 => ch = char::from_u32('A' as u32 + subModeCh)?,
|
||||
26 => ch = ' ',
|
||||
LL => {
|
||||
subMode = Mode::Lower;
|
||||
latchedMode = subMode;
|
||||
}
|
||||
ML => {
|
||||
subMode = Mode::Mixed;
|
||||
latchedMode = subMode;
|
||||
}
|
||||
PS => {
|
||||
// Shift to punctuation
|
||||
priorToShiftMode = subMode;
|
||||
subMode = Mode::PunctShift;
|
||||
}
|
||||
MODE_SHIFT_TO_BYTE_COMPACTION_MODE => {
|
||||
result.append_char(char::from_u32(byteCompactionData[i])?)
|
||||
}
|
||||
TEXT_COMPACTION_MODE_LATCH => {
|
||||
subMode = Mode::Alpha;
|
||||
latchedMode = subMode;
|
||||
}
|
||||
_ => {}
|
||||
}
|
||||
}
|
||||
|
||||
Mode::Lower =>
|
||||
// Lower (lowercase alphabetic)
|
||||
{
|
||||
if subModeCh < 26 {
|
||||
ch = char::from_u32('a' as u32 + subModeCh).unwrap();
|
||||
} else {
|
||||
match subModeCh {
|
||||
26 => ch = ' ',
|
||||
AS => {
|
||||
// Shift to alpha
|
||||
priorToShiftMode = subMode;
|
||||
subMode = Mode::AlphaShift;
|
||||
}
|
||||
ML => {
|
||||
subMode = Mode::Mixed;
|
||||
latchedMode = subMode;
|
||||
}
|
||||
PS => {
|
||||
// Shift to punctuation
|
||||
priorToShiftMode = subMode;
|
||||
subMode = Mode::PunctShift;
|
||||
}
|
||||
MODE_SHIFT_TO_BYTE_COMPACTION_MODE => {
|
||||
result.append_char(char::from_u32(byteCompactionData[i]).unwrap())
|
||||
}
|
||||
TEXT_COMPACTION_MODE_LATCH => {
|
||||
subMode = Mode::Alpha;
|
||||
latchedMode = subMode;
|
||||
}
|
||||
_ => {}
|
||||
match subModeCh {
|
||||
..=25 => ch = char::from_u32('a' as u32 + subModeCh)?,
|
||||
26 => ch = ' ',
|
||||
AS => {
|
||||
// Shift to alpha
|
||||
priorToShiftMode = subMode;
|
||||
subMode = Mode::AlphaShift;
|
||||
}
|
||||
ML => {
|
||||
subMode = Mode::Mixed;
|
||||
latchedMode = subMode;
|
||||
}
|
||||
PS => {
|
||||
// Shift to punctuation
|
||||
priorToShiftMode = subMode;
|
||||
subMode = Mode::PunctShift;
|
||||
}
|
||||
MODE_SHIFT_TO_BYTE_COMPACTION_MODE => {
|
||||
result.append_char(char::from_u32(byteCompactionData[i])?)
|
||||
}
|
||||
TEXT_COMPACTION_MODE_LATCH => {
|
||||
subMode = Mode::Alpha;
|
||||
latchedMode = subMode;
|
||||
}
|
||||
_ => {}
|
||||
}
|
||||
}
|
||||
|
||||
Mode::Mixed =>
|
||||
// Mixed (numeric and some punctuation)
|
||||
{
|
||||
if subModeCh < PL {
|
||||
ch = MIXED_CHARS[subModeCh as usize];
|
||||
} else {
|
||||
match subModeCh {
|
||||
PL => {
|
||||
subMode = Mode::Punct;
|
||||
latchedMode = subMode;
|
||||
}
|
||||
26 => ch = ' ',
|
||||
LL => {
|
||||
subMode = Mode::Lower;
|
||||
latchedMode = subMode;
|
||||
}
|
||||
AL | TEXT_COMPACTION_MODE_LATCH => {
|
||||
subMode = Mode::Alpha;
|
||||
latchedMode = subMode;
|
||||
}
|
||||
PS => {
|
||||
// Shift to punctuation
|
||||
priorToShiftMode = subMode;
|
||||
subMode = Mode::PunctShift;
|
||||
}
|
||||
MODE_SHIFT_TO_BYTE_COMPACTION_MODE => {
|
||||
result.append_char(char::from_u32(byteCompactionData[i]).unwrap())
|
||||
}
|
||||
_ => {}
|
||||
match subModeCh {
|
||||
0..=PRE_PL => ch = MIXED_CHARS[subModeCh as usize],
|
||||
PL => {
|
||||
subMode = Mode::Punct;
|
||||
latchedMode = subMode;
|
||||
}
|
||||
26 => ch = ' ',
|
||||
LL => {
|
||||
subMode = Mode::Lower;
|
||||
latchedMode = subMode;
|
||||
}
|
||||
AL | TEXT_COMPACTION_MODE_LATCH => {
|
||||
subMode = Mode::Alpha;
|
||||
latchedMode = subMode;
|
||||
}
|
||||
PS => {
|
||||
// Shift to punctuation
|
||||
priorToShiftMode = subMode;
|
||||
subMode = Mode::PunctShift;
|
||||
}
|
||||
MODE_SHIFT_TO_BYTE_COMPACTION_MODE => {
|
||||
result.append_char(char::from_u32(byteCompactionData[i])?)
|
||||
}
|
||||
_ => {}
|
||||
}
|
||||
}
|
||||
|
||||
Mode::Punct =>
|
||||
// Punctuation
|
||||
{
|
||||
if subModeCh < PAL {
|
||||
ch = PUNCT_CHARS[subModeCh as usize];
|
||||
} else {
|
||||
match subModeCh {
|
||||
PAL | TEXT_COMPACTION_MODE_LATCH => {
|
||||
subMode = Mode::Alpha;
|
||||
latchedMode = subMode;
|
||||
}
|
||||
MODE_SHIFT_TO_BYTE_COMPACTION_MODE => {
|
||||
result.append_char(char::from_u32(byteCompactionData[i]).unwrap())
|
||||
}
|
||||
_ => {}
|
||||
match subModeCh {
|
||||
..=PRE_PAL => ch = PUNCT_CHARS[subModeCh as usize],
|
||||
PAL | TEXT_COMPACTION_MODE_LATCH => {
|
||||
subMode = Mode::Alpha;
|
||||
latchedMode = subMode;
|
||||
}
|
||||
MODE_SHIFT_TO_BYTE_COMPACTION_MODE => {
|
||||
result.append_char(char::from_u32(byteCompactionData[i])?)
|
||||
}
|
||||
_ => {}
|
||||
}
|
||||
}
|
||||
|
||||
Mode::AlphaShift => {
|
||||
// Restore sub-mode
|
||||
subMode = priorToShiftMode;
|
||||
if subModeCh < 26 {
|
||||
ch = char::from_u32('A' as u32 + subModeCh).unwrap();
|
||||
} else {
|
||||
match subModeCh {
|
||||
26 => ch = ' ',
|
||||
TEXT_COMPACTION_MODE_LATCH => subMode = Mode::Alpha,
|
||||
_ => {}
|
||||
}
|
||||
|
||||
match subModeCh {
|
||||
..=25 => ch = char::from_u32('A' as u32 + subModeCh)?,
|
||||
26 => ch = ' ',
|
||||
TEXT_COMPACTION_MODE_LATCH => subMode = Mode::Alpha,
|
||||
_ => {}
|
||||
}
|
||||
}
|
||||
|
||||
Mode::PunctShift => {
|
||||
// Restore sub-mode
|
||||
subMode = priorToShiftMode;
|
||||
if subModeCh < PAL {
|
||||
ch = PUNCT_CHARS[subModeCh as usize];
|
||||
} else {
|
||||
match subModeCh {
|
||||
PAL | TEXT_COMPACTION_MODE_LATCH => subMode = Mode::Alpha,
|
||||
MODE_SHIFT_TO_BYTE_COMPACTION_MODE =>
|
||||
// PS before Shift-to-Byte is used as a padding character,
|
||||
// see 5.4.2.4 of the specification
|
||||
{
|
||||
result.append_char(char::from_u32(byteCompactionData[i]).unwrap())
|
||||
}
|
||||
_ => {}
|
||||
|
||||
match subModeCh {
|
||||
..=PRE_PAL => ch = PUNCT_CHARS[subModeCh as usize],
|
||||
PAL | TEXT_COMPACTION_MODE_LATCH => subMode = Mode::Alpha,
|
||||
MODE_SHIFT_TO_BYTE_COMPACTION_MODE =>
|
||||
// PS before Shift-to-Byte is used as a padding character,
|
||||
// see 5.4.2.4 of the specification
|
||||
{
|
||||
result.append_char(char::from_u32(byteCompactionData[i])?)
|
||||
}
|
||||
_ => {}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -624,7 +591,7 @@ fn decodeTextCompaction(
|
||||
}
|
||||
i += 1;
|
||||
}
|
||||
latchedMode
|
||||
Some(latchedMode)
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -672,16 +639,13 @@ fn byteCompaction(
|
||||
{
|
||||
break;
|
||||
}
|
||||
} /*while (count < 5 &&
|
||||
codeIndex < codewords[0] &&
|
||||
codewords[codeIndex] < TEXT_COMPACTION_MODE_LATCH);*/
|
||||
}
|
||||
if count == 5
|
||||
&& (mode == BYTE_COMPACTION_MODE_LATCH_6
|
||||
|| codeIndex < codewords[0] as usize
|
||||
&& codewords[codeIndex] < TEXT_COMPACTION_MODE_LATCH)
|
||||
{
|
||||
for i in 0..6 {
|
||||
// for (int i = 0; i < 6; i++) {
|
||||
result.append_byte((value >> (8 * (5 - i))) as u8);
|
||||
}
|
||||
} else {
|
||||
@@ -730,24 +694,24 @@ fn numericCompaction(
|
||||
if codeIndex == codewords[0] as usize {
|
||||
end = true;
|
||||
}
|
||||
if code < TEXT_COMPACTION_MODE_LATCH {
|
||||
numericCodewords[count] = code;
|
||||
count += 1;
|
||||
} else {
|
||||
match code {
|
||||
TEXT_COMPACTION_MODE_LATCH
|
||||
| BYTE_COMPACTION_MODE_LATCH
|
||||
| BYTE_COMPACTION_MODE_LATCH_6
|
||||
| BEGIN_MACRO_PDF417_CONTROL_BLOCK
|
||||
| BEGIN_MACRO_PDF417_OPTIONAL_FIELD
|
||||
| MACRO_PDF417_TERMINATOR
|
||||
| ECI_CHARSET => {
|
||||
codeIndex -= 1;
|
||||
end = true;
|
||||
}
|
||||
_ => {}
|
||||
match code {
|
||||
..=PRE_TEXT_COMPACTION_MODE_LATCH => {
|
||||
numericCodewords[count] = code;
|
||||
count += 1;
|
||||
}
|
||||
TEXT_COMPACTION_MODE_LATCH
|
||||
| BYTE_COMPACTION_MODE_LATCH
|
||||
| BYTE_COMPACTION_MODE_LATCH_6
|
||||
| BEGIN_MACRO_PDF417_CONTROL_BLOCK
|
||||
| BEGIN_MACRO_PDF417_OPTIONAL_FIELD
|
||||
| MACRO_PDF417_TERMINATOR
|
||||
| ECI_CHARSET => {
|
||||
codeIndex -= 1;
|
||||
end = true;
|
||||
}
|
||||
_ => {}
|
||||
}
|
||||
|
||||
if (count % MAX_NUMERIC_CODEWORDS == 0 || code == NUMERIC_COMPACTION_MODE_LATCH || end)
|
||||
&& count > 0
|
||||
{
|
||||
@@ -806,11 +770,14 @@ fn numericCompaction(
|
||||
Remove leading 1 => RXingResult is 000213298174000
|
||||
*/
|
||||
fn decodeBase900toBase10(codewords: &[u32], count: usize) -> Result<String, Exceptions> {
|
||||
let mut result = 0.to_biguint().unwrap();
|
||||
let mut result = 0
|
||||
.to_biguint()
|
||||
.ok_or(Exceptions::ArithmeticException(None))?;
|
||||
for i in 0..count {
|
||||
// for (int i = 0; i < count; i++) {
|
||||
result += &EXP900[count - i - 1] * (codewords[i].to_biguint().unwrap());
|
||||
// result = result.add(EXP900[count - i - 1].multiply(BigInteger.valueOf(codewords[i])));
|
||||
result += &EXP900[count - i - 1]
|
||||
* (codewords[i]
|
||||
.to_biguint()
|
||||
.ok_or(Exceptions::ArithmeticException(None))?);
|
||||
}
|
||||
let resultString = result.to_string();
|
||||
if !resultString.starts_with('1') {
|
||||
|
||||
Reference in New Issue
Block a user