mirror of
https://github.com/starovoid/rxing.git
synced 2026-07-26 04:12:34 +00:00
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
308 lines
10 KiB
Rust
308 lines
10 KiB
Rust
/*
|
|
* Copyright 2006 Jeremias Maerki.
|
|
*
|
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
|
* you may not use this file except in compliance with the License.
|
|
* You may obtain a copy of the License at
|
|
*
|
|
* http://www.apache.org/licenses/LICENSE-2.0
|
|
*
|
|
* Unless required by applicable law or agreed to in writing, software
|
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
* See the License for the specific language governing permissions and
|
|
* limitations under the License.
|
|
*/
|
|
|
|
use crate::Exceptions;
|
|
|
|
const EMPTY_BIT_VAL: u8 = 13;
|
|
|
|
/**
|
|
* Symbol Character Placement Program. Adapted from Annex M.1 in ISO/IEC 16022:2000(E).
|
|
*/
|
|
pub struct DefaultPlacement {
|
|
codewords: String,
|
|
numrows: usize,
|
|
numcols: usize,
|
|
bits: Vec<u8>,
|
|
}
|
|
impl DefaultPlacement {
|
|
/**
|
|
* Main constructor
|
|
*
|
|
* @param codewords the codewords to place
|
|
* @param numcols the number of columns
|
|
* @param numrows the number of rows
|
|
*/
|
|
pub fn new(codewords: String, numcols: usize, numrows: usize) -> Self {
|
|
// this.codewords = codewords;
|
|
// this.numcols = numcols;
|
|
// this.numrows = numrows;
|
|
// this.bits = new byte[numcols * numrows];
|
|
// Arrays.fill(this.bits, (byte) -1); //Initialize with "not set" value
|
|
Self {
|
|
codewords,
|
|
numrows,
|
|
numcols,
|
|
bits: vec![EMPTY_BIT_VAL; numcols * numrows],
|
|
}
|
|
}
|
|
|
|
pub fn getNumrows(&self) -> usize {
|
|
self.numrows
|
|
}
|
|
|
|
pub fn getNumcols(&self) -> usize {
|
|
self.numcols
|
|
}
|
|
|
|
pub fn getBits(&self) -> &[u8] {
|
|
&self.bits
|
|
}
|
|
|
|
pub fn getBit(&self, col: usize, row: usize) -> bool {
|
|
self.bits[row * self.numcols + col] == 1
|
|
}
|
|
|
|
pub fn setBit(&mut self, col: usize, row: usize, bit: bool) {
|
|
self.bits[row * self.numcols + col] = u8::from(bit); //if bit { 1 } else { 0 };
|
|
}
|
|
|
|
pub fn noBit(&self, col: usize, row: usize) -> bool {
|
|
self.bits[row * self.numcols + col] == EMPTY_BIT_VAL
|
|
}
|
|
|
|
pub fn place(&mut self) -> Result<(), Exceptions> {
|
|
let mut pos = 0;
|
|
let mut row = 4_isize;
|
|
let mut col = 0_isize;
|
|
|
|
loop {
|
|
// repeatedly first check for one of the special corner cases, then...
|
|
if (row == self.numrows as isize) && (col == 0) {
|
|
self.corner1(pos)?;
|
|
pos += 1;
|
|
}
|
|
if (row == self.numrows as isize - 2) && (col == 0) && ((self.numcols % 4) != 0) {
|
|
self.corner2(pos)?;
|
|
pos += 1;
|
|
}
|
|
if (row == self.numrows as isize - 2) && (col == 0) && (self.numcols % 8 == 4) {
|
|
self.corner3(pos)?;
|
|
pos += 1;
|
|
}
|
|
if (row == self.numrows as isize + 4) && (col == 2) && ((self.numcols % 8) == 0) {
|
|
self.corner4(pos)?;
|
|
pos += 1;
|
|
}
|
|
// sweep upward diagonally, inserting successive characters...
|
|
loop {
|
|
if (row < self.numrows as isize)
|
|
&& (col >= 0)
|
|
&& self.noBit(col as usize, row as usize)
|
|
{
|
|
self.utah(row, col, pos)?;
|
|
pos += 1;
|
|
}
|
|
row -= 2;
|
|
col += 2;
|
|
if !(row >= 0 && (col < self.numcols as isize)) {
|
|
break;
|
|
}
|
|
} //while (row >= 0 && (col < numcols));
|
|
row += 1;
|
|
col += 3;
|
|
|
|
// and then sweep downward diagonally, inserting successive characters, ...
|
|
loop {
|
|
if (row >= 0)
|
|
&& (col < self.numcols as isize)
|
|
&& self.noBit(col as usize, row as usize)
|
|
{
|
|
self.utah(row, col, pos)?;
|
|
pos += 1;
|
|
}
|
|
row += 2;
|
|
col -= 2;
|
|
|
|
if !((row < self.numrows as isize) && (col >= 0)) {
|
|
break;
|
|
}
|
|
} //while ((row < numrows) && (col >= 0));
|
|
row += 3;
|
|
col += 1;
|
|
|
|
// ...until the entire array is scanned
|
|
if !((row < self.numrows as isize) || (col < self.numcols as isize)) {
|
|
break;
|
|
}
|
|
} // while ((row < numrows) || (col < numcols));
|
|
|
|
// Lastly, if the lower right-hand corner is untouched, fill in fixed pattern
|
|
if self.noBit(self.numcols - 1, self.numrows - 1) {
|
|
self.setBit(self.numcols - 1, self.numrows - 1, true);
|
|
self.setBit(self.numcols - 2, self.numrows - 2, true);
|
|
}
|
|
Ok(())
|
|
}
|
|
|
|
fn module(&mut self, row: isize, col: isize, pos: usize, bit: u32) -> Result<(), Exceptions> {
|
|
let mut row = row;
|
|
let mut col = col;
|
|
|
|
if row < 0 {
|
|
row += self.numrows as isize;
|
|
col += 4 - ((self.numrows + 4) % 8) as isize;
|
|
}
|
|
if col < 0 {
|
|
col += self.numcols as isize;
|
|
row += 4 - ((self.numcols + 4) % 8) as isize;
|
|
}
|
|
// Note the conversion:
|
|
let mut v = self
|
|
.codewords
|
|
.chars()
|
|
.nth(pos)
|
|
.ok_or(Exceptions::IndexOutOfBoundsException(None))? as u32;
|
|
v &= 1 << (8 - bit);
|
|
self.setBit(col as usize, row as usize, v != 0);
|
|
|
|
Ok(())
|
|
}
|
|
|
|
/**
|
|
* Places the 8 bits of a utah-shaped symbol character in ECC200.
|
|
*
|
|
* @param row the row
|
|
* @param col the column
|
|
* @param pos character position
|
|
*/
|
|
fn utah(&mut self, row: isize, col: isize, pos: usize) -> Result<(), Exceptions> {
|
|
self.module(row - 2, col - 2, pos, 1)?;
|
|
self.module(row - 2, col - 1, pos, 2)?;
|
|
self.module(row - 1, col - 2, pos, 3)?;
|
|
self.module(row - 1, col - 1, pos, 4)?;
|
|
self.module(row - 1, col, pos, 5)?;
|
|
self.module(row, col - 2, pos, 6)?;
|
|
self.module(row, col - 1, pos, 7)?;
|
|
self.module(row, col, pos, 8)?;
|
|
Ok(())
|
|
}
|
|
|
|
fn corner1(&mut self, pos: usize) -> Result<(), Exceptions> {
|
|
self.module(self.numrows as isize - 1, 0, pos, 1)?;
|
|
self.module(self.numrows as isize - 1, 1, pos, 2)?;
|
|
self.module(self.numrows as isize - 1, 2, pos, 3)?;
|
|
self.module(0, self.numcols as isize - 2, pos, 4)?;
|
|
self.module(0, self.numcols as isize - 1, pos, 5)?;
|
|
self.module(1, self.numcols as isize - 1, pos, 6)?;
|
|
self.module(2, self.numcols as isize - 1, pos, 7)?;
|
|
self.module(3, self.numcols as isize - 1, pos, 8)?;
|
|
Ok(())
|
|
}
|
|
|
|
fn corner2(&mut self, pos: usize) -> Result<(), Exceptions> {
|
|
self.module(self.numrows as isize - 3, 0, pos, 1)?;
|
|
self.module(self.numrows as isize - 2, 0, pos, 2)?;
|
|
self.module(self.numrows as isize - 1, 0, pos, 3)?;
|
|
self.module(0, self.numcols as isize - 4, pos, 4)?;
|
|
self.module(0, self.numcols as isize - 3, pos, 5)?;
|
|
self.module(0, self.numcols as isize - 2, pos, 6)?;
|
|
self.module(0, self.numcols as isize - 1, pos, 7)?;
|
|
self.module(1, self.numcols as isize - 1, pos, 8)?;
|
|
Ok(())
|
|
}
|
|
|
|
fn corner3(&mut self, pos: usize) -> Result<(), Exceptions> {
|
|
self.module(self.numrows as isize - 3, 0, pos, 1)?;
|
|
self.module(self.numrows as isize - 2, 0, pos, 2)?;
|
|
self.module(self.numrows as isize - 1, 0, pos, 3)?;
|
|
self.module(0, self.numcols as isize - 2, pos, 4)?;
|
|
self.module(0, self.numcols as isize - 1, pos, 5)?;
|
|
self.module(1, self.numcols as isize - 1, pos, 6)?;
|
|
self.module(2, self.numcols as isize - 1, pos, 7)?;
|
|
self.module(3, self.numcols as isize - 1, pos, 8)?;
|
|
Ok(())
|
|
}
|
|
|
|
fn corner4(&mut self, pos: usize) -> Result<(), Exceptions> {
|
|
self.module(self.numrows as isize - 1, 0, pos, 1)?;
|
|
self.module(self.numrows as isize - 1, self.numcols as isize - 1, pos, 2)?;
|
|
self.module(0, self.numcols as isize - 3, pos, 3)?;
|
|
self.module(0, self.numcols as isize - 2, pos, 4)?;
|
|
self.module(0, self.numcols as isize - 1, pos, 5)?;
|
|
self.module(1, self.numcols as isize - 3, pos, 6)?;
|
|
self.module(1, self.numcols as isize - 2, pos, 7)?;
|
|
self.module(1, self.numcols as isize - 1, pos, 8)?;
|
|
Ok(())
|
|
}
|
|
|
|
#[allow(dead_code)]
|
|
fn toBitFieldStringArray(&self) -> Vec<String> {
|
|
let bits = self.getBits();
|
|
let numrows = self.getNumrows();
|
|
let numcols = self.getNumcols();
|
|
let mut array = Vec::with_capacity(numrows); //;[numrows];
|
|
let mut startpos = 0;
|
|
for _row in 0..numrows {
|
|
// for (int row = 0; row < numrows; row++) {
|
|
let mut sb = String::with_capacity(bits.len());
|
|
for i in 0..numcols {
|
|
// for (int i = 0; i < numcols; i++) {
|
|
sb.push(if bits[startpos + i] == 1 { '1' } else { '0' });
|
|
}
|
|
//array[row] = sb.toString();
|
|
array.push(sb);
|
|
startpos += numcols;
|
|
}
|
|
|
|
array
|
|
}
|
|
}
|
|
|
|
#[cfg(test)]
|
|
mod test_placement {
|
|
//private static final Pattern SPACE = Pattern.compile(" ");
|
|
|
|
use super::DefaultPlacement;
|
|
|
|
#[test]
|
|
fn testPlacement() {
|
|
let codewords = unvisualize("66 74 78 66 74 78 129 56 35 102 192 96 226 100 156 1 107 221"); //"AIMAIM" encoded
|
|
let mut placement = DefaultPlacement::new(codewords, 12, 12);
|
|
placement.place().expect("msg");
|
|
let expected = [
|
|
"011100001111",
|
|
"001010101000",
|
|
"010001010100",
|
|
"001010100010",
|
|
"000111000100",
|
|
"011000010100",
|
|
"000100001101",
|
|
"011000010000",
|
|
"001100001101",
|
|
"100010010111",
|
|
"011101011010",
|
|
"001011001010",
|
|
];
|
|
let actual = placement.toBitFieldStringArray();
|
|
for i in 0..actual.len() {
|
|
// for (int i = 0; i < actual.length; i++) {
|
|
assert_eq!(expected[i], actual[i], "Row {i}");
|
|
}
|
|
}
|
|
|
|
fn unvisualize(visualized: &str) -> String {
|
|
let mut sb = String::new();
|
|
for token in visualized.split(' ') {
|
|
// for (String token : SPACE.split(visualized)) {
|
|
let tkn: u32 = token.parse().unwrap();
|
|
sb.push(char::from_u32(tkn).unwrap());
|
|
// sb.push((char) Integer.parseInt(token));
|
|
}
|
|
|
|
sb
|
|
}
|
|
}
|