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

clippy fix

Browse Source
This commit is contained in:
Henry
2023-04-28 19:41:23 -05:00
parent 2afc6be3dc
commit ef999a4eb0
36 changed files with 122 additions and 137 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/datamatrix/data_matrix_reader.rs
View File

@@ -218,7 +218,7 @@ impl DataMatrixReader {
let iOffset = top + y as f32 * moduleSize as f32;
for x in 0..matrixWidth {
// for (int x = 0; x < matrixWidth; x++) {
if image.get_point(point(left as f32 + x as f32 * moduleSize as f32, iOffset)) {
if image.get_point(point(left + x as f32 * moduleSize as f32, iOffset)) {
bits.set(x, y);
}
}

4
src/datamatrix/encoder/c40_encoder.rs
View File

@@ -246,11 +246,11 @@ impl C40Encoder {
sb.push('\u{3}');
return 1;
}
if ('0'..='9').contains(&c) {
if c.is_ascii_digit() {
sb.push((c as u8 - 48 + 4) as char);
return 1;
}
if ('A'..='Z').contains(&c) {
if c.is_ascii_uppercase() {
sb.push((c as u8 - 65 + 14) as char);
return 1;
}

8
src/datamatrix/encoder/high_level_encoder.rs
View File

@@ -551,7 +551,7 @@ fn getMinimumCount(mins: &[u8]) -> u32 {
}
pub fn isDigit(ch: char) -> bool {
('0'..='9').contains(&ch)
ch.is_ascii_digit()
}
pub fn isExtendedASCII(ch: char) -> bool {
@@ -559,15 +559,15 @@ pub fn isExtendedASCII(ch: char) -> bool {
}
pub fn isNativeC40(ch: char) -> bool {
(ch == ' ') || ('0'..='9').contains(&ch) || ('A'..='Z').contains(&ch)
(ch == ' ') || ch.is_ascii_digit() || ch.is_ascii_uppercase()
}
pub fn isNativeText(ch: char) -> bool {
(ch == ' ') || ('0'..='9').contains(&ch) || ('a'..='z').contains(&ch)
(ch == ' ') || ch.is_ascii_digit() || ch.is_ascii_lowercase()
}
pub fn isNativeX12(ch: char) -> bool {
isX12TermSep(ch) || (ch == ' ') || ('0'..='9').contains(&ch) || ('A'..='Z').contains(&ch)
isX12TermSep(ch) || (ch == ' ') || ch.is_ascii_digit() || ch.is_ascii_uppercase()
}
fn isX12TermSep(ch: char) -> bool {

4
src/datamatrix/encoder/text_encoder.rs
View File

@@ -41,11 +41,11 @@ impl TextEncoder {
sb.push('\u{3}');
return 1;
}
if ('0'..='9').contains(&c) {
if c.is_ascii_digit() {
sb.push((c as u8 - 48 + 4) as char);
return 1;
}
if ('a'..='z').contains(&c) {
if c.is_ascii_lowercase() {
sb.push((c as u8 - 97 + 14) as char);
return 1;
}

4
src/datamatrix/encoder/x12_encoder.rs
View File

@@ -66,9 +66,9 @@ impl X12Encoder {
'>' => sb.push('\u{2}'),
' ' => sb.push('\u{3}'),
_ => {
if ('0'..='9').contains(&c) {
if c.is_ascii_digit() {
sb.push((c as u8 - 48 + 4) as char);
} else if ('A'..='Z').contains(&c) {
} else if c.is_ascii_uppercase() {
sb.push((c as u8 - 65 + 14) as char);
} else {
high_level_encoder::illegalCharacter(c)?;