ak/rxing
1
0
Fork 0
mirror of https://github.com/starovoid/rxing.git synced 2026-07-26 20:32: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/common/cpp_essentials/base_extentions/qr_ec_level.rs
View File

@@ -22,7 +22,7 @@ impl ErrorCorrectionLevel {
ErrorCorrectionLevel::H,
ErrorCorrectionLevel::Q,
];
return LEVEL_FOR_BITS[bits as usize & 0x3];
LEVEL_FOR_BITS[bits as usize & 0x3]
}
pub fn ECLevelFromBits(bits: u8, isMicro: bool) -> Self {

2
src/common/cpp_essentials/base_extentions/qrcode_version.rs
View File

@@ -88,7 +88,7 @@ impl Version {
return Self::getVersionForNumber(bestVersion);
}
// If we didn't find a close enough match, fail
return Err(Exceptions::ILLEGAL_STATE);
Err(Exceptions::ILLEGAL_STATE)
}
pub const fn isMicroQRCode(&self) -> bool {

10
src/common/cpp_essentials/fast_edge_to_edge_counter.rs
View File

@@ -38,13 +38,13 @@ impl<'a> FastEdgeToEdgeCounter<'a> {
} else {
i32::MAX
};
let stepsToBorder = std::cmp::min(maxStepsX, maxStepsY) as i32;
let stepsToBorder = std::cmp::min(maxStepsX, maxStepsY);
FastEdgeToEdgeCounter {
p,
stride,
stepsToBorder,
_arr: cur.p().y as isize * stride as isize, //cur.img().getRow(cur.p().y as u32),
_arr: cur.p().y as isize * stride, //cur.img().getRow(cur.p().y as u32),
under_arry: cur.img(), //.into(),
}
}
@@ -66,15 +66,15 @@ impl<'a> FastEdgeToEdgeCounter<'a> {
// if !(self.under_arry[idx_pt]
// == self.under_arry[self.p as usize])
if !(self.under_arry.get_index(idx_pt) == self.under_arry.get_index(self.p as usize)) {
if self.under_arry.get_index(idx_pt) != self.under_arry.get_index(self.p as usize) {
break;
}
} // while (p[steps * stride] == p[0]);
self.p = (self.p as isize + (steps as isize * self.stride)).abs() as u32;
self.p = (self.p as isize + (steps as isize * self.stride)).unsigned_abs() as u32;
self.stepsToBorder -= steps;
return steps as u32;
steps as u32
}
#[inline(always)]

6
src/common/cpp_essentials/matrix.rs
View File

@@ -10,7 +10,7 @@ pub struct Matrix<T: Default + Clone + Copy> {
impl<T: Default + Clone + Copy> Matrix<T> {
pub fn with_data(width: usize, height: usize, data: Vec<Option<T>>) -> Result<Matrix<T>> {
if width != 0 && data.len() / width as usize != height as usize {
if width != 0 && data.len() / width != height {
return Err(Exceptions::illegal_argument_with(
"invalid size: width * height is too big",
));
@@ -23,7 +23,7 @@ impl<T: Default + Clone + Copy> Matrix<T> {
}
pub fn new(width: usize, height: usize) -> Result<Matrix<T>> {
if width != 0 && (width * height) / width as usize != height as usize {
if width != 0 && (width * height) / width != height {
return Err(Exceptions::illegal_argument_with(
"invalid size: width * height is too big",
));
@@ -60,7 +60,7 @@ impl<T: Default + Clone + Copy> Matrix<T> {
// }
fn get_offset(x: usize, y: usize, width: usize) -> usize {
(y * width + x) as usize
y * width + x
}
pub fn get(&self, x: usize, y: usize) -> Option<T> {

38
src/common/cpp_essentials/pattern.rs
View File

@@ -310,7 +310,7 @@ impl<'a> std::ops::Index<isize> for PatternView<'_> {
fn index(&self, index: isize) -> &Self::Output {
if self.count == self.data.len() {
return &self.data[index.abs() as usize];
return &self.data[index.unsigned_abs()];
}
if index > self.data.0.len() as isize {
@@ -353,7 +353,7 @@ impl<'a> std::ops::Index<i32> for PatternView<'_> {
impl<'a> Into<Vec<PatternType>> for &PatternView<'a> {
fn into(self) -> Vec<PatternType> {
let mut v = vec![PatternType::default(); self.count as usize];
let mut v = vec![PatternType::default(); self.count];
for i in 0..self.count {
v[i] = self[i];
}
@@ -420,11 +420,11 @@ pub struct FixedPattern<const N: usize, const SUM: usize, const IS_SPARCE: bool
data: [PatternType; N],
}
impl<const N: usize, const SUM: usize, const IS_SPARCE: bool> Into<Pattern<N>>
for FixedPattern<N, SUM, IS_SPARCE>
impl<const N: usize, const SUM: usize, const IS_SPARCE: bool> From<FixedPattern<N, SUM, IS_SPARCE>>
for Pattern<N>
{
fn into(self) -> Pattern<N> {
self.data
fn from(val: FixedPattern<N, SUM, IS_SPARCE>) -> Self {
val.data
}
}
@@ -446,7 +446,7 @@ impl<const N: usize, const SUM: usize, const IS_SPARCE: bool> FixedPattern<N, SU
}
fn sums(&self) -> BarAndSpace<PatternType> {
return BarAndSpaceSum::<N, PatternType, PatternType>(&self.data);
BarAndSpaceSum::<N, PatternType, PatternType>(&self.data)
}
}
@@ -584,11 +584,11 @@ pub fn IsRightGuard<const N: usize, const SUM: usize, const IS_SPARCE: bool>(
) != 0.0
}
pub fn FindLeftGuardBy<'a, const LEN: usize, Pred: Fn(&PatternView, Option<f32>) -> bool>(
view: PatternView<'a>,
pub fn FindLeftGuardBy<const LEN: usize, Pred: Fn(&PatternView, Option<f32>) -> bool>(
view: PatternView<'_>,
minSize: usize,
isGuard: Pred,
) -> Result<PatternView<'a>> {
) -> Result<PatternView<'_>> {
const PREV_IDX: isize = -1;
if view.size() < minSize {
@@ -601,11 +601,7 @@ pub fn FindLeftGuardBy<'a, const LEN: usize, Pred: Fn(&PatternView, Option<f32>)
}
let end = Into::<usize>::into(view.end().ok_or(Exceptions::INDEX_OUT_OF_BOUNDS)?) - minSize;
while (window.start + window.current) < end {
let prev = if let Some(v) = window.try_get_index(PREV_IDX) {
Some(v as f32)
} else {
None
};
let prev = window.try_get_index(PREV_IDX).map(|v| v as f32);
if isGuard(&window, prev) {
return Ok(window);
}
@@ -631,18 +627,18 @@ pub fn FindLeftGuard<'a, const LEN: usize, const SUM: usize, const IS_SPARCE: bo
{
return false;
}
return IsPattern::<false, LEN, SUM, IS_SPARCE>(
IsPattern::<false, LEN, SUM, IS_SPARCE>(
window,
pattern,
spaceInPixel,
minQuietZone,
0.0,
) != 0.0;
) != 0.0
})
}
pub fn NormalizedE2EPattern<'a, const LEN: usize, const LEN_MINUS_2: usize, const SUM: usize>(
view: &'a PatternView,
pub fn NormalizedE2EPattern<const LEN: usize, const LEN_MINUS_2: usize, const SUM: usize>(
view: &PatternView,
) -> [PatternType; LEN_MINUS_2] {
let moduleSize: f32 = Into::<f32>::into(view.sum(Some(LEN))) / SUM as f32;
@@ -656,8 +652,8 @@ pub fn NormalizedE2EPattern<'a, const LEN: usize, const LEN_MINUS_2: usize, cons
e2e
}
pub fn NormalizedPattern<'a, const LEN: usize, const SUM: usize>(
view: &'a PatternView,
pub fn NormalizedPattern<const LEN: usize, const SUM: usize>(
view: &PatternView,
) -> Result<[PatternType; LEN]> {
let moduleSize: f32 = (Into::<usize>::into(view.sum(Some(LEN))) / SUM) as f32;
let mut err = SUM as isize;